Collect references when bundles added
Cleaner reference sub-setting