More support for maps