update forms to use new model