Did more work on class diagram