Support for map changes and added missing files