Map support commit (WIP)