Remove auto generated comments
Add DTO's for ui model