Initial support for bundles.