Adding latest generator updates