Refactor. Added lists of generators.