Add support for map and list values