added full support for classrooms