Update Diagram addShape return type