Minor changes in anticipation for improving bundling mapping
Improvements to bundle configuration related to recursion