Changed the primitive types to UML