Updated some macros