Support for macros - still under construction