Diagram Features Added