Small changes to make the map working