Updated class diagram and plan