Add support for external macros