#144 DSL upgrade for reusability

overridden!!!