WIP: Improving DSL support of multiple version