Added more DSL work