Add singleton and validator classes