Improve existing support for creating new nodes, removing nodes and updating non-leaf node constraints
