Update for generators