Support for map types; update example