Adding support for macros