Performance changes on maps