Refactor nodes for interactive events