diff --git a/Sources/bowlin_project/lib/model/Game.dart b/Sources/bowlin_project/lib/model/Game.dart
index bf0065b..d4f6e23 100644
--- a/Sources/bowlin_project/lib/model/Game.dart
+++ b/Sources/bowlin_project/lib/model/Game.dart
@@ -8,7 +8,8 @@ class Game {
   List<String> _playerImages = [];
 
   // Constructor
-  Game(this._id, this._time, this._pointsCurrentUser, this._isFinished, this._playerImages);
+  Game(this._id, this._time, this._pointsCurrentUser, this._isFinished,
+      this._playerImages);
 
   // Getters and setters
   Uuid get id => _id;
@@ -40,4 +41,14 @@ class Game {
   set playerImages(List<String> value) {
     _playerImages = value;
   }
+
+  toJSONEncodable() {
+    Map<String, dynamic> m = new Map();
+
+    m['id'] = id;
+    m['time'] = time;
+    m['images'] = playerImages;
+
+    return m;
+  }
 }
diff --git a/Sources/bowlin_project/lib/model/GameDetail.dart b/Sources/bowlin_project/lib/model/GameDetail.dart
index 12a86f2..11554b2 100644
--- a/Sources/bowlin_project/lib/model/GameDetail.dart
+++ b/Sources/bowlin_project/lib/model/GameDetail.dart
@@ -24,7 +24,7 @@ class GameDetail {
       this._host,
       this._rounds,
       this._players);
-      
+
   // Getters and setters
   Uuid get id => _id;
 
@@ -79,4 +79,18 @@ class GameDetail {
   set players(List<Player> value) {
     _players = value;
   }
+
+  toJSONEncodable() {
+    Map<String, dynamic> m = new Map();
+
+    m['id'] = id;
+    m['time'] = time;
+    m['winner'] = winner;
+    m['nbPoints'] = nbPoints;
+    m['host'] = host;
+    m['rounds'] = rounds;
+    m['players'] = players;
+
+    return m;
+  }
 }
diff --git a/Sources/bowlin_project/lib/model/LocalManager/AuthManager.dart b/Sources/bowlin_project/lib/model/LocalManager/AuthManager.dart
deleted file mode 100644
index 97fbc45..0000000
--- a/Sources/bowlin_project/lib/model/LocalManager/AuthManager.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-library LocalLib;
-
-import '../IAuthManager.dart';
-import 'LocalData.dart';
-
-class AuthManager extends IAuthManager {
-  final LocalData parent;
-
-  // Constructor
-  AuthManager(this.parent);
-
-  // Methods
-  @override
-  bool verifiedUser(String name, String password) {
-    return false;
-  }
-}
diff --git a/Sources/bowlin_project/lib/model/LocalManager/LocalData.dart b/Sources/bowlin_project/lib/model/LocalManager/LocalData.dart
index a8555c1..25b8cb9 100644
--- a/Sources/bowlin_project/lib/model/LocalManager/LocalData.dart
+++ b/Sources/bowlin_project/lib/model/LocalManager/LocalData.dart
@@ -1,46 +1,47 @@
 library LocalLib;
 
 import '../IManager.dart';
-import '../IUserManager.dart';
 import '../IGameManager.dart';
-import '../Round.dart';
-import '../Stat.dart';
 import '../GameDetail.dart';
 import '../Game.dart';
-import '../Achievement.dart';
 import '../User.dart';
-import 'UserManager.dart';
 import 'GameManager.dart';
 import 'package:localstorage/localstorage.dart';
 
 class LocalData extends IManager {
-  late IUserManager _userMgr;
   late IGameManager _gameMgr;
 
   final LocalStorage storage = LocalStorage('local_key');
 
-  List<User> users = [];
+  late User user;
   List<GameDetail> gameDetails = [];
   List<Game> games = [];
 
   _saveToStorage() {
-    storage.setItem('users', toJSONEncodable());
+    storage.setItem('user', user.toJSONEncodable());
+    storage.setItem('games', toJSONEncodableGames());
+    storage.setItem('gameDetails', toJSONEncodableGameDetails());
   }
 
   _clearStorage() async {
     await storage.clear();
   }
 
-  toJSONEncodable() {
-    return users.map((user) {
-      return user.toJSONEncodable();
+  toJSONEncodableGames() {
+    return games.map((game) {
+      return game.toJSONEncodable();
+    }).toList();
+  }
+
+  toJSONEncodableGameDetails() {
+    return gameDetails.map((gameDetail) {
+      return gameDetail.toJSONEncodable();
     }).toList();
   }
 
   LocalData() {
-    _userMgr = UserManager(this);
     _gameMgr = GameManager(this);
-    users = storage.getItem('users');
+    user = storage.getItem('user');
     games = storage.getItem('games');
     gameDetails = storage.getItem('gameDetails');
   }
diff --git a/Sources/bowlin_project/lib/model/LocalManager/UserManager.dart b/Sources/bowlin_project/lib/model/LocalManager/UserManager.dart
deleted file mode 100644
index 46ed4ca..0000000
--- a/Sources/bowlin_project/lib/model/LocalManager/UserManager.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-library LocalLib;
-
-import '../IUserManager.dart';
-import '../IAuthManager.dart';
-import 'AuthManager.dart';
-import 'LocalData.dart';
-import '../User.dart';
-import 'package:uuid/uuid.dart';
-
-class UserManager extends IUserManager {
-  final LocalData parent;
-
-  // Constructor
-  UserManager(this.parent) : super(AuthManager(parent));
-
-  // Methods
-  @override
-  List<User> getUsersByName(String name) {
-    List<User> returnList = [];
-    parent.users.forEach((element) {
-      if (element.name == name) {
-        returnList.add(element);
-      }
-    });
-    return returnList;
-  }
-
-  @override
-  User getUserById(Uuid id) {
-    var returnUser;
-    parent.users.forEach((element) {
-      if (element.id == id) {
-        returnUser = element;
-      }
-    });
-    return returnUser;
-  }
-}
diff --git a/Sources/bowlin_project/lib/model/User.dart b/Sources/bowlin_project/lib/model/User.dart
index 39a9ccc..20c0225 100644
--- a/Sources/bowlin_project/lib/model/User.dart
+++ b/Sources/bowlin_project/lib/model/User.dart
@@ -43,11 +43,11 @@ class User extends Player {
     Map<String, dynamic> m = new Map();
 
     m['id'] = id;
-    m['Name'] = name;
-    m['Mail'] = _mail;
-    m['Image'] = image;
-    m['Achievement'] = achievements;
-    m['Friends'] = friends;
+    m['name'] = name;
+    m['image'] = image;
+    m['mail'] = mail;
+    m['achievements'] = achievements;
+    m['friends'] = friends;
     m['Stat'] = stat;
 
     return m;