More bundles and some extra configs