Refactored data manipulation connect handling
Merge pull request #281 from Gregoor/master

Refactored data manipulation connect handling