Adding missing validations.