More changes to graph and evaluation classes