Feature/conditional validations