Modified UML diagram, now it's good to go