added support for map and values