Added some Validator classes