added form macros for models