Add support for maps and unions