Finalized the new generator interface