Updated Class Diagram UML

See above :)