Updated model validations