Switch to maintaining BundleDescriptors for the model