Add validations back to models