Optimize data flow through root nodes for issue #56