Add support for students