DSL Refactoring (part 1.2)