diff --git a/PadelClub/Data/Club.swift b/PadelClub/Data/Club.swift
index a00f56b..1991726 100644
--- a/PadelClub/Data/Club.swift
+++ b/PadelClub/Data/Club.swift
@@ -11,7 +11,7 @@ import LeStorage
 class Club : Storable, ObservableObject {
     static var resourceName: String = "clubs"
     
-    var id: String = UUID().uuidString
+    var id: String = Store.randomId()
     var name: String
     
     init(name: String) {
diff --git a/PadelClub/Data/DataStore.swift b/PadelClub/Data/DataStore.swift
index c7a351d..afd8f8a 100644
--- a/PadelClub/Data/DataStore.swift
+++ b/PadelClub/Data/DataStore.swift
@@ -11,17 +11,20 @@ import SwiftUI
 
 class DataStore : ObservableObject {
     
-    fileprivate var _store: Store
+//    fileprivate var _store: Store
     
     @ObservedObject fileprivate(set) var tournaments: StoredCollection<Tournament>
     @ObservedObject fileprivate(set) var clubs: StoredCollection<Club>
     
     init() {
-        let store = Store(synchronizationApiURL: "https://padelclub.app/api/")
+        let store = Store.main
+        store.synchronizationApiURL = "http://127.0.0.1:8000/api/"
+        
+//        let store = Store(synchronizationApiURL: "https://padelclub.app/api/")
+        self.clubs = store.registerCollection(synchronized: true)
         self.tournaments = store.registerCollection(synchronized: false)
-        self.clubs = store.registerCollection(synchronized: false)
         
-        self._store = store
+//        self._store = store
     }
     
 }
diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index 038fc4c..9d0051e 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -12,6 +12,10 @@ class Tournament: Storable {
     
     static var resourceName: String = "tournaments"
     
-    var id: String = UUID().uuidString
+    var id: String = Store.randomId()
     var name: String
+    var club_id: String
+    
+    var club: Club? { return self.findById(self.club_id) }
+    
 }