GraphView refactoring