Removed dependency on Stategraph