Slowly moving towards map bundling