Added in order to make the validator more adaptable