Added Bundles and some settings