More changes for generators