Update to output from latest generator