Added support for teachers and others