Implement bundle handling (untested)