DSL Refactoring (part 1.6)