readded support for map collections