Add support for maps and lists