uml manager refactoring