#144 DSL upgrade for reusability