Updated basic generator for latest DSL.