Update bundles
Add settings and mappings