Added support for maps