Updated forms and created models