Added new macros