Factor out more validations