Refactor generators to separate dictionaries
join