Improve dsl