Tag: extend macros support

extend macros support