Add custom Macro support