DSL Refactoring (part 1.9.5)