collection support, key fixes