Refactored DslProvider