Changes to the maps code