continue with refactoring because of the graph model change