Improve DSL