Added support for teaching assistants

Not tested