GraphStore(Proxy) refactoring
Factory methods renamed