refactored connectivity service