Updated Conceptual Model, Actual Class Diagram. Added a code smell and how to fix it