Use new class definition in validator.xml