Added DiagramStructure - Partial Complete