Change the target from generators to iterators
Add 'map' and 'filter'