DSL Refactoring (part 1.3)