Refactored DiagramCreator