Completed UML for Question