Big upgrade to Generator for 2.40