Refactorization: add_node, remove_node