Some work on the uml diagrams