Refactor InteractiveGraph