Adding Map structures (WIP).