Added some extra Bundles and basic configuration