Added support for using macros in Form