Updated DSL, unit tests