Add validator classes