Introduce a new DSL and deprecate the old one