Validations refactor