Added support for macros.