updated forms and model fields