Fixed up the UML