Move validations into models