Updated macros