ConnectivityServiceHelper modified