#144 DSL upgrade for reusability

But...