Update models and validations