Added more to the UML