With improved Validation-Class.