More generator updates...