Refactored library to handle new generators.