Map update (with more feauters)