change map generators to lists