Improvement for generators