Adding support for saving form definitions