Add validations back