adding support for maps