Added some mappings and new bundles