Generator changes