Add support for Macro