Added Bundling support