refactors to integrate form-modeler