MacroBegin, MacroEnd feature added