diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj
index 04dc537..650c1ec 100644
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@@ -3359,7 +3359,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -3403,7 +3403,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 6;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub ProdTest.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub ProdTest.xcscheme
index 08847de..739a24c 100644
--- a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub ProdTest.xcscheme	
+++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub ProdTest.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme
index ae639fe..ec242ea 100644
--- a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme	
+++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub Raw.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub TestFlight.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub TestFlight.xcscheme
index 109b27e..de0fb6b 100644
--- a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub TestFlight.xcscheme	
+++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub TestFlight.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -31,7 +31,7 @@
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme
index 601a498..c9495dd 100644
--- a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme
+++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PadelClub/Views/Calling/GroupStageCallingView.swift b/PadelClub/Views/Calling/GroupStageCallingView.swift
index 8eab1a2..42a7497 100644
--- a/PadelClub/Views/Calling/GroupStageCallingView.swift
+++ b/PadelClub/Views/Calling/GroupStageCallingView.swift
@@ -122,7 +122,7 @@ struct GroupStageCallingView: View {
             }
         }
         .overlay {
-            if groupStage.startDate == nil && groupStage.matches().filter({ $0.startDate != nil }).isEmpty {
+            if groupStage.startDate == nil && groupStage._matches().filter({ $0.startDate != nil }).isEmpty {
                 ContentUnavailableView {
                     Label("Aucun horaire défini", systemImage: "clock.badge.questionmark")
                 } description: {
diff --git a/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift b/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift
index cd6afdd..865e42c 100644
--- a/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift
+++ b/PadelClub/Views/GroupStage/Components/GroupStageSettingsView.swift
@@ -27,7 +27,7 @@ struct GroupStageSettingsView: View {
         _groupStage = Bindable(groupStage)
         _groupStageName = .init(wrappedValue: groupStage.name ?? "")
         _size = .init(wrappedValue: groupStage.size)
-        _courtIndex = .init(wrappedValue: groupStage.matches().first?.courtIndex ?? 0)
+        _courtIndex = .init(wrappedValue: groupStage._matches().first?.courtIndex ?? 0)
     }
     
     var tournamentStore: TournamentStore? {
@@ -66,12 +66,12 @@ struct GroupStageSettingsView: View {
             Section {
                 CourtPicker(title: "Piste dédié", selection: $courtIndex, maxCourt: tournament.courtCount)
                 RowButtonView("Confirmer", role: .destructive) {
-                    groupStage.matches().forEach { match in
+                    groupStage._matches().forEach { match in
                         match.setCourt(courtIndex)
                     }
                     
                     do {
-                        try tournamentStore?.matches.addOrUpdate(contentOfs: groupStage.matches())
+                        try tournamentStore?.matches.addOrUpdate(contentOfs: groupStage._matches())
                     } catch {
                         Logger.error(error)
                     }
@@ -91,7 +91,7 @@ struct GroupStageSettingsView: View {
                         teams.forEach { team in
                             team.groupStagePosition = nil
                             team.groupStage = nil
-                            groupStage.matches().forEach({ $0.updateTeamScores() })
+                            groupStage._matches().forEach({ $0.updateTeamScores() })
                         }
                         do {
                             try tournamentStore?.teamRegistrations.addOrUpdate(contentOfs: teams)
@@ -111,13 +111,13 @@ struct GroupStageSettingsView: View {
             
             Section {
                 RowButtonView("Retirer tous les horaires", role: .destructive) {
-                    groupStage.matches().forEach { match in
+                    groupStage._matches().forEach { match in
                         match.startDate = nil
                         match.endDate = nil
                     }
                     
                     do {
-                        try tournamentStore?.matches.addOrUpdate(contentOfs: groupStage.matches())
+                        try tournamentStore?.matches.addOrUpdate(contentOfs: groupStage._matches())
                     } catch {
                         Logger.error(error)
                     }
@@ -130,7 +130,7 @@ struct GroupStageSettingsView: View {
                     teams.forEach { team in
                         team.groupStagePosition = nil
                         team.groupStage = nil
-                        groupStage.matches().forEach({ $0.updateTeamScores() })
+                        groupStage._matches().forEach({ $0.updateTeamScores() })
                     }
                     do {
                         try tournamentStore?.teamRegistrations.addOrUpdate(contentOfs: teams)
diff --git a/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift b/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift
index cbb84c0..00e83b9 100644
--- a/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift
+++ b/PadelClub/Views/GroupStage/Components/GroupStageTeamView.swift
@@ -103,7 +103,7 @@ struct GroupStageTeamView: View {
                             team.groupStagePosition = nil
                             team.groupStage = nil
                             _save()
-                            groupStage.matches().forEach({ $0.updateTeamScores() })
+                            groupStage._matches().forEach({ $0.updateTeamScores() })
                         }
                     }
                     
diff --git a/PadelClub/Views/GroupStage/GroupStageView.swift b/PadelClub/Views/GroupStage/GroupStageView.swift
index e88126e..bc8acb9 100644
--- a/PadelClub/Views/GroupStage/GroupStageView.swift
+++ b/PadelClub/Views/GroupStage/GroupStageView.swift
@@ -245,7 +245,7 @@ struct GroupStageView: View {
                             print(team.pasteData())
                             team.groupStage = groupStage.id
                             team.groupStagePosition = index
-                            groupStage.matches().forEach({ $0.updateTeamScores() })
+                            groupStage._matches().forEach({ $0.updateTeamScores() })
                             do {
                                 try tournamentStore?.teamRegistrations.addOrUpdate(instance: team)
                             } catch {
diff --git a/PadelClub/Views/GroupStage/GroupStagesSettingsView.swift b/PadelClub/Views/GroupStage/GroupStagesSettingsView.swift
index 2ee131b..f87f6d3 100644
--- a/PadelClub/Views/GroupStage/GroupStagesSettingsView.swift
+++ b/PadelClub/Views/GroupStage/GroupStagesSettingsView.swift
@@ -144,8 +144,8 @@ struct GroupStagesSettingsView: View {
             
             Section {
                 RowButtonView("Retirer tous les horaires", role: .destructive) {
-                    let matches = tournament.groupStages().flatMap({ $0.matches() })
-                    tournament.groupStages().flatMap({ $0.matches() }).forEach { match in
+                    let matches = tournament.groupStages().flatMap({ $0._matches() })
+                    tournament.groupStages().flatMap({ $0._matches() }).forEach { match in
                         match.startDate = nil
                         match.endDate = nil
                     }
@@ -239,7 +239,7 @@ struct GroupStagesSettingsView: View {
                         teams.forEach { team in
                             team.groupStagePosition = nil
                             team.groupStage = nil
-                            groupStage.matches().forEach({ $0.updateTeamScores() })
+                            groupStage._matches().forEach({ $0.updateTeamScores() })
                         }
                         do {
                             try tournamentStore?.teamRegistrations.addOrUpdate(contentOfs: teams)