Added full graph creation