Add Macro & Engine singleton