Update generator to spec