Added 3 new classes