Put validations back