Fixed hiearchy, added instances of instructor and student