Added support for nested macros