Form macros moved to package