Support CATCH in 2024