Modified validator classes