Updated Validator for sf2.2