adding support for classroom type