work towards better support of map data structures