Revert "Revert "Decreased map size""

This reverts commit ddb27e64922f43fae5ce74e3144dd25436f8627a.
Revert "Decreased map size"

This reverts commit 936daa66e17dc9f6ca96c6daa391d29acab6cbff.