Added initial support for maps.