Fixed Classes to match Master Diagram