Additional uml work