Some component Diagram changes