Adding CHECK macros