Added 3 classes