Add add_bundle() support