Updated UML to use composition assns.