added support for school classes