Minor modifications to the Validator classes, added further model classes