Some DSL improvements

Review by @cvogt