Updated generator to work with new DSL