Improve performance by reducing map size