Adding abort support for bundles