UML Editor Iteration 2