Rework uml diagram