Additional changes to the Map stuff