Adding support for maps.