Added namespace to MACROS