More generator changes :)