Upgrade to latest DSL and polishing

GH-issue: #1