Refactor: DSL