Added support for on-demand macros to the Plug-in Server.