Changed some templates and required fields in the model