Added in support for maps.