Add user macros support