Use IntMap instead
Add another optimization level