DSL Refactoring (part 1.7)