Decoupling DSL.Lib.