Update Macro Demo with UserDefined macros