Added some student enterprise support