More map performance updates