diff --git a/GameBrowser/Configuration/configPage.html b/GameBrowser/Configuration/configPage.html
index 6d988d3..53bf691 100644
--- a/GameBrowser/Configuration/configPage.html
+++ b/GameBrowser/Configuration/configPage.html
@@ -143,6 +143,12 @@ <h3 style="display: inline-block; vertical-align: middle; margin-left: 5px;">
 
                         html += '<div class="selectContainer">';
                         html += '<select class="selectGameSystem" is="emby-select" label="Game system:">';
+
+                        // TODO Find a way to get acces to GameSystemDefinition.All to fill this list.
+                        // for (var i = 0; i < config.GameSystemDefinitions.length; i++) {
+                        //     var definition = config.GameSystemDefinition[i];
+                        //     html += '<option value="' + definition.Name + '">' + definition.ConsoleType + '</option>';
+                        // }
                         html += '<option value="3DO">3DO</option>\
                                 <option value="Amiga">Amiga</option>\
                                 <option value="Arcade">Arcade</option>\
@@ -151,6 +157,8 @@ <h3 style="display: inline-block; vertical-align: middle; margin-left: 5px;">
                                 <option value="Atari 7800">Atari 7800</option>\
                                 <option value="Atari Jaguar">Atari Jaguar</option>\
                                 <option value="Atari Jaguar CD">Atari Jaguar CD</option>\
+                                <option value="Atari Lynx">Atari Lynx</option>\
+                                <option value="Atari ST">Atari ST</option>\
                                 <option value="Atari XE">Atari XE</option>\
                                 <option value="Colecovision">Colecovision</option>\
                                 <option value="Commodore 64">Commodore 64</option>\
@@ -161,6 +169,8 @@ <h3 style="display: inline-block; vertical-align: middle; margin-left: 5px;">
                                 <option value="Xbox 360">Microsoft XBox 360</option>\
                                 <option value="Xbox One">Microsoft XBox One</option>\
                                 <option value="Neo Geo">Neo-Geo</option>\
+                                <option value="Neo Geo Pocket">Neo-Geo Pocket</option>\
+                                <option value="Neo Geo Pocket Color">Neo-Geo Pocket Color</option>\
                                 <option value="Nintendo 64">Nintendo 64</option>\
                                 <option value="Nintendo DS">Nintendo DS</option>\
                                 <option value="Game Boy">Nintendo Game Boy</option>\
diff --git a/GameBrowser/GameBrowser.csproj b/GameBrowser/GameBrowser.csproj
index 0e987d9..2cb74bf 100644
--- a/GameBrowser/GameBrowser.csproj
+++ b/GameBrowser/GameBrowser.csproj
@@ -20,4 +20,8 @@
     <PackageReference Include="mediabrowser.server.core" Version="3.3.20" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /y &quot;$(targetdir)&quot; &quot;%APPDATA%\Emby-Server\plugins&quot;&#xD;&#xA;" />
+  </Target>
+
 </Project>
diff --git a/GameBrowser/Properties/launchSettings.json b/GameBrowser/Properties/launchSettings.json
new file mode 100644
index 0000000..184767a
--- /dev/null
+++ b/GameBrowser/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "GameBrowser": {
+      "commandName": "Executable",
+      "executablePath": "%APPDATA%\\Emby-Server\\system\\EmbyServer.exe"
+    }
+  }
+}
\ No newline at end of file
diff --git a/GameBrowser/Providers/CustomGameProvider.cs b/GameBrowser/Providers/CustomGameProvider.cs
index 8fb3d6d..43582e1 100644
--- a/GameBrowser/Providers/CustomGameProvider.cs
+++ b/GameBrowser/Providers/CustomGameProvider.cs
@@ -32,7 +32,8 @@ public Task<ItemUpdateType> FetchAsync(Game item, MetadataRefreshOptions options
 
                 if (!string.IsNullOrEmpty(platform))
                 {
-                    item.GameSystem = ResolverHelper.GetGameSystemFromPlatform(platform);
+                    item.GameSystem = ResolverHelper.GetExtendedInfoFromPlatform(platform)?.Name;
+
                     result = _cachedResultWithUpdate;
                 }
             }
diff --git a/GameBrowser/Providers/EmuMovies/EmuMoviesImageProvider.cs b/GameBrowser/Providers/EmuMovies/EmuMoviesImageProvider.cs
index 213ea60..5a175ef 100644
--- a/GameBrowser/Providers/EmuMovies/EmuMoviesImageProvider.cs
+++ b/GameBrowser/Providers/EmuMovies/EmuMoviesImageProvider.cs
@@ -1,14 +1,15 @@
-using MediaBrowser.Common.Net;
+using GameBrowser.Resolvers;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
-using System.Net;
 
 namespace GameBrowser.Providers.EmuMovies
 {
@@ -53,14 +54,26 @@ public Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, ImageType ima
 
             switch (imageType)
             {
-                case ImageType.Box:
+                case ImageType.Backdrop:
                     return FetchImages(game, EmuMoviesMediaTypes.Cabinet, imageType, cancellationToken);
-                case ImageType.Screenshot:
-                    return FetchImages(game, EmuMoviesMediaTypes.Snap, imageType, cancellationToken);
+                case ImageType.Banner:
+                    return FetchImages(game, EmuMoviesMediaTypes.Banner, imageType, cancellationToken);
+                case ImageType.Primary:
+                    return FetchImages(game, EmuMoviesMediaTypes.Box, imageType, cancellationToken);
+                case ImageType.BoxRear:
+                    return FetchImages(game, EmuMoviesMediaTypes.BoxBack, imageType, cancellationToken);
                 case ImageType.Disc:
                     return FetchImages(game, EmuMoviesMediaTypes.Cart, imageType, cancellationToken);
                 case ImageType.Menu:
                     return FetchImages(game, EmuMoviesMediaTypes.Title, imageType, cancellationToken);
+                case ImageType.Screenshot:
+                    return FetchImages(game, EmuMoviesMediaTypes.Snap, imageType, cancellationToken);
+
+                case ImageType.Art:
+                case ImageType.Box:
+                case ImageType.Logo:
+                case ImageType.Thumb:
+                case ImageType.Chapter:
                 default:
                     throw new ArgumentException("Unrecognized image type");
             }
@@ -82,7 +95,9 @@ private async Task<IEnumerable<RemoteImageInfo>> FetchImages(Game game, EmuMovie
 
             if (sessionId == null) return list;
 
-            var url = string.Format(EmuMoviesUrls.Search, WebUtility.UrlEncode(game.Name), GetEmuMoviesPlatformFromGameSystem(game.GameSystem), mediaType, sessionId);
+            var emuMoviesPlatform = ResolverHelper.GetExtendedInfoFromGameSystem(game.GameSystem)?.EmuMoviesPlatform;
+            if (string.IsNullOrEmpty(emuMoviesPlatform)) return list;
+            var url = string.Format(EmuMoviesUrls.Search, WebUtility.UrlEncode(game.Name), emuMoviesPlatform, mediaType, sessionId);
 
             using (var response = await _httpClient.SendAsync(new HttpRequestOptions
             {
@@ -130,223 +145,9 @@ private async Task<IEnumerable<RemoteImageInfo>> FetchImages(Game game, EmuMovie
             return list;
         }
 
-        private string GetEmuMoviesPlatformFromGameSystem(string platform)
-        {
-            string emuMoviesPlatform = null;
-
-            switch (platform)
-            {
-                case "3DO":
-                    emuMoviesPlatform = "Panasonic_3DO";
-
-                    break;
-
-                case "Amiga":
-                    emuMoviesPlatform = "";
-
-                    break;
-
-                case "Arcade":
-                    emuMoviesPlatform = "MAME";
-
-                    break;
-
-                case "Atari 2600":
-                    emuMoviesPlatform = "Atari_2600";
-
-                    break;
-
-                case "Atari 5200":
-                    emuMoviesPlatform = "Atari_5200";
-
-                    break;
-
-                case "Atari 7800":
-                    emuMoviesPlatform = "Atari_7800";
-
-                    break;
-
-                case "Atari XE":
-                    emuMoviesPlatform = "Atari_8_bit";
-
-                    break;
-
-                case "Atari Jaguar":
-                    emuMoviesPlatform = "Atari_Jaguar";
-
-                    break;
-
-                case "Atari Jaguar CD":
-                    emuMoviesPlatform = "Atari_Jaguar";
-
-                    break;
-
-                case "Colecovision":
-                    emuMoviesPlatform = "Coleco_Vision";
-
-                    break;
-
-                case "Commodore 64":
-                    emuMoviesPlatform = "Commodore_64";
-
-                    break;
-
-                case "Commodore Vic-20":
-                    emuMoviesPlatform = "";
-
-                    break;
-
-                case "Intellivision":
-                    emuMoviesPlatform = "Mattel_Intellivision";
-
-                    break;
-
-                case "Xbox":
-                    emuMoviesPlatform = "Microsoft_Xbox";
-
-                    break;
-
-                case "Neo Geo":
-                    emuMoviesPlatform = "SNK_Neo_Geo_AES";
-
-                    break;
-
-                case "Nintendo 64":
-                    emuMoviesPlatform = "Nintendo_N64";
-
-                    break;
-
-                case "Nintendo DS":
-                    emuMoviesPlatform = "Nintendo_DS";
-
-                    break;
-
-                case "Nintendo":
-                    emuMoviesPlatform = "Nintendo_NES";
-
-                    break;
-
-                case "Game Boy":
-                    emuMoviesPlatform = "Nintendo_Game_Boy";
-
-                    break;
-
-                case "Game Boy Advance":
-                    emuMoviesPlatform = "Nintendo_Game_Boy_Advance";
-
-                    break;
-
-                case "Game Boy Color":
-                    emuMoviesPlatform = "Nintendo_Game_Boy_Color";
-
-                    break;
-
-                case "Gamecube":
-                    emuMoviesPlatform = "Nintendo_GameCube";
-
-                    break;
-
-                case "Super Nintendo":
-                    emuMoviesPlatform = "Nintendo_SNES";
-
-                    break;
-
-                case "Virtual Boy":
-                    emuMoviesPlatform = "";
-
-                    break;
-
-                case "Nintendo Wii":
-                    emuMoviesPlatform = "";
-
-                    break;
-
-                case "DOS":
-                    emuMoviesPlatform = "";
-
-                    break;
-
-                case "Windows":
-                    emuMoviesPlatform = "";
-
-                    break;
-
-                case "Sega 32X":
-                    emuMoviesPlatform = "Sega_Genesis";
-
-                    break;
-
-                case "Sega CD":
-                    emuMoviesPlatform = "Sega_Genesis";
-
-                    break;
-
-                case "Dreamcast":
-                    emuMoviesPlatform = "Sega_Dreamcast";
-
-                    break;
-
-                case "Game Gear":
-                    emuMoviesPlatform = "Sega_Game_Gear";
-
-                    break;
-
-                case "Sega Genesis":
-                    emuMoviesPlatform = "Sega_Genesis";
-
-                    break;
-
-                case "Sega Master System":
-                    emuMoviesPlatform = "Sega_Master_System";
-
-                    break;
-
-                case "Sega Mega Drive":
-                    emuMoviesPlatform = "Sega_Genesis";
-
-                    break;
-
-                case "Sega Saturn":
-                    emuMoviesPlatform = "Sega_Saturn";
-
-                    break;
-
-                case "Sony Playstation":
-                    emuMoviesPlatform = "Sony_Playstation";
-
-                    break;
-
-                case "PS2":
-                    emuMoviesPlatform = "Sony_Playstation_2";
-
-                    break;
-
-                case "PSP":
-                    emuMoviesPlatform = "Sony_PSP";
-
-                    break;
-
-                case "TurboGrafx 16":
-                    emuMoviesPlatform = "NEC_TurboGrafx_16";
-
-                    break;
-
-                case "TurboGrafx CD":
-                    emuMoviesPlatform = "NEC_TurboGrafx_16";
-                    break;
-
-                case "ZX Spectrum":
-                    emuMoviesPlatform = "";
-                    break;
-            }
-
-            return emuMoviesPlatform;
-
-        }
-
         public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
         {
-            return new[] { ImageType.Box, ImageType.Disc, ImageType.Screenshot, ImageType.Menu };
+            return new[] { ImageType.Primary, ImageType.Backdrop, ImageType.Banner, ImageType.BoxRear, ImageType.Disc, ImageType.Menu, ImageType.Screenshot };
         }
 
         public string Name
diff --git a/GameBrowser/Providers/EmuMovies/EmuMoviesMediaTypes.cs b/GameBrowser/Providers/EmuMovies/EmuMoviesMediaTypes.cs
index 31eb6c9..b747ada 100644
--- a/GameBrowser/Providers/EmuMovies/EmuMoviesMediaTypes.cs
+++ b/GameBrowser/Providers/EmuMovies/EmuMoviesMediaTypes.cs
@@ -2,6 +2,9 @@
 {
     enum EmuMoviesMediaTypes
     {
+        Banner,
+        Box,
+        BoxBack,
         Cabinet,
         Cart,
         Snap,
diff --git a/GameBrowser/Providers/GamesDb/GamesDbGameProvider.cs b/GameBrowser/Providers/GamesDb/GamesDbGameProvider.cs
index 8491432..8549dbf 100644
--- a/GameBrowser/Providers/GamesDb/GamesDbGameProvider.cs
+++ b/GameBrowser/Providers/GamesDb/GamesDbGameProvider.cs
@@ -1,22 +1,23 @@
 using GameBrowser.Extensions;
+using GameBrowser.Resolvers;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Providers;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
-using System.Linq;
-using MediaBrowser.Model.IO;
 
 namespace GameBrowser.Providers.GamesDb
 {
@@ -209,7 +210,7 @@ private async Task<IEnumerable<RemoteSearchResult>> FindGames(GameInfo item, boo
             cancellationToken.ThrowIfCancellationRequested();
 
             var name = item.Name;
-            var platform = GetTgdbPlatformFromGameSystem(item.GameSystem);
+            var platform = ResolverHelper.GetExtendedInfoFromGameSystem(item.GameSystem)?.TgbdPlatform;
             var year = item.Year;
 
             foreach (var re in NameMatches)
@@ -225,8 +226,7 @@ private async Task<IEnumerable<RemoteSearchResult>> FindGames(GameInfo item, boo
 
                         if (yearValue != null && !string.IsNullOrWhiteSpace(yearValue.Value))
                         {
-                            int yearNum;
-                            if (Int32.TryParse(yearValue.Value, out yearNum))
+                            if (Int32.TryParse(yearValue.Value, out int yearNum))
                             {
                                 year = yearNum;
                             }
@@ -617,243 +617,5 @@ private string MapGenre(string g)
 
             return GenreMap.ContainsKey(g) ? GenreMap[g] : "";
         }
-        private string GetTgdbPlatformFromGameSystem(string gameSystem)
-        {
-            string tgdbPlatformString = null;
-
-            switch (gameSystem)
-            {
-                case "3DO":
-                    tgdbPlatformString = "3DO";
-
-                    break;
-
-                case "Amiga":
-                    tgdbPlatformString = "Amiga";
-
-                    break;
-
-                case "Arcade":
-                    tgdbPlatformString = "Arcade";
-
-                    break;
-
-                case "Atari 2600":
-                    tgdbPlatformString = "Atari 2600";
-
-                    break;
-
-                case "Atari 5200":
-                    tgdbPlatformString = "Atari 5200";
-
-                    break;
-
-                case "Atari 7800":
-                    tgdbPlatformString = "Atari 7800";
-
-                    break;
-
-                case "Atari XE":
-                    tgdbPlatformString = "Atari XE";
-
-                    break;
-
-                case "Atari Jaguar":
-                    tgdbPlatformString = "Atari Jaguar";
-
-                    break;
-
-                case "Atari Jaguar CD":
-                    tgdbPlatformString = "Atari Jaguar CD";
-
-                    break;
-
-                case "Colecovision":
-                    tgdbPlatformString = "Colecovision";
-
-                    break;
-
-                case "Commodore 64":
-                    tgdbPlatformString = "Commodore 64";
-
-                    break;
-
-                case "Commodore Vic-20":
-                    tgdbPlatformString = "Commodore Vic-20";
-
-                    break;
-
-                case "Intellivision":
-                    tgdbPlatformString = "Intellivision";
-
-                    break;
-
-                case "Xbox":
-                    tgdbPlatformString = "Microsoft Xbox";
-
-                    break;
-
-                case "Xbox 360":
-                    tgdbPlatformString = "Microsoft Xbox 360";
-
-                    break;
-
-                case "Xbox One":
-                    tgdbPlatformString = "Microsoft Xbox One";
-
-                    break;
-
-                case "Neo Geo":
-                    tgdbPlatformString = "NeoGeo";
-
-                    break;
-
-                case "Nintendo 64":
-                    tgdbPlatformString = "Nintendo 64";
-
-                    break;
-
-                case "Nintendo DS":
-                    tgdbPlatformString = "Nintendo DS";
-
-                    break;
-
-                case "Nintendo":
-                    tgdbPlatformString = "Nintendo Entertainment System (NES)";
-
-                    break;
-
-                case "Game Boy":
-                    tgdbPlatformString = "Nintendo Game Boy";
-
-                    break;
-
-                case "Game Boy Advance":
-                    tgdbPlatformString = "Nintendo Game Boy Advance";
-
-                    break;
-
-                case "Game Boy Color":
-                    tgdbPlatformString = "Nintendo Game Boy Color";
-
-                    break;
-
-                case "Gamecube":
-                    tgdbPlatformString = "Nintendo GameCube";
-
-                    break;
-
-                case "Super Nintendo":
-                    tgdbPlatformString = "Super Nintendo (SNES)";
-
-                    break;
-
-                case "Virtual Boy":
-                    tgdbPlatformString = "Nintendo Virtual Boy";
-
-                    break;
-
-                case "Nintendo Wii":
-                    tgdbPlatformString = "Nintendo Wii";
-
-                    break;
-
-                case "Nintendo Wii U":
-                    tgdbPlatformString = "Nintendo Wii U";
-
-                    break;
-
-                case "DOS":
-                    tgdbPlatformString = "PC";
-
-                    break;
-
-                case "Windows":
-                    tgdbPlatformString = "PC";
-
-                    break;
-
-                case "Sega 32X":
-                    tgdbPlatformString = "Sega 32X";
-
-                    break;
-
-                case "Sega CD":
-                    tgdbPlatformString = "Sega CD";
-
-                    break;
-
-                case "Sega Dreamcast":
-                    tgdbPlatformString = "Sega Dreamcast";
-
-                    break;
-
-                case "Game Gear":
-                    tgdbPlatformString = "Sega Game Gear";
-
-                    break;
-
-                case "Sega Genesis":
-                    tgdbPlatformString = "Sega Genesis";
-
-                    break;
-
-                case "Sega Master System":
-                    tgdbPlatformString = "Sega Master System";
-
-                    break;
-
-                case "Sega Mega Drive":
-                    tgdbPlatformString = "Sega Genesis";
-
-                    break;
-
-                case "Sega Saturn":
-                    tgdbPlatformString = "Sega Saturn";
-
-                    break;
-
-                case "Sony Playstation":
-                    tgdbPlatformString = "Sony Playstation";
-
-                    break;
-
-                case "PS2":
-                    tgdbPlatformString = "Sony Playstation 2";
-
-                    break;
-
-                case "PS3":
-                    tgdbPlatformString = "Sony Playstation 3";
-
-                    break;
-
-                case "PS4":
-                    tgdbPlatformString = "Sony Playstation 4";
-
-                    break;
-
-                case "PSP":
-                    tgdbPlatformString = "Sony PSP";
-
-                    break;
-
-                case "TurboGrafx 16":
-                    tgdbPlatformString = "TurboGrafx 16";
-
-                    break;
-
-                case "TurboGrafx CD":
-                    tgdbPlatformString = "TurboGrafx CD";
-                    break;
-
-                case "ZX Spectrum":
-                    tgdbPlatformString = "ZX Spectrum";
-                    break;
-            }
-
-            return tgdbPlatformString;
-        }
-
     }
 }
diff --git a/GameBrowser/Providers/GamesDb/GamesDbGameSystemProvider.cs b/GameBrowser/Providers/GamesDb/GamesDbGameSystemProvider.cs
index 197c56d..0b7f049 100644
--- a/GameBrowser/Providers/GamesDb/GamesDbGameSystemProvider.cs
+++ b/GameBrowser/Providers/GamesDb/GamesDbGameSystemProvider.cs
@@ -156,11 +156,9 @@ private void ProcessConsoleXml(GameSystem console, XmlDocument xmlDocument)
         public string FindPlatformId(GameSystemInfo console)
         {
             var platformSettings = Plugin.Instance.Configuration.GameSystems.FirstOrDefault(gs => console.Path.Equals(gs.Path));
-
             if (platformSettings != null)
             {
-                var id = ResolverHelper.GetTgdbId(platformSettings.ConsoleType);
-
+                var id = ResolverHelper.GetExtendedInfoFromConsoleType(platformSettings.ConsoleType)?.TgbdId;
                 if (id != null)
                 {
                     return id.ToString();
diff --git a/GameBrowser/Resolvers/GameResolver.cs b/GameBrowser/Resolvers/GameResolver.cs
index 31924f0..60609a0 100644
--- a/GameBrowser/Resolvers/GameResolver.cs
+++ b/GameBrowser/Resolvers/GameResolver.cs
@@ -92,31 +92,26 @@ protected override Game Resolve(ItemResolveArgs args)
         /// <returns>A Game</returns>
         private Game GetGame(ItemResolveArgs args, string consoleType)
         {
-            var validExtensions = GetExtensions(consoleType);
+            var gameSystemDefinition = ResolverHelper.GetExtendedInfoFromConsoleType(consoleType);
+            var validExtensions = gameSystemDefinition?.Extensions;
 
-            var gameFiles = args.FileSystemChildren.Where(f =>
-            {
-                var fileExtension = Path.GetExtension(f.FullName);
-
-                return validExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
+            var gameFiles = args.FileSystemChildren.Where(f => validExtensions.Contains(Path.GetExtension(f.FullName), StringComparer.OrdinalIgnoreCase)).ToArray();
 
-            }).ToList();
-
-            if (gameFiles.Count == 0)
+            if (gameFiles.Length == 0)
             {
-                _logger.Error("gameFiles is 0 for " + args.Path);
+                _logger.Error($"gameFiles is 0 for {args.Path}. Expected: {string.Join(";", validExtensions)}. Found: {string.Join(";", args.FileSystemChildren.Where(f => !f.IsDirectory).Select(f => Path.GetExtension(f.FullName)).Distinct())}.");
                 return null;
             }
 
             var game = new Game
             {
                 Path = gameFiles[0].FullName,
-                GameSystem = ResolverHelper.GetGameSystemFromPlatform(consoleType)
+                GameSystem = gameSystemDefinition?.Name
             };
 
             game.IsPlaceHolder = false;
                 
-            if (gameFiles.Count > 1)
+            if (gameFiles.Length > 1)
             {
                 game.MultiPartGameFiles = gameFiles.Select(i => i.FullName).ToArray();
                 game.IsMultiPart = true;
@@ -124,154 +119,5 @@ private Game GetGame(ItemResolveArgs args, string consoleType)
 
             return game;
         }
-
-
-        private IEnumerable<string> GetExtensions(string consoleType)
-        {
-            switch (consoleType)
-            {
-                case "3DO":
-                    return new[] { ".iso", ".cue" };
-
-                case "Amiga":
-                    return new[] { ".iso", ".adf" };
-
-                case "Arcade":
-                    return new[] { ".zip" };
-
-                case "Atari 2600":
-                    return new[] { ".bin", ".a26" };
-
-                case "Atari 5200":
-                    return new[] { ".bin", ".a52" };
-
-                case "Atari 7800":
-                    return new[] { ".a78" };
-
-                case "Atari XE":
-                    return new[] { ".rom" };
-
-                case "Atari Jaguar":
-                    return new[] { ".j64", ".zip" };
-
-                case "Atari Jaguar CD": // still need to verify
-                    return new[] { ".iso" };
-
-                case "Colecovision":
-                    return new[] { ".col", ".rom" };
-
-                case "Commodore 64":
-                    return new[] { ".d64", ".g64", ".prg", ".tap", ".t64" };
-
-                case "Commodore Vic-20":
-                    return new[] { ".prg" };
-
-                case "Intellivision":
-                    return new[] { ".int", ".rom" };
-
-                case "Xbox":
-                    return new[] { ".disc", ".iso" };
-
-                case "Xbox 360":
-                    return new[] { ".disc" };
-
-                case "Xbox One":
-                    return new[] { ".disc" };
-
-                case "Neo Geo":
-                    return new[] { ".zip", ".iso" };
-
-                case "Nintendo 64":
-                    return new[] { ".z64", ".v64", ".usa", ".jap", ".pal", ".rom", ".n64", ".zip" };
-
-                case "Nintendo DS":
-                    return new[] { ".nds", ".zip" };
-
-                case "Nintendo":
-                    return new[] { ".nes", ".zip" };
-
-                case "Game Boy":
-                    return new[] { ".gb", ".zip" };
-
-                case "Game Boy Advance":
-                    return new[] { ".gba", ".zip" };
-
-                case "Game Boy Color":
-                    return new[] { ".gbc", ".zip" };
-
-                case "Gamecube":
-                    return new[] { ".iso", ".bin", ".img", ".gcm", ".gcz" };
-
-                case "Super Nintendo":
-                    return new[] { ".smc", ".zip", ".fam", ".rom", ".sfc", ".fig" };
-
-                case "Virtual Boy":
-                    return new[] { ".vb" };
-
-                case "Nintendo Wii":
-                    return new[] { ".iso", ".dol", ".ciso", ".wbfs", ".wad", ".gcz" };
-
-                case "Nintendo Wii U":
-                    return new[] { ".disc", ".wud" };
-
-                case "DOS":
-                    return new[] { ".gbdos", ".disc" };
-
-                case "Windows":
-                    return new[] { ".gbwin", ".disc" };
-
-                case "Sega 32X":
-                    return new[] { ".iso", ".bin", ".img", ".zip", ".32x" };
-
-                case "Sega CD":
-                    return new[] { ".iso", ".bin", ".img" };
-
-                case "Dreamcast":
-                    return new[] { ".chd", ".gdi", ".cdi" };
-
-                case "Game Gear":
-                    return new[] { ".gg", ".zip" };
-
-                case "Sega Genesis":
-                    return new[] { ".smd", ".bin", ".gen", ".zip", ".md" };
-
-                case "Sega Master System":
-                    return new[] { ".sms", ".sg", ".sc", ".zip" };
-
-                case "Sega Mega Drive":
-                    return new[] { ".smd", ".zip", ".md" };
-
-                case "Sega Saturn":
-                    return new[] { ".iso", ".bin", ".img" };
-
-                case "Sony Playstation":
-                    return new[] { ".iso", ".cue", ".img", ".ps1", ".pbp" };
-
-                case "PS2":
-                    return new[] { ".iso", ".bin" };
-
-                case "PS3":
-                    return new[] { ".disc" };
-
-                case "PS4":
-                    return new[] { ".disc" };
-
-                case "PSP":
-                    return new[] { ".iso", ".cso" };
-
-                case "TurboGrafx 16":
-                    return new[] { ".pce", ".zip" };
-
-                case "TurboGrafx CD":
-                    return new[] { ".bin", ".iso" };
-
-                case "ZX Spectrum":
-                    return new[] { ".z80", ".tap", ".tzx" };
-
-                default:
-                    return new string[] { };
-            }
-
-        }
     }
 }
diff --git a/GameBrowser/Resolvers/GameSystemDefinition.cs b/GameBrowser/Resolvers/GameSystemDefinition.cs
new file mode 100644
index 0000000..4a0179a
--- /dev/null
+++ b/GameBrowser/Resolvers/GameSystemDefinition.cs
@@ -0,0 +1,539 @@
+namespace GameBrowser.Resolvers
+{
+    public class GameSystemDefinition
+    {
+        public string Name { get; internal set; }
+        public string ConsoleType { get; internal set; }
+        public string[] Extensions { get; internal set; }
+
+        public int TgbdId { get; internal set; }
+        public string TgbdPlatform { get; internal set; }
+        public string EmuMoviesPlatform { get; internal set; }
+
+        public static GameSystemDefinition[] All = new[]
+        {
+                // Arcade
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Arcade",
+                    Name = "Arcade",
+                    Extensions = new[] { ".zip" },
+                    TgbdId = 23,
+                    TgbdPlatform = "Arcade",
+                    EmuMoviesPlatform = "MAME"
+                },
+
+                // Atari - 2600
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari 2600",
+                    Name = "Atari2600",
+                    Extensions = new[] { ".zip", ".7z", ".bin", ".a26" },
+                    TgbdId = 22,
+                    TgbdPlatform = "Atari 2600",
+                    EmuMoviesPlatform = "Atari_2600"
+                },
+                // Atari - 5200
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari 5200",
+                    Name = "Atari5200",
+                    Extensions = new[] { ".zip", ".7z", ".bin", ".a52" },
+                    TgbdId = 26,
+                    TgbdPlatform = "Atari 5200",
+                    EmuMoviesPlatform = "Atari_5200"
+                },
+                // Atari - 7800
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari 7800",
+                    Name = "Atari7800",
+                    Extensions = new[] { ".zip", ".7z", ".a78" },
+                    TgbdId = 27,
+                    TgbdPlatform = "Atari 7800",
+                    EmuMoviesPlatform = "Atari_7800"
+                },
+                // Atari - Jaguar
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari Jaguar",
+                    Name = "AtariJaguar",
+                    Extensions = new[] { ".zip", ".7z", ".j64" },
+                    TgbdId = 28,
+                    TgbdPlatform = "Atari Jaguar",
+                    EmuMoviesPlatform = "Atari_Jaguar"
+                },
+                // Atari - Jaguar CD
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari Jaguar CD",
+                    Name = "AtariJaguarCD",
+                    Extensions = new[] { ".iso" },
+                    TgbdId = 29,
+                    TgbdPlatform = "Atari Jaguar CD",
+                    EmuMoviesPlatform = "Atari_Jaguar"
+                },
+                // Atari - Lynx
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari Lynx",
+                    Name = "AtariLynx",
+                    Extensions = new[] { ".zip", ".7z", ".lnx" },
+                    TgbdId = 4924,
+                    TgbdPlatform = "Atari Lynx",
+                    EmuMoviesPlatform = null
+                },
+                // Atari - ST
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari ST",
+                    Name = "AtariST",
+                    Extensions = new[] { ".ipf" },
+                    TgbdId = 4937,
+                    TgbdPlatform = "Atari ST",
+                    EmuMoviesPlatform = null
+                },
+                // Atari - XE
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Atari XE",
+                    Name = "AtariXE",
+                    Extensions = new[] { ".zip", ".7z", ".rom" },
+                    TgbdId = 30,
+                    TgbdPlatform = "Atari XE",
+                    EmuMoviesPlatform = "Atari_8_bit"
+                },
+
+                // Coleco - Colecovision
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Colecovision",
+                    Name = "Colecovision",
+                    Extensions = new[] { ".zip", ".7z", ".col", ".rom" },
+                    TgbdId = 31,
+                    TgbdPlatform = "Colecovision",
+                    EmuMoviesPlatform = "Coleco_Vision"
+                },
+                
+                // Commodore - 64
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Commodore 64",
+                    Name = "Commodore64",
+                    Extensions = new[] { ".zip", ".7z", ".crt", ".d64", ".g64", ".prg", ".tap", ".t64", ".bin" },
+                    TgbdId = 40,
+                    TgbdPlatform = "Commodore 64",
+                    EmuMoviesPlatform = "Commodore_64"
+                },
+                // Commodore - Amiga
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Amiga",
+                    Name = "Amiga",
+                    Extensions = new[] { ".iso", ".adf", ".ipf", ".rom" },
+                    TgbdId = 4911,
+                    TgbdPlatform = "Amiga",
+                    EmuMoviesPlatform = null
+                },
+                // Commodore - Vic-20
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Commodore Vic-20",
+                    Name = "CommodoreVic20",
+                    Extensions = new[] { ".zip", ".7z", ".prg" },
+                    TgbdId = 4945,
+                    TgbdPlatform = "Commodore Vic-20",
+                    EmuMoviesPlatform = null
+                },
+
+                // Matel - Intellivision
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Intellivision",
+                    Name = "Intellivision",
+                    Extensions = new[] { ".zip", ".7z", ".int", ".rom" },
+                    TgbdId = 32,
+                    TgbdPlatform = "Intellivision",
+                    EmuMoviesPlatform = "Mattel_Intellivision"
+                },
+
+                // Microsoft - DOS
+                new GameSystemDefinition
+                {
+                    ConsoleType = "DOS",
+                    Name = "DOS",
+                    Extensions = new[] { ".gbdos", ".disc" },
+                    TgbdId = 1,
+                    TgbdPlatform = "PC",
+                    EmuMoviesPlatform = null
+                },
+                // Microsoft - PC
+                new GameSystemDefinition
+                {
+                    ConsoleType = "PC",
+                    Name = "PC",
+                    Extensions = new string[] { },
+                    TgbdId = 1,
+                    TgbdPlatform = "PC",
+                    EmuMoviesPlatform = null
+                },
+                // Microsoft - Xbox
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Xbox",
+                    Name = "MicrosoftXBox",
+                    Extensions = new[] { ".disc", ".iso" },
+                    TgbdId = 14,
+                    TgbdPlatform = "Microsoft Xbox",
+                    EmuMoviesPlatform = "Microsoft_Xbox"
+                },
+                // Microsoft - Xbox 360
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Xbox 360",
+                    Name = "MicrosoftXBox360",
+                    Extensions = new[] { ".disc" },
+                    TgbdId = 15,
+                    TgbdPlatform = "Microsoft Xbox 360",
+                    EmuMoviesPlatform = null
+                },
+                // Microsoft - Xbox One
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Xbox One",
+                    Name = "MicrosoftXBoxOne",
+                    Extensions = new[] { ".disc" },
+                    TgbdId = 4920,
+                    TgbdPlatform = "Microsoft Xbox One",
+                    EmuMoviesPlatform = null
+                },
+                // Microsoft - Windows
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Windows",
+                    Name = "Windows",
+                    Extensions = new[] { ".gbwin", ".disc" },
+                    TgbdId = 1,
+                    TgbdPlatform = "PC",
+                    EmuMoviesPlatform = null
+                },
+
+                // NEC - PC Engine - TurboGrafx 16
+                new GameSystemDefinition
+                {
+                    ConsoleType = "TurboGrafx 16",
+                    Name = "TurboGrafx16",
+                    Extensions = new[] { ".zip", ".7z", ".pce" },
+                    TgbdId = 34,
+                    TgbdPlatform = "TurboGrafx 16",
+                    EmuMoviesPlatform = "NEC_TurboGrafx_16"
+                },
+                // NEC - PC Engine - TurboGrafx CD
+                new GameSystemDefinition
+                {
+                    ConsoleType = "TurboGrafx CD",
+                    Name = "TurboGrafxCD",
+                    Extensions = new[] { ".bin", ".iso" },
+                    TgbdId = 34,
+                    TgbdPlatform = "TurboGrafx CD",
+                    EmuMoviesPlatform = "NEC_TurboGrafx_16"
+                },
+
+                // Nintendo - Game Boy
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Game Boy",
+                    Name = "NintendoGameBoy",
+                    Extensions = new[] { ".zip", ".7z", ".gb" },
+                    TgbdId = 4,
+                    TgbdPlatform = "Nintendo Game Boy",
+                    EmuMoviesPlatform = "Nintendo_Game_Boy"
+                },
+                // Nintendo - Game Boy Advance
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Game Boy Advance",
+                    Name = "NintendoGameBoyAdvance",
+                    Extensions = new[] { ".zip", ".7z", ".gba" },
+                    TgbdId = 5,
+                    TgbdPlatform = "Nintendo Game Boy Advance",
+                    EmuMoviesPlatform = "Nintendo_Game_Boy_Advance"
+                },
+                // Nintendo - Game Boy Color
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Game Boy Color",
+                    Name = "NintendoGameBoyColor",
+                    Extensions = new[] { ".zip", ".7z", ".gbc" },
+                    TgbdId = 41,
+                    TgbdPlatform = "Nintendo Game Boy Color",
+                    EmuMoviesPlatform = "Nintendo_Game_Boy_Color"
+                },
+                // Nintendo - GameCube
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Gamecube",
+                    Name = "NintendoGameCube",
+                    Extensions = new[] { ".zip", ".7z", ".iso", ".bin", ".img", ".gcm", ".gcz" },
+                    TgbdId = 2,
+                    TgbdPlatform = "Nintendo GameCube",
+                    EmuMoviesPlatform = "Nintendo_GameCube"
+                },
+                // Nintendo - Nintendo 64
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Nintendo 64",
+                    Name = "Nintendo64",
+                    Extensions = new[] { ".zip", ".7z", ".z64", ".v64", ".usa", ".jap", ".pal", ".rom", ".n64" },
+                    TgbdId = 3,
+                    TgbdPlatform = "Nintendo 64",
+                    EmuMoviesPlatform = "Nintendo_N64"
+                },
+                // Nintendo - Nintendo DS
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Nintendo DS",
+                    Name = "NintendoDS",
+                    Extensions = new[] { ".zip", ".7z", ".nds" },
+                    TgbdId = 8,
+                    TgbdPlatform = "Nintendo DS",
+                    EmuMoviesPlatform = "Nintendo_DS"
+                },
+                // Nintendo - Nintendo Entertainment System
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Nintendo",
+                    Name = "Nintendo",
+                    Extensions = new[] { ".zip", ".7z", ".nes" },
+                    TgbdId = 7,
+                    TgbdPlatform = "Nintendo Entertainment System (NES)",
+                    EmuMoviesPlatform = "Nintendo_NES"
+                },
+                // Nintendo - Super Nintendo Entertainment System
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Super Nintendo",
+                    Name = "SuperNintendo",
+                    Extensions = new[] { ".zip", ".7z", ".smc", ".fam", ".rom", ".sfc", ".fig", ".bin" },
+                    TgbdId = 6,
+                    TgbdPlatform = "Super Nintendo (SNES)",
+                    EmuMoviesPlatform = "Nintendo_SNES"
+                },
+                // Nintendo - Virtual Boy 
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Virtual Boy",
+                    Name = "VirtualBoy",
+                    Extensions = new[] { ".zip", ".7z", ".vb" },
+                    TgbdId = 4918,
+                    TgbdPlatform = "Nintendo Virtual Boy",
+                    EmuMoviesPlatform = null
+                },
+                // Nintendo - Wii
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Nintendo Wii",
+                    Name = "Wii",
+                    Extensions = new[] { ".iso", ".dol", ".ciso", ".wbfs", ".wad", ".gcz" },
+                    TgbdId = 9,
+                    TgbdPlatform = "Nintendo Wii",
+                    EmuMoviesPlatform = null
+                },
+                // Nintendo - Wii U
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Nintendo Wii U",
+                    Name = "WiiU",
+                    Extensions = new[] { ".disc", ".wud" },
+                    TgbdId = 38,
+                    TgbdPlatform = "Nintendo Wii U",
+                    EmuMoviesPlatform = ""
+                },
+
+                // Panasonic - 3DO
+                new GameSystemDefinition
+                {
+                    ConsoleType = "3DO",
+                    Name = "Panasonic3DO",
+                    Extensions = new[] { ".iso", ".cue" },
+                    TgbdId = 25,
+                    TgbdPlatform = "3DO",
+                    EmuMoviesPlatform = "Panasonic_3DO"
+                },
+
+                // Sega - 32X
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sega 32X",
+                    Name = "Sega32X",
+                    Extensions = new[] { ".zip", ".7z", ".iso", ".bin", ".img", ".32x" },
+                    TgbdId = 33,
+                    TgbdPlatform = "Sega 32X",
+                    EmuMoviesPlatform = "Sega_Genesis"
+                },
+                // Sega - CD
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sega CD",
+                    Name = "SegaCD",
+                    Extensions = new[] { ".iso", ".bin", ".img" },
+                    TgbdId = 21,
+                    TgbdPlatform = "Sega CD",
+                    EmuMoviesPlatform = "Sega_Genesis"
+                },
+                // Sega - Dreamcast
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Dreamcast",
+                    Name = "SegaDreamcast",
+                    Extensions = new[] { ".chd", ".gdi", ".cdi" },
+                    TgbdId = 16,
+                    TgbdPlatform = "Sega Dreamcast",
+                    EmuMoviesPlatform = "Sega_Dreamcast"
+                },
+                // Sega - Game Gear
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Game Gear",
+                    Name = "SegaGameGear",
+                    Extensions = new[] { ".zip", ".7z", ".gg" },
+                    TgbdId = 20,
+                    TgbdPlatform = "Sega Game Gear",
+                    EmuMoviesPlatform = "Sega_Game_Gear"
+                },
+                // Sega - Mega Drive
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sega Mega Drive",
+                    Name = "SegaMegaDrive",
+                    Extensions = new[] { ".zip", ".7z", ".smd", ".md" },
+                    TgbdId = 36,
+                    TgbdPlatform = "Sega Genesis",
+                    EmuMoviesPlatform = "Sega_Genesis"
+                },
+                // Sega - Mega Drive - Genesis
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sega Genesis",
+                    Name = "SegaGenesis",
+                    Extensions = new[] { ".zip", ".7z", ".smd", ".bin", ".gen", ".md" },
+                    TgbdId = 18,
+                    TgbdPlatform = "Sega Genesis",
+                    EmuMoviesPlatform = "Sega_Genesis"
+                },
+                // Sega - Master System - Mark III
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sega Master System",
+                    Name = "SegaMasterSystem",
+                    Extensions = new[] { ".zip", ".7z", ".sms", ".sg", ".sc" },
+                    TgbdId = 35,
+                    TgbdPlatform = "Sega Master System",
+                    EmuMoviesPlatform = "Sega_Master_System"
+                },
+                // Sega - Saturn
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sega Saturn",
+                    Name = "SegaSaturn",
+                    Extensions = new[] { ".iso", ".bin", ".img" },
+                    TgbdId = 17,
+                    TgbdPlatform = "Sega Saturn",
+                    EmuMoviesPlatform = "Sega_Saturn"
+                },
+
+                // Sinclair - ZX Spectrum 
+                new GameSystemDefinition
+                {
+                    ConsoleType = "ZX Spectrum",
+                    Name = "ZxSpectrum",
+                    Extensions = new[] { ".zip", ".7z", ".z80", ".tap", ".tzx" },
+                    TgbdId = 4913,
+                    TgbdPlatform = "ZX Spectrum",
+                    EmuMoviesPlatform = null
+                },
+
+                // SNK - Neo Geo
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Neo Geo",
+                    Name = "NeoGeo",
+                    Extensions = new[] { ".zip", ".7z", ".iso" },
+                    TgbdId = 24,
+                    TgbdPlatform = "NeoGeo",
+                    EmuMoviesPlatform = "SNK_Neo_Geo_AES"
+                },
+                // SNK - Neo Geo Pocket
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Neo Geo Pocket",
+                    Name = "NeoGeoPocket",
+                    Extensions = new[] { ".zip", ".7z", ".ngp" },
+                    TgbdId = 4922,
+                    TgbdPlatform = "Neo Geo Pocket",
+                    EmuMoviesPlatform = null
+                },
+                // SNK - Neo Geo Pocket Color 
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Neo Geo Pocket Color",
+                    Name = "NeoGeoPocketColor",
+                    Extensions = new[] { ".zip", ".7z", ".ngc" },
+                    TgbdId = 4923,
+                    TgbdPlatform = "Neo Geo Pocket Color",
+                    EmuMoviesPlatform = null
+                },
+
+                // Sony - Playstation
+                new GameSystemDefinition
+                {
+                    ConsoleType = "Sony Playstation",
+                    Name = "SonyPlaystation",
+                    Extensions = new[] { ".iso", ".cue", ".img", ".ps1", ".pbp" },
+                    TgbdId = 10,
+                    TgbdPlatform = "Sony Playstation",
+                    EmuMoviesPlatform = "Sony_Playstation"
+                },
+                // Sony - Playstation 2
+                new GameSystemDefinition
+                {
+                    ConsoleType = "PS2",
+                    Name = "SonyPlaystation2",
+                    Extensions = new[] { ".iso", ".bin" },
+                    TgbdId = 11,
+                    TgbdPlatform = "Sony Playstation 2",
+                    EmuMoviesPlatform = "Sony_Playstation_2"
+                },
+                // Sony - Playstation 3
+                new GameSystemDefinition
+                {
+                    ConsoleType = "PS3",
+                    Name = "SonyPlaystation3",
+                    Extensions = new[] { ".disc" },
+                    TgbdId = 12,
+                    TgbdPlatform = "Sony Playstation 3",
+                    EmuMoviesPlatform = ""
+                },
+                // Sony - Playstation 4
+                new GameSystemDefinition
+                {
+                    ConsoleType = "PS4",
+                    Name = "SonyPlaystation4",
+                    Extensions = new[] { ".disc" },
+                    TgbdId = 4919,
+                    TgbdPlatform = "Sony Playstation 4",
+                    EmuMoviesPlatform = ""
+                },
+                // Sony - PlayStation Portable
+                new GameSystemDefinition
+                {
+                    ConsoleType = "PSP",
+                    Name = "SonyPSP",
+                    Extensions = new[] { ".iso", ".cso" },
+                    TgbdId = 13,
+                    TgbdPlatform = "Sony PSP",
+                    EmuMoviesPlatform = "Sony_PSP"
+                }
+        };
+    }
+}
diff --git a/GameBrowser/Resolvers/ResolverHelper.cs b/GameBrowser/Resolvers/ResolverHelper.cs
index 3deeebe..e5ff612 100644
--- a/GameBrowser/Resolvers/ResolverHelper.cs
+++ b/GameBrowser/Resolvers/ResolverHelper.cs
@@ -1,70 +1,40 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.IO;
 
 namespace GameBrowser.Resolvers
 {
+
     class ResolverHelper
     {
-        public static int? GetTgdbId(string consoleType)
+        private static ILookup<string, GameSystemDefinition> extendedInfoFromConsoleType;
+        private static ILookup<string, GameSystemDefinition> extendedInfoFromGameSystem;
+
+        static ResolverHelper()
         {
-            return TgdbId.ContainsKey(consoleType) ? TgdbId[consoleType] : 0;
+            extendedInfoFromConsoleType = GameSystemDefinition.All.ToLookup(system => system.ConsoleType, StringComparer.OrdinalIgnoreCase);
+            extendedInfoFromGameSystem = GameSystemDefinition.All.ToLookup(system => system.Name, StringComparer.OrdinalIgnoreCase);
         }
 
-        public static Dictionary<string, int> TgdbId = new Dictionary<string, int>
+        public static GameSystemDefinition GetExtendedInfoFromPlatform(string platform)
+        {
+            // platform == consoleType
+            return extendedInfoFromConsoleType[platform].FirstOrDefault();
+        }
+        public static GameSystemDefinition GetExtendedInfoFromConsoleType(string consoleType)
         {
-                                                        {"3DO", 25},
-                                                        {"Amiga", 4911},
-                                                        {"Arcade", 23},
-                                                        {"Atari 2600", 22},
-                                                        {"Atari 5200", 26},
-                                                        {"Atari 7800", 27},
-                                                        {"Atari Jaguar", 28},
-                                                        {"Atari Jaguar CD", 29},
-                                                        {"Atari XE", 30},
-                                                        {"Colecovision", 31},
-                                                        {"Commodore 64", 40},
-                                                        {"DOS", 1},
-                                                        {"Intellivision", 32},
-                                                        {"Xbox", 14},
-                                                        {"Xbox 360", 15},                                                        
-                                                        {"Xbox One", 4920},
-                                                        {"Neo Geo", 24},
-                                                        {"Nintendo 64", 3},
-                                                        {"Nintendo DS", 8},
-                                                        {"Nintendo", 7}, 
-                                                        {"Game Boy", 4},
-                                                        {"Game Boy Advance", 5},
-                                                        {"Game Boy Color", 41},
-                                                        {"Gamecube", 2},
-                                                        {"Super Nintendo", 6},
-                                                        {"Nintendo Wii", 9},
-                                                        {"Nintendo Wii U", 38},
-                                                        {"PC", 1},
-                                                        {"Sega 32X", 33},
-                                                        {"Sega CD", 21},
-                                                        {"Dreamcast", 16},
-                                                        {"Game Gear", 20},
-                                                        {"Sega Genesis", 18},
-                                                        {"Sega Master System", 35},
-                                                        {"Sega Mega Drive", 36},
-                                                        {"Sega Saturn", 17},
-                                                        {"Sony Playstation", 10},
-                                                        {"PS2", 11},
-                                                        {"PS3", 12},
-                                                        {"PS4", 4919},
-                                                        {"PSP", 13},
-                                                        {"TurboGrafx 16", 34},
-                                                        {"TurboGrafx CD", 34},
-                                                        {"Windows", 1}
-                                                    };
+            return extendedInfoFromConsoleType[consoleType].FirstOrDefault();
+        }
+        public static GameSystemDefinition GetExtendedInfoFromGameSystem(string gameSystem)
+        {
+            return extendedInfoFromGameSystem[gameSystem].FirstOrDefault();
+        }
 
         public static string AttemptGetGamePlatformTypeFromPath(IFileSystem fileSystem, string path)
         {
             var system = Plugin.Instance.Configuration.GameSystems.FirstOrDefault(s => fileSystem.ContainsSubPath(s.Path, path) || string.Equals(s.Path, path, StringComparison.OrdinalIgnoreCase));
 
-            return system != null ? system.ConsoleType : null;
+            return system?.ConsoleType;
         }
 
         public static string GetGameSystemFromPath(IFileSystem fileSystem, string path)
@@ -76,309 +46,7 @@ public static string GetGameSystemFromPath(IFileSystem fileSystem, string path)
                 return null;
             }
 
-            return GetGameSystemFromPlatform(platform);
-        }
-
-        public static string GetGameSystemFromPlatform(string platform)
-        {
-            if (string.IsNullOrEmpty(platform))
-            {
-                throw new ArgumentNullException("platform");
-            }
-
-            switch (platform)
-            {
-                case "3DO":
-                    return "Panasonic3DO";
-
-                case "Amiga":
-                    return "Amiga";
-
-                case "Arcade":
-                    return "Arcade";
-
-                case "Atari 2600":
-                    return "Atari2600";
-
-                case "Atari 5200":
-                    return "Atari5200";
-
-                case "Atari 7800":
-                    return "Atari7800";
-
-                case "Atari XE":
-                    return "AtariXE";
-
-                case "Atari Jaguar":
-                    return "AtariJaguar";
-
-                case "Atari Jaguar CD":
-                    return "AtariJaguarCD";
-
-                case "Colecovision":
-                    return "Colecovision";
-
-                case "Commodore 64":
-                    return "Commodore64";
-
-                case "Commodore Vic-20":
-                    return "CommodoreVic20";
-
-                case "Intellivision":
-                    return "Intellivision";
-
-                case "Xbox":
-                    return "MicrosoftXBox";
-
-                case "Xbox 360":
-                    return "MicrosoftXBox360";
-
-                case "Xbox One":
-                    return "MicrosoftXBoxOne";
-
-                case "Neo Geo":
-                    return "NeoGeo";
-
-                case "Nintendo 64":
-                    return "Nintendo64";
-
-                case "Nintendo DS":
-                    return "NintendoDS";
-
-                case "Nintendo":
-                    return "Nintendo";
-
-                case "Game Boy":
-                    return "NintendoGameBoy";
-
-                case "Game Boy Advance":
-                    return "NintendoGameBoyAdvance";
-
-                case "Game Boy Color":
-                    return "NintendoGameBoyColor";
-
-                case "Gamecube":
-                    return "NintendoGameCube";
-
-                case "Super Nintendo":
-                    return "SuperNintendo";
-
-                case "Virtual Boy":
-                    return "VirtualBoy";
-
-                case "Nintendo Wii":
-                    return "Wii";
-
-                case "Nintendo Wii U":
-                    return "WiiU";
-
-                case "DOS":
-                    return "DOS";
-
-                case "Windows":
-                    return "Windows";
-
-                case "Sega 32X":
-                    return "Sega32X";
-
-                case "Sega CD":
-                    return "SegaCD";
-
-                case "Dreamcast":
-                    return "SegaDreamcast";
-
-                case "Game Gear":
-                    return "SegaGameGear";
-
-                case "Sega Genesis":
-                    return "SegaGenesis";
-
-                case "Sega Master System":
-                    return "SegaMasterSystem";
-
-                case "Sega Mega Drive":
-                    return "SegaMegaDrive";
-
-                case "Sega Saturn":
-                    return "SegaSaturn";
-
-                case "Sony Playstation":
-                    return "SonyPlaystation";
-
-                case "PS2":
-                    return "SonyPlaystation2";
-
-                case "PS3":
-                    return "SonyPlaystation3";
-
-                case "PS4":
-                    return "SonyPlaystation4";
-
-                case "PSP":
-                    return "SonyPSP";
-
-                case "TurboGrafx 16":
-                    return "TurboGrafx16";
-
-                case "TurboGrafx CD":
-                    return "TurboGrafxCD";
-
-                case "ZX Spectrum":
-                    return "ZxSpectrum";
-
-            }
-            return null;
-        }
-
-        public static string GetDisplayMediaTypeFromPlatform(string platform)
-        {
-            if (string.IsNullOrEmpty(platform))
-            {
-                throw new ArgumentNullException("platform");
-            }
-
-            switch (platform)
-            {
-                case "3DO":
-                    return "Panasonic3doGame";
-
-                case "Amiga":
-                    return "AmigaGame";
-
-                case "Arcade":
-                    return "ArcadeGame";
-
-                case "Atari 2600":
-                    return "Atari2600Game";
-
-                case "Atari 5200":
-                    return "Atari5200Game";
-
-                case "Atari 7800":
-                    return "Atari7800Game";
-
-                case "Atari XE":
-                    return "AtariXeGame";
-
-                case "Atari Jaguar":
-                    return "JaguarGame";
-
-                case "Atari Jaguar CD":
-                    return "JaguarGame";
-
-                case "Colecovision":
-                    return "ColecovisionGame";
-
-                case "Commodore 64":
-                    return "C64Game";
-
-                case "Commodore Vic-20":
-                    return "Vic20Game";
-
-                case "Intellivision":
-                    return "IntellivisionGame";
-
-                case "Xbox":
-                    return "XboxGame";
-
-                case "Xbox 360":
-                    return "Xbox360Game";
-
-                case "Xbox One":
-                    return "XboxOneGame";
-
-                case "Neo Geo":
-                    return "NeoGeoGame";
-
-                case "Nintendo 64":
-                    return "N64Game";
-
-                case "Nintendo DS":
-                    return "NesGame";
-
-                case "Nintendo":
-                    return "NesGame";
-
-                case "Game Boy":
-                    return "GameBoyGame";
-
-                case "Game Boy Advance":
-                    return "GameBoyAdvanceGame";
-
-                case "Game Boy Color":
-                    return "GameBoyColorGame";
-
-                case "Gamecube":
-                    return "GameCubeGame";
-
-                case "Super Nintendo":
-                    return "SnesGame";
-
-                case "Virtual Boy":
-                    return "NesGame";
-
-                case "Nintendo Wii":
-                    return "NesGame";
-
-                case "Nintendo Wii U":
-                    return "WiiUGame";
-
-                case "DOS":
-                    return "DosGame";
-
-                case "Windows":
-                    return "WindowsGame";
-
-                case "Sega 32X":
-                    return "GenesisGame";
-
-                case "Sega CD":
-                    return "GenesisGame";
-
-                case "Dreamcast":
-                    return "GenesisGame";
-
-                case "Game Gear":
-                    return "GenesisGame";
-
-                case "Sega Genesis":
-                    return "GenesisGame";
-
-                case "Sega Master System":
-                    return "GenesisGame";
-
-                case "Sega Mega Drive":
-                    return "GenesisGame";
-
-                case "Sega Saturn":
-                    return "GenesisGame";
-
-                case "Sony Playstation":
-                    return "PsOneGame";
-
-                case "PS2":
-                    return "Ps2Game";
-
-                case "PS3":
-                    return "Ps3Game";
-
-                case "PS4":
-                    return "Ps4Game";
-
-                case "PSP":
-                    return "PlayStationPortableGame";
-
-                case "TurboGrafx 16":
-                    return "TurboGrafx16Game";
-
-                case "TurboGrafx CD":
-                    return "TurboGrafx16Game";
-
-                case "ZX Spectrum":
-                    return "ZXSpectrumGame";
-
-            }
-            return null;
+            return ResolverHelper.GetExtendedInfoFromPlatform(platform)?.Name;
         }
     }
 }