Many changes made for generators