Updated class diagram and data structures