Adjusted the DTO DSL