Updates to Graph classes