Add back validations