Added changes for graphs