Generated model, added some validations