Added Jennifer's changes to class diagram