Improve map performance by using hash tables
Don't re-evaluation unnecessarily
Merge pull request #563 from xzyfer/wip/fast-maps

Give maps a speed boost