Added MAKE_ABC and MAKE_ABx macros