Add support for maps
paranoia