Work on GeneratorLib