Updated configuration. Moved to composed generators.