Added EXTEND_CORE MACRO