More generator changes