Add support for macros and enable them in DemoConsole