[WIP] Feature/let connection service create dto instead of entity

And it did break ;-), thanks for the solution