more improvements to the collection management