Reworked the bundle map to make finding which bundle is required more explicit.