3.2.20 Map performance