It would be better to add the validations before merging this.