DSL Refactoring (part 1.8)