Began refactoring dsl as separat module