Added code to support the Map rendering increase