Change structure of generators
Merge pull request #2 from VAIRIX/expanded_summary

Change structure of generators