Added 2 classes