Some refactoring and enhancement of UML diagram.