Moved support for forms to controllers