Updated changes to new DSL