Validations re-added to models