* implemented GeneratorBase changes to generator classes.