updated generator to work with the current dsl