Update Class Diagram; story #35