Merged with node_refactoring