Keys are now added in the loading of the map.