Update all Collections to implement Iterator