Fixed a docblock
Updated the generator factory