DSL Refactoring (part 1.1)