Added support for generic maps and lists.