Add support for macros.