Added new macros and changes