 
 extension Clink: ClinkPeerManager {
     public func save(peer: ClinkPeer) {
-        UserDefaults.standard.set(peer.toDict(), forKey: peer.id.uuidString)
+        UserDefaults.standard.set(peer.toDict(), forKey: peer.id)
         
         var savedPeerIds = UserDefaults.standard.stringArray(forKey: savedPeerIdsDefaultsKey) ?? []
         
-        if savedPeerIds.index(of: peer.id.uuidString) == nil {
-            savedPeerIds.append(peer.id.uuidString)
+        if savedPeerIds.index(of: peer.id) == nil {
+            savedPeerIds.append(peer.id)
             UserDefaults.standard.set(savedPeerIds, forKey: savedPeerIdsDefaultsKey)
         }
     }
     
-    public func getSavedPeer(withId peerId: UUID) -> ClinkPeer? {
-        guard let peerDict = UserDefaults.standard.dictionary(forKey: peerId.uuidString) else { return nil }
+    public func getSavedPeer(withId peerId: String) -> ClinkPeer? {
+        guard let peerDict = UserDefaults.standard.dictionary(forKey: peerId) else { return nil }
         
         return Clink.Peer(dict: peerDict)
     }
     
     public func getSavedPeers() -> [ClinkPeer] {
-        return (UserDefaults.standard.stringArray(forKey: savedPeerIdsDefaultsKey) ?? []).flatMap { uuidString in
-            guard let uuid = UUID(uuidString: uuidString) else { return nil }
-            
-            return self.getSavedPeer(withId: uuid)
+        return (UserDefaults.standard.stringArray(forKey: savedPeerIdsDefaultsKey) ?? []).flatMap { peerId in
+            return self.getSavedPeer(withId: peerId)
         }
     }
     
     public func delete(peer: ClinkPeer) {
-        UserDefaults.standard.removeObject(forKey: peer.id.uuidString)
-    }
-}
-
-
+        UserDefaults.standard.removeObject(forKey: peer.id)
+    }
+}
+
+

        
        let peerManager = Clink.Configuration.peerManager ?? self
        
        if let peer = peerManager.getSavedPeer(withId: peripheral.identifier) {
            publish(notification: .connected(peer))
        }
    }

        Clink.Configuration.dispatchQueue.async {
            task.delegate = nil
            
            let peer = Peer(id: peripheral.identifier.uuidString)
            let peerManager = Clink.Configuration.peerManager ?? self
            
            peerManager.save(peer: peer)
