Update generator with upstream changes