Added the classes described in our class diagram