Added form based macros capability