More generator updates