Improved bundle handling