Added initial suite of macros