Aligned GeneralValidator with the GeneralValidatorBuilder
Sonar and bug fixes