Add additional macros