Adjust generator to new version