Modified Validator to include new properties added