Refactored data manipulation connect handling