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

Maybe this could be removed seeing as we're going to be using environments?
Though I don't really see where the environment is actually being used?