refactored fromListGenerator to fromMapGenerator