Updated user macros