[Dynamo] refactoring DSL