Update generator to M3