Added some more generator support in the collections framework