diff --git a/source/Trek-12/DataContractPersistence/DataContractJson.cs b/source/Trek-12/DataContractPersistence/DataContractJson.cs
index 83f745a..2307f82 100644
--- a/source/Trek-12/DataContractPersistence/DataContractJson.cs
+++ b/source/Trek-12/DataContractPersistence/DataContractJson.cs
@@ -26,13 +26,13 @@ namespace DataContractPersistence
         /// <summary>
         /// Path (relative to the project)
         /// </summary>
-        public string FilePath { get; set; } = Path.Combine(AppDomain.CurrentDomain.BaseDirectory);
+        public string FilePath { get; set; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Trek_12");
 
         /// <summary>
         /// Load all the data from JSON file
         /// </summary>
         /// <returns>A tuple with the lists of players, games, maps and best scores</returns>
-        public (List<Player>, List<Game>, List<Map>, List<BestScore>) LoadData()
+        public (ObservableCollection<Player>, ObservableCollection<Game>, ObservableCollection<Map>, ObservableCollection<BestScore>) LoadData()
         {
             var JsonSerializer = new DataContractJsonSerializer(typeof(DataToPersist));
             DataToPersist? data = new DataToPersist();
@@ -52,8 +52,9 @@ namespace DataContractPersistence
         /// <param name="games"></param>
         /// <param name="maps"></param>
         /// <param name="bestScores"></param>
-        public void SaveData(List<Player> players, List<Game> games, List<Map> maps, List<BestScore> bestScores)
+        public void SaveData(ObservableCollection<Player> players, ObservableCollection<Game> games, ObservableCollection<Map> maps, ObservableCollection<BestScore> bestScores)
         {
+            Debug.WriteLine("Saving data at " + Path.Combine(FilePath, FileName));
             if (!Directory.Exists(FilePath))
             {
                 Debug.WriteLine("Directory created");
diff --git a/source/Trek-12/DataContractPersistence/DataContractXml.cs b/source/Trek-12/DataContractPersistence/DataContractXml.cs
index e09489d..8255ecc 100644
--- a/source/Trek-12/DataContractPersistence/DataContractXml.cs
+++ b/source/Trek-12/DataContractPersistence/DataContractXml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
@@ -23,13 +24,13 @@ namespace DataContractPersistence
         /// <summary>
         /// Path (relative to the project)
         /// </summary>
-        public string FilePath { get; set; } = Path.Combine(AppDomain.CurrentDomain.BaseDirectory);
+        public string FilePath { get; set; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Trek_12");
 
         /// <summary>
         /// Load all the data from XML file
         /// </summary>
         /// <returns>A tuple with the lists of players, games, maps and best scores</returns>
-        public (List<Player>, List<Game>, List<Map>, List<BestScore>) LoadData()
+        public (ObservableCollection<Player>, ObservableCollection<Game>, ObservableCollection<Map>, ObservableCollection<BestScore>) LoadData()
         {
             var serializer = new DataContractSerializer(typeof(DataToPersist));
             DataToPersist? data = new DataToPersist();
@@ -49,7 +50,7 @@ namespace DataContractPersistence
         /// <param name="games"></param>
         /// <param name="maps"></param>
         /// <param name="bestScores"></param>
-        public void SaveData(List<Player> players, List<Game> games, List<Map> maps, List<BestScore> bestScores)
+        public void SaveData(ObservableCollection<Player> players, ObservableCollection<Game> games, ObservableCollection<Map> maps, ObservableCollection<BestScore> bestScores)
         {
             if(!Directory.Exists(FilePath))
             {
diff --git a/source/Trek-12/DataContractPersistence/DataToPersist.cs b/source/Trek-12/DataContractPersistence/DataToPersist.cs
index 8aca714..b78b204 100644
--- a/source/Trek-12/DataContractPersistence/DataToPersist.cs
+++ b/source/Trek-12/DataContractPersistence/DataToPersist.cs
@@ -8,21 +8,21 @@ namespace DataContractPersistence
         /// <summary>
         /// List of players
         /// </summary>
-        public List<Player> Players { get; set; }
+        public ObservableCollection<Player> Players { get; set; }
 
         /// <summary>
         /// List of games (with all the data in it to be able to recreate the game)
         /// </summary>
-        public List<Game> Games { get; set; }
+        public ObservableCollection<Game> Games { get; set; }
 
         /// <summary>
         /// List of maps with their boards
         /// </summary>
-        public List<Map> Maps { get; set; }
+        public ObservableCollection<Map> Maps { get; set; }
 
         /// <summary>
         /// List of best scores
         /// </summary>
-        public List<BestScore> BestScores { get; set; }
+        public ObservableCollection<BestScore> BestScores { get; set; }
     }
 }
\ No newline at end of file