Refactor and Update UML