Graph refactoring - data store and iterable classes