diff --git a/README.md b/README.md
index 38b944f..5fa6ea6 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,14 @@ PM> Install-Package MtgApiManager.Lib
 ## Rate Limit
 The MTG API has a [rate limit](https://docs.magicthegathering.io/#documentationrate_limits) in order to maintain a reponsive experience for the user. This SDK has a rate limit manager which manages the rates for you. Based on the total requests per hour the rate limit manager attempts to spead out the calls over the hour in 10 second chuncks. For example if the number of requests is limited to 5000 per hour, the number of requests per 10 seconds is 13 (5000 / (3600 / 10)) after rounding down, therefore if you make 13 requests out to the web service in 8 seconds when you attempt to make the 14th request the SDK will wait 2 seconds before trying to call the API.
 ## Usage
+Creating a new service provider used to fetch the different services available.
+```cs
+IMtgServiceProvider serviceProvider = new MtgServiceProvider();
+```
 The result of all service calls resturns a generic **Exception Monad** containing the results of the call.
 ```cs
-CardService service = new CardService();
-Exceptional<List<Card>> result = service.All();
+CardService service = serviceProvider.GetCardService();
+Exceptional<List<Card>> result = service.AllAsync();
 if (result.IsSuccess)
 {
   var value = result.Value;
@@ -30,84 +34,67 @@ else
   var exception = result.Exception;
 }
 ```
-Each service call also has an equivalent asynchronous call.
 #### Find a card by id
 ```cs
-CardService service = new CardService();
-var result = service.Find("f2eb06047a3a8e515bff62b55f29468fcde6332a");
-var asyncResult = await service.FindAsync("f2eb06047a3a8e515bff62b55f29468fcde6332a");
+CardService service = serviceProvider.GetCardService();
+var result = await service.FindAsync("f2eb06047a3a8e515bff62b55f29468fcde6332a");
 ```
 #### Find a card by multiverse id
 ```cs
-CardService service = new CardService();
-var result = service.Find(123);
-var asyncResult = await service.FindAsync(123);
+CardService service = serviceProvider.GetCardService();
+var result = await service.FindAsync(123);
 ```
 #### Filter Cards via query parameters
 ```cs
-CardService service = new CardService();
-var result = service.Where(x => x.Set, "ktk")
-                  .Where(x => x.SubTypes, "warrior,human")
-                  .All()
-var asyncResult = await service.Where(x => x.Set, "ktk")
-                            .Where(x => x.SubTypes, "warrior,human")
-                            .AllAsync()                  
+CardService service = serviceProvider.GetCardService();
+var result = await service.Where(x => x.Set, "ktk")
+                          .Where(x => x.SubTypes, "warrior,human")
+                          .AllAsync()                  
 ```    
 #### Find all cards (limited by default page size)
 ```cs
-CardService service = new CardService();
-var result = service.All()
-var asyncResult = await service.AllAsync()
+CardService service = serviceProvider.GetCardService();
+var result = await service.AllAsync()
 ```      
 #### Get all cards with pagination
 ```cs
-CardService service = new CardService();
-var result = service.Where(x => x.Page, 5)
-                  .Where(x => x.PageSize, 250)
-                  .All()
-var asyncResult = await service.Where(x => x.Page, 5)
-                            .Where(x => x.PageSize, 250)
-                            .AllAsync()
+CardService service = serviceProvider.GetCardService();
+var result = await service.Where(x => x.Page, 5)
+                          .Where(x => x.PageSize, 250)
+                          .AllAsync()
 ```
 #### Get all card types
 ```cs
-CardService service = new CardService();
-var result = service.GetCardTypes();
-var asyncResult = await service.GetCardTypesAsync();
+CardService service = serviceProvider.GetCardService();
+var result = await service.GetCardTypesAsync();
 ```
 #### Get all card supertypes
 ```cs
-CardService service = new CardService();
-var result = service.GetCardSuperTypes();
-var asyncResult = await service.GetCardSuperTypesAsync();
+CardService service = serviceProvider.GetCardService();
+var result = await service.GetCardSuperTypesAsync();
 ```
 #### Get all card subtypes
 ```cs
-CardService service = new CardService();
-var result = service.GetCardSubTypes();
-var asyncResult = await service.GetCardSubTypesAsync();
+CardService service = serviceProvider.GetCardService();
+var result = await service.GetCardSubTypesAsync();
 ```
 #### Find a set by code
 ```cs
-SetService service = new SetService();
-var result = service.Find("ktk");
-var asyncResult = await service.FindAsync("ktk");
+SetService service = serviceProvider.GetSetService();
+var result = await service.FindAsync("ktk");
 ```    
 #### Filter sets via query parameters
 ```cs
-SetService service = new SetService();
-var result = service.Where(x => x.Name, "khans").All()
-var asyncResult = await service.Where(x => x.Name, "khans").AllAsync()
+SetService service = serviceProvider.GetSetService();
+var result = await service.Where(x => x.Name, "khans").AllAsync()
 ```     
 #### Get all Sets
 ```cs
-SetService service = new SetService();
-var result = service.All()
-var asyncResult = await service.AllAsync()
+SetService service = serviceProvider.GetSetService();
+var result = await service.AllAsync()
 ```
 #### Generate booster
 ```cs
-SetService service = new SetService();
-var result = service.GenerateBooster("ktk")
-var asyncResult = await service.GenerateBoosterAsync("ktk")
+SetService service = serviceProvider.GetSetService();
+var result = await service.GenerateBoosterAsync("ktk")
 ```
diff --git a/src/.editorconfig b/src/.editorconfig
index 4628051..4c64564 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -1,7 +1,4 @@
 [*.cs]
 
-# CS1591: Missing XML comment for publicly visible type or member
-dotnet_diagnostic.CS1591.severity = none
-
 # S1075: URIs should not be hardcoded
 dotnet_diagnostic.S1075.severity = none
diff --git a/src/MtgApiManager.Lib.Test/Service/CardServiceTest.cs b/src/MtgApiManager.Lib.Test/Service/CardServiceTest.cs
index f705fcd..0a3b701 100644
--- a/src/MtgApiManager.Lib.Test/Service/CardServiceTest.cs
+++ b/src/MtgApiManager.Lib.Test/Service/CardServiceTest.cs
@@ -126,7 +126,8 @@ public async Task AllAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootCardListDto() { Cards = cards });
 
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetCardService();
             service = service.Where(x => x.Name, "name1");
 
             var result = await service.AllAsync();
@@ -307,149 +308,6 @@ public async Task FindAsyncTest()
             Assert.NotNull(result.Value);
         }
 
-        /// <summary>
-        /// Tests the <see cref="CardService.Find(int)"/> method.
-        /// </summary>
-        [Fact]
-        public void FindTest()
-        {
-            var cardDto = new CardDto()
-            {
-                Artist = "artist1",
-                Border = "border1",
-                Cmc = 111,
-                Colors = new string[] { "blue", "pink" },
-                Flavor = "flavor1",
-                ForeignNames = new ForeignNameDto[] { new ForeignNameDto() { Language = "english", MultiverseId = 222, Name = "name2" } },
-                Hand = 222,
-                Id = "12345",
-                ImageUrl = "http://fake/url",
-                Layout = "layout1",
-                Legalities = new LegalityDto[] { new LegalityDto() { Format = "format2", Legality = "legality name 2" } },
-                Life = 333,
-                Loyalty = "loyalty",
-                ManaCost = "500",
-                MultiverseId = 444,
-                Name = "name1",
-                Names = new string[] { "name2", "name3" },
-                Number = "600",
-                OriginalText = "original text",
-                OriginalType = "original type",
-                Power = "9000",
-                Printings = new string[] { "printing1", "printing2" },
-                Rarity = "rare",
-                ReleaseDate = "2010, 1, 1",
-                Reserved = true,
-                Rulings = new RulingDto[] { new RulingDto() { Date = "2010, 2, 2", Text = "text2" } },
-                Set = "set1",
-                SetName = "set name 1",
-                Source = "source",
-                Starter = true,
-                SubTypes = new string[] { "subtype1", "subtype2" },
-                SuperTypes = new string[] { "supertype1", "supertype2" },
-                Text = "text3",
-                Timeshifted = false,
-                Toughness = "tough",
-                Type = "type2",
-                Types = new string[] { "type1", "type2" },
-                Variations = new string[] { Guid.Empty.ToString() },
-                Watermark = "watermark"
-            };
-
-            // Test the Find by multi verse identifier method.
-            var moqAdapter = new Mock<IMtgApiServiceAdapter>();
-            moqAdapter
-                .SetupSequence(x => x.WebGetAsync<RootCardDto>(It.IsAny<Uri>()))
-                .Throws<ArgumentNullException>()
-                .Throws(new MtgApiException<BadRequestException>("bad request"))
-                .Throws(new MtgApiException<ForbiddenException>("forbidden"))
-                .Throws(new MtgApiException<InternalServerErrorException>("server error"))
-                .Throws(new MtgApiException<NotFoundException>("not found"))
-                .Throws(new MtgApiException<ServiceUnavailableException>("unavailable"))
-                .Throws<Exception>()
-                .ReturnsAsync(new RootCardDto() { Card = cardDto });
-
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
-
-            var result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.Equal("Value cannot be null.", result.Exception.Message);
-
-            result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.Equal("bad request", result.Exception.Message);
-
-            result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.Equal("forbidden", result.Exception.Message);
-
-            result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.Equal("server error", result.Exception.Message);
-
-            result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.Equal("not found", result.Exception.Message);
-
-            result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.Equal("unavailable", result.Exception.Message);
-
-            result = service.Find(1);
-            Assert.False(result.IsSuccess);
-            Assert.IsType<Exception>(result.Exception);
-
-            result = service.Find(1);
-            Assert.True(result.IsSuccess);
-            Assert.Null(result.Exception);
-            Assert.NotNull(result.Value);
-
-            // Test the Find by identifier method.
-            moqAdapter
-                .SetupSequence(x => x.WebGetAsync<RootCardDto>(It.IsAny<Uri>()))
-                .Throws<ArgumentNullException>()
-                .Throws(new MtgApiException<BadRequestException>("bad request"))
-                .Throws(new MtgApiException<ForbiddenException>("forbidden"))
-                .Throws(new MtgApiException<InternalServerErrorException>("server error"))
-                .Throws(new MtgApiException<NotFoundException>("not found"))
-                .Throws(new MtgApiException<ServiceUnavailableException>("unavailable"))
-                .Throws<Exception>()
-                .ReturnsAsync(new RootCardDto() { Card = cardDto });
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.Equal("Value cannot be null.", result.Exception.Message);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.Equal("bad request", result.Exception.Message);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.Equal("forbidden", result.Exception.Message);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.Equal("server error", result.Exception.Message);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.Equal("not found", result.Exception.Message);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.Equal("unavailable", result.Exception.Message);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.False(result.IsSuccess);
-            Assert.IsType<Exception>(result.Exception);
-
-            result = service.Find("123h4hfh4h6jgjk45jhbj");
-            Assert.True(result.IsSuccess);
-            Assert.Null(result.Exception);
-            Assert.NotNull(result.Value);
-        }
-
         /// <summary>
         /// Tests the <see cref="CardService.GetCardSubTypesAsync"/> method.
         /// </summary>
@@ -479,7 +337,8 @@ public async Task GetCardSubTypesAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootCardSubTypeDto() { SubTypes = cardSubTypes });
 
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetCardService();
 
             var result = await service.GetCardSubTypesAsync();
             Assert.False(result.IsSuccess);
@@ -515,70 +374,6 @@ public async Task GetCardSubTypesAsyncTest()
             Assert.NotNull(result.Value);
         }
 
-        /// <summary>
-        /// Tests the <see cref="CardService.GetCardSubTypes"/> method.
-        /// </summary>
-        [Fact]
-        public void GetCardSubTypesTest()
-        {
-            var cardSubTypes = new List<string>
-            {
-                "type1",
-                "type2",
-                "type3",
-                "type4",
-                "type5",
-            };
-
-            // Test the All method.
-            var moqAdapter = new Mock<IMtgApiServiceAdapter>();
-            moqAdapter
-                .SetupSequence(x => x.WebGetAsync<RootCardSubTypeDto>(new Uri("https://api.magicthegathering.io/v1/subtypes")))
-                .Throws<ArgumentNullException>()
-                .Throws(new MtgApiException<BadRequestException>("bad request"))
-                .Throws(new MtgApiException<ForbiddenException>("forbidden"))
-                .Throws(new MtgApiException<InternalServerErrorException>("server error"))
-                .Throws(new MtgApiException<NotFoundException>("not found"))
-                .Throws(new MtgApiException<ServiceUnavailableException>("unavailable"))
-                .Throws<Exception>()
-                .ReturnsAsync(new RootCardSubTypeDto() { SubTypes = cardSubTypes });
-
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
-
-            var result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("Value cannot be null.", result.Exception.Message);
-
-            result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("bad request", result.Exception.Message);
-
-            result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("forbidden", result.Exception.Message);
-
-            result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("server error", result.Exception.Message);
-
-            result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("not found", result.Exception.Message);
-
-            result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("unavailable", result.Exception.Message);
-
-            result = service.GetCardSubTypes();
-            Assert.False(result.IsSuccess);
-            Assert.IsType<Exception>(result.Exception);
-
-            result = service.GetCardSubTypes();
-            Assert.True(result.IsSuccess);
-            Assert.Null(result.Exception);
-            Assert.NotNull(result.Value);
-        }
-
         /// <summary>
         /// Tests the <see cref="CardService.GetCardSuperTypesAsync"/> method.
         /// </summary>
@@ -608,7 +403,8 @@ public async Task GetCardSuperTypesAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootCardSuperTypeDto() { SuperTypes = cardSuperTypes });
 
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetCardService();
 
             var result = await service.GetCardSuperTypesAsync();
             Assert.False(result.IsSuccess);
@@ -644,70 +440,6 @@ public async Task GetCardSuperTypesAsyncTest()
             Assert.NotNull(result.Value);
         }
 
-        /// <summary>
-        /// Tests the <see cref="CardService.GetCardSuperTypes"/> method.
-        /// </summary>
-        [Fact]
-        public void GetCardSuperTypesTest()
-        {
-            var cardSuperTypes = new List<string>
-            {
-                "type1",
-                "type2",
-                "type3",
-                "type4",
-                "type5",
-            };
-
-            // Test the All method.
-            var moqAdapter = new Mock<IMtgApiServiceAdapter>();
-            moqAdapter
-                .SetupSequence(x => x.WebGetAsync<RootCardSuperTypeDto>(new Uri("https://api.magicthegathering.io/v1/supertypes")))
-                .Throws<ArgumentNullException>()
-                .Throws(new MtgApiException<BadRequestException>("bad request"))
-                .Throws(new MtgApiException<ForbiddenException>("forbidden"))
-                .Throws(new MtgApiException<InternalServerErrorException>("server error"))
-                .Throws(new MtgApiException<NotFoundException>("not found"))
-                .Throws(new MtgApiException<ServiceUnavailableException>("unavailable"))
-                .Throws<Exception>()
-                .ReturnsAsync(new RootCardSuperTypeDto() { SuperTypes = cardSuperTypes });
-
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
-
-            var result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("Value cannot be null.", result.Exception.Message);
-
-            result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("bad request", result.Exception.Message);
-
-            result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("forbidden", result.Exception.Message);
-
-            result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("server error", result.Exception.Message);
-
-            result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("not found", result.Exception.Message);
-
-            result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("unavailable", result.Exception.Message);
-
-            result = service.GetCardSuperTypes();
-            Assert.False(result.IsSuccess);
-            Assert.IsType<Exception>(result.Exception);
-
-            result = service.GetCardSuperTypes();
-            Assert.True(result.IsSuccess);
-            Assert.Null(result.Exception);
-            Assert.NotNull(result.Value);
-        }
-
         /// <summary>
         /// Tests the <see cref="CardService.GetCardTypesAsync"/> method.
         /// </summary>
@@ -737,7 +469,8 @@ public async Task GetCardTypesAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootCardTypeDto() { Types = cardTypes });
 
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetCardService();
 
             var result = await service.GetCardTypesAsync();
             Assert.False(result.IsSuccess);
@@ -773,77 +506,14 @@ public async Task GetCardTypesAsyncTest()
             Assert.NotNull(result.Value);
         }
 
-        /// <summary>
-        /// Tests the <see cref="CardService.GetCardTypes"/> method.
-        /// </summary>
-        [Fact]
-        public void GetCardTypesTest()
-        {
-            var cardTypes = new List<string>
-            {
-                "type1",
-                "type2",
-                "type3",
-                "type4",
-                "type5",
-            };
-
-            // Test the All method.
-            var moqAdapter = new Mock<IMtgApiServiceAdapter>();
-            moqAdapter
-                .SetupSequence(x => x.WebGetAsync<RootCardTypeDto>(new Uri("https://api.magicthegathering.io/v1/types")))
-                .Throws<ArgumentNullException>()
-                .Throws(new MtgApiException<BadRequestException>("bad request"))
-                .Throws(new MtgApiException<ForbiddenException>("forbidden"))
-                .Throws(new MtgApiException<InternalServerErrorException>("server error"))
-                .Throws(new MtgApiException<NotFoundException>("not found"))
-                .Throws(new MtgApiException<ServiceUnavailableException>("unavailable"))
-                .Throws<Exception>()
-                .ReturnsAsync(new RootCardTypeDto() { Types = cardTypes });
-
-            var service = new CardService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
-
-            var result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("Value cannot be null.", result.Exception.Message);
-
-            result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("bad request", result.Exception.Message);
-
-            result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("forbidden", result.Exception.Message);
-
-            result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("server error", result.Exception.Message);
-
-            result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("not found", result.Exception.Message);
-
-            result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.Equal("unavailable", result.Exception.Message);
-
-            result = service.GetCardTypes();
-            Assert.False(result.IsSuccess);
-            Assert.IsType<Exception>(result.Exception);
-
-            result = service.GetCardTypes();
-            Assert.True(result.IsSuccess);
-            Assert.Null(result.Exception);
-            Assert.NotNull(result.Value);
-        }
-
         /// <summary>
         /// Tests the <see cref="CardService.Where{U}(System.Linq.Expressions.Expression{Func{CardDto, U}}, string)"/> method.
         /// </summary>
         [Fact]
         public void WhereTest()
         {
-            CardService service = new CardService();
+            var serviceProvider = new MtgServiceProvider();
+            var service = serviceProvider.GetCardService();
 
             try
             {
diff --git a/src/MtgApiManager.Lib.Test/Service/ServiceBaseObjectService.cs b/src/MtgApiManager.Lib.Test/Service/ServiceBaseObjectService.cs
index f2b8200..6e96a64 100644
--- a/src/MtgApiManager.Lib.Test/Service/ServiceBaseObjectService.cs
+++ b/src/MtgApiManager.Lib.Test/Service/ServiceBaseObjectService.cs
@@ -11,7 +11,7 @@
     /// <summary>
     /// Object used to test the abstract <see cref="ServiceBase{TService, TModel}"/> class.
     /// </summary>
-    public class ServiceBaseObjectService : ServiceBase<Card>
+    internal class ServiceBaseObjectService : ServiceBase<Card>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceBaseObjectService"/> class. Defaults to version 1.0 of the API.
diff --git a/src/MtgApiManager.Lib.Test/Service/SetServiceTest.cs b/src/MtgApiManager.Lib.Test/Service/SetServiceTest.cs
index 0cae380..db97eee 100644
--- a/src/MtgApiManager.Lib.Test/Service/SetServiceTest.cs
+++ b/src/MtgApiManager.Lib.Test/Service/SetServiceTest.cs
@@ -67,7 +67,8 @@ public async Task AllAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootSetListDto() { Sets = sets });
 
-            var service = new SetService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetSetService();
             service = service.Where(x => x.Name, "name1");
 
             var result = await service.AllAsync();
@@ -138,7 +139,8 @@ public async Task FindAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootSetDto() { Set = setDto });
 
-            var service = new SetService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetSetService();
 
             var result = await service.FindAsync("code1");
             Assert.False(result.IsSuccess);
@@ -282,7 +284,8 @@ public async Task GenerateBoosterAsyncTest()
                 .Throws<Exception>()
                 .ReturnsAsync(new RootCardListDto() { Cards = cards });
 
-            var service = new SetService(moqAdapter.Object, new ModelMapper(), ApiVersion.V1_0, false);
+            var serviceProvider = new MtgServiceProvider(moqAdapter.Object, new ModelMapper(), false);
+            var service = serviceProvider.GetSetService();
 
             var result = await service.GenerateBoosterAsync("ktk");
             Assert.False(result.IsSuccess);
@@ -324,7 +327,8 @@ public async Task GenerateBoosterAsyncTest()
         [Fact]
         public void WhereTest()
         {
-            SetService service = new SetService();
+            var serviceProvider = new MtgServiceProvider();
+            var service = serviceProvider.GetSetService();
 
             try
             {
diff --git a/src/MtgApiManager.Lib.TestApp/MainViewModel.cs b/src/MtgApiManager.Lib.TestApp/MainViewModel.cs
index eba7a67..1973621 100644
--- a/src/MtgApiManager.Lib.TestApp/MainViewModel.cs
+++ b/src/MtgApiManager.Lib.TestApp/MainViewModel.cs
@@ -8,6 +8,7 @@ namespace MtgApiManager.Lib.TestApp
 {
     public class MainViewModel : ViewModelBase
     {
+        private readonly IMtgServiceProvider _serviceProvider;
         private ObservableCollection<Card> _cardsCollection = null;
         private RelayCommand _cardSearchCommand;
         private string _cardSearchString = null;
@@ -33,6 +34,7 @@ public MainViewModel()
         {
             _cardsCollection = new ObservableCollection<Card>();
             _setsCollection = new ObservableCollection<Set>();
+            _serviceProvider = new MtgServiceProvider();
         }
 
         public ObservableCollection<Card> CardsCollection
@@ -48,7 +50,7 @@ public RelayCommand CardSearchCommand
                 return _cardSearchCommand ??= new RelayCommand(
                     async () =>
                     {
-                        CardService cardService = new();
+                        ICardService cardService = _serviceProvider.GetCardService();
 
                         if (!string.IsNullOrWhiteSpace(_cardSearchString))
                         {
@@ -90,7 +92,7 @@ public RelayCommand FindSelectedCardCommand
                     {
                         IsLoading = true;
 
-                        CardService cardService = new();
+                        ICardService cardService = _serviceProvider.GetCardService();
                         var result = await cardService.FindAsync(_selectedCardId);
 
                         if (result.IsSuccess)
@@ -113,7 +115,7 @@ public RelayCommand FindSelectedSetCommand
                     {
                         IsLoading = true;
 
-                        SetService setService = new();
+                        ISetService setService = _serviceProvider.GetSetService();
                         var result = await setService.FindAsync(_selectedSetCode);
 
                         if (result.IsSuccess)
@@ -136,7 +138,7 @@ public RelayCommand GenerateBoosterCommand
                     {
                         IsLoading = true;
 
-                        SetService setService = new();
+                        ISetService setService = _serviceProvider.GetSetService();
                         var result = await setService.GenerateBoosterAsync(_selectedSetCode);
 
                         if (result.IsSuccess)
@@ -165,7 +167,7 @@ public RelayCommand GetCardSubTypesCommand
                     {
                         IsLoading = true;
 
-                        CardService cardService = new();
+                        ICardService cardService = _serviceProvider.GetCardService();
                         var result = await cardService.GetCardSubTypesAsync();
 
                         if (result.IsSuccess)
@@ -187,7 +189,7 @@ public RelayCommand GetCardSuperTypesCommand
                     {
                         IsLoading = true;
 
-                        CardService cardService = new();
+                        ICardService cardService = _serviceProvider.GetCardService();
                         var result = await cardService.GetCardSuperTypesAsync();
 
                         if (result.IsSuccess)
@@ -209,7 +211,7 @@ public RelayCommand GetCardTypesCommand
                     {
                         IsLoading = true;
 
-                        CardService cardService = new();
+                        ICardService cardService = _serviceProvider.GetCardService();
                         var result = await cardService.GetCardTypesAsync();
 
                         if (result.IsSuccess)
@@ -265,7 +267,7 @@ public RelayCommand SetSearchCommand
                 return _setSearchCommand ??= new RelayCommand(
                     async () =>
                     {
-                        SetService setService = new();
+                        ISetService setService = _serviceProvider.GetSetService();
 
                         if (!string.IsNullOrWhiteSpace(_setSearchString))
                         {
diff --git a/src/MtgApiManager.Lib/Core/Exceptions/MtgExceptionBase.cs b/src/MtgApiManager.Lib/Core/Exceptions/MtgExceptionBase.cs
index b1776f8..b325528 100644
--- a/src/MtgApiManager.Lib/Core/Exceptions/MtgExceptionBase.cs
+++ b/src/MtgApiManager.Lib/Core/Exceptions/MtgExceptionBase.cs
@@ -1,8 +1,4 @@
-// <copyright file="MtgExceptionBase.cs">
-//     Copyright (c) 2014. All rights reserved.
-// </copyright>
-// <author>Jason Regnier</author>
-namespace MtgApiManager.Lib.Core.Exceptions
+namespace MtgApiManager.Lib.Core.Exceptions
 {
     using System;
     using System.Globalization;
diff --git a/src/MtgApiManager.Lib/Core/IMtgApiServiceAdapter.cs b/src/MtgApiManager.Lib/Core/IMtgApiServiceAdapter.cs
index 0d5ee09..472f76b 100644
--- a/src/MtgApiManager.Lib/Core/IMtgApiServiceAdapter.cs
+++ b/src/MtgApiManager.Lib/Core/IMtgApiServiceAdapter.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// Used to make web service calls.
     /// </summary>
-    public interface IMtgApiServiceAdapter
+    internal interface IMtgApiServiceAdapter
     {
         /// <summary>
         /// Do a Web Get for the given request Uri .
@@ -15,6 +15,6 @@ public interface IMtgApiServiceAdapter
         /// <typeparam name="T">The type to serialize into.</typeparam>
         /// <param name="requestUri">The URL to call.</param>
         /// <returns>The serialized response.</returns>
-        Task<T> WebGetAsync<T>(Uri requestUri) where T : MtgResponseBase;
+        Task<T> WebGetAsync<T>(Uri requestUri) where T : IMtgResponse;
     }
 }
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs b/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs
index 4b79dcb..34c3c0b 100644
--- a/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs
+++ b/src/MtgApiManager.Lib/Core/MtgApiServiceAdapter.cs
@@ -13,7 +13,7 @@
     /// </summary>
     internal class MtgApiServiceAdapter : IMtgApiServiceAdapter
     {
-        public static async Task<T> WebGetAsyncInternal<T>(Uri requestUri) where T : MtgResponseBase
+        public static async Task<T> WebGetAsyncInternal<T>(Uri requestUri) where T : IMtgResponse
         {
             using var client = new HttpClient();
             using var response = await client.GetAsync(requestUri).ConfigureAwait(false);
@@ -39,7 +39,7 @@ public static async Task<T> WebGetAsyncInternal<T>(Uri requestUri) where T : Mtg
                         throw new MtgApiException<ServiceUnavailableException>(MtgApiError.ServiceUnavailable.GetDescription());
                     default:
                         response.EnsureSuccessStatusCode();
-                        return null;
+                        return default;
                 }
             }
         }
@@ -50,7 +50,7 @@ public static async Task<T> WebGetAsyncInternal<T>(Uri requestUri) where T : Mtg
         /// <typeparam name="T">The type to serialize into.</typeparam>
         /// <param name="requestUri">The URL to call.</param>
         /// <returns>The serialized response.</returns>
-        public Task<T> WebGetAsync<T>(Uri requestUri) where T : MtgResponseBase
+        public Task<T> WebGetAsync<T>(Uri requestUri) where T : IMtgResponse
         {
             if (requestUri == null)
             {
diff --git a/src/MtgApiManager.Lib/Core/PagingInfo.cs b/src/MtgApiManager.Lib/Core/PagingInfo.cs
index d78ad5f..b97b77f 100644
--- a/src/MtgApiManager.Lib/Core/PagingInfo.cs
+++ b/src/MtgApiManager.Lib/Core/PagingInfo.cs
@@ -1,9 +1,4 @@
-// <copyright file="PagingInfo.cs">
-//     Copyright (c) 2014. All rights reserved.
-// </copyright>
-// <author>Jason Regnier</author>
-
-namespace MtgApiManager.Lib.Core
+namespace MtgApiManager.Lib.Core
 {
     /// <summary>
     /// Represents paging information
diff --git a/src/MtgApiManager.Lib/Dto/Cards/CardDto.cs b/src/MtgApiManager.Lib/Dto/Cards/CardDto.cs
index d152fbd..829f402 100644
--- a/src/MtgApiManager.Lib/Dto/Cards/CardDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Cards/CardDto.cs
@@ -2,7 +2,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    public class CardDto
+    internal class CardDto
     {
         [JsonPropertyName("artist")]
         public string Artist { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Cards/ForeignNameDto.cs b/src/MtgApiManager.Lib/Dto/Cards/ForeignNameDto.cs
index 014d65f..8ee6775 100644
--- a/src/MtgApiManager.Lib/Dto/Cards/ForeignNameDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Cards/ForeignNameDto.cs
@@ -2,7 +2,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    public class ForeignNameDto
+    internal class ForeignNameDto
     {
         [JsonPropertyName("language")]
         public string Language { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Cards/LegalityDto.cs b/src/MtgApiManager.Lib/Dto/Cards/LegalityDto.cs
index 9166c65..89c33d5 100644
--- a/src/MtgApiManager.Lib/Dto/Cards/LegalityDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Cards/LegalityDto.cs
@@ -2,7 +2,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    public class LegalityDto
+    internal class LegalityDto
     {
         [JsonPropertyName("format")]
         public string Format { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Cards/RootCardDto.cs b/src/MtgApiManager.Lib/Dto/Cards/RootCardDto.cs
index a8f7e91..49cd90e 100644
--- a/src/MtgApiManager.Lib/Dto/Cards/RootCardDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Cards/RootCardDto.cs
@@ -2,10 +2,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    /// <summary>
-    /// Object representing a the root wrapper to read a single card.
-    /// </summary>
-    public class RootCardDto : MtgResponseBase
+    internal class RootCardDto : IMtgResponse
     {
         [JsonPropertyName("card")]
         public CardDto Card { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Cards/RootCardListDto.cs b/src/MtgApiManager.Lib/Dto/Cards/RootCardListDto.cs
index 1be13a3..5250cf6 100644
--- a/src/MtgApiManager.Lib/Dto/Cards/RootCardListDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Cards/RootCardListDto.cs
@@ -1,12 +1,9 @@
-namespace MtgApiManager.Lib.Dto
-{
-    using System.Collections.Generic;
-    using System.Text.Json.Serialization;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
-    /// <summary>
-    /// Object representing a the root wrapper to read a list of cards.
-    /// </summary>
-    public class RootCardListDto : MtgResponseBase
+namespace MtgApiManager.Lib.Dto
+{
+    internal class RootCardListDto : IMtgResponse
     {
         [JsonPropertyName("cards")]
         public List<CardDto> Cards { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Cards/RulingDto.cs b/src/MtgApiManager.Lib/Dto/Cards/RulingDto.cs
index 5a5f4af..f8d6d2b 100644
--- a/src/MtgApiManager.Lib/Dto/Cards/RulingDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Cards/RulingDto.cs
@@ -2,7 +2,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    public class RulingDto
+    internal class RulingDto
     {
         [JsonPropertyName("date")]
         public string Date { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/MtgResponseBase.cs b/src/MtgApiManager.Lib/Dto/MtgResponseBase.cs
index 731a50e..31d53bc 100644
--- a/src/MtgApiManager.Lib/Dto/MtgResponseBase.cs
+++ b/src/MtgApiManager.Lib/Dto/MtgResponseBase.cs
@@ -1,9 +1,6 @@
 namespace MtgApiManager.Lib.Dto
 {
-    /// <summary>
-    /// Base class for an MTG response.
-    /// </summary>
-    public abstract class MtgResponseBase
+    internal interface IMtgResponse
     {
     }
 }
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Dto/RootCardSubTypeDto.cs b/src/MtgApiManager.Lib/Dto/RootCardSubTypeDto.cs
index 216f5e7..e520b03 100644
--- a/src/MtgApiManager.Lib/Dto/RootCardSubTypeDto.cs
+++ b/src/MtgApiManager.Lib/Dto/RootCardSubTypeDto.cs
@@ -3,10 +3,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    /// <summary>
-    /// Object representing a root wrapper to read in card sub types.
-    /// </summary>
-    public class RootCardSubTypeDto : MtgResponseBase
+    internal class RootCardSubTypeDto : IMtgResponse
     {
         [JsonPropertyName("subtypes")]
         public List<string> SubTypes { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/RootCardSuperTypeDto.cs b/src/MtgApiManager.Lib/Dto/RootCardSuperTypeDto.cs
index 5cc5c24..69600d6 100644
--- a/src/MtgApiManager.Lib/Dto/RootCardSuperTypeDto.cs
+++ b/src/MtgApiManager.Lib/Dto/RootCardSuperTypeDto.cs
@@ -3,10 +3,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    /// <summary>
-    /// Object representing a root wrapper to read in card super types.
-    /// </summary>
-    public class RootCardSuperTypeDto : MtgResponseBase
+    internal class RootCardSuperTypeDto : IMtgResponse
     {
         [JsonPropertyName("supertypes")]
         public List<string> SuperTypes { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/RootCardTypeDto.cs b/src/MtgApiManager.Lib/Dto/RootCardTypeDto.cs
index a684926..ed6503c 100644
--- a/src/MtgApiManager.Lib/Dto/RootCardTypeDto.cs
+++ b/src/MtgApiManager.Lib/Dto/RootCardTypeDto.cs
@@ -3,10 +3,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    /// <summary>
-    /// Object representing a root wrapper to read in card types.
-    /// </summary>
-    public class RootCardTypeDto : MtgResponseBase
+    internal class RootCardTypeDto : IMtgResponse
     {
         [JsonPropertyName("types")]
         public List<string> Types { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Set/RootSetDto.cs b/src/MtgApiManager.Lib/Dto/Set/RootSetDto.cs
index 1730b86..1d12ef0 100644
--- a/src/MtgApiManager.Lib/Dto/Set/RootSetDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Set/RootSetDto.cs
@@ -2,10 +2,7 @@
 
 namespace MtgApiManager.Lib.Dto.Set
 {
-    /// <summary>
-    /// Object representing a root wrapper to read a single set.
-    /// </summary>
-    public class RootSetDto : MtgResponseBase
+    internal class RootSetDto : IMtgResponse
     {
         [JsonPropertyName("set")]
         public SetDto Set { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Set/RootSetListDto.cs b/src/MtgApiManager.Lib/Dto/Set/RootSetListDto.cs
index 5c827c0..f1adcca 100644
--- a/src/MtgApiManager.Lib/Dto/Set/RootSetListDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Set/RootSetListDto.cs
@@ -3,10 +3,7 @@
 
 namespace MtgApiManager.Lib.Dto.Set
 {
-    /// <summary>
-    /// Object representing a the root wrapper to read a list of sets.
-    /// </summary>
-    public class RootSetListDto : MtgResponseBase
+    internal class RootSetListDto : IMtgResponse
     {
         [JsonPropertyName("sets")]
         public List<SetDto> Sets { get; set; }
diff --git a/src/MtgApiManager.Lib/Dto/Set/SetDto.cs b/src/MtgApiManager.Lib/Dto/Set/SetDto.cs
index ca6bf02..b800dd9 100644
--- a/src/MtgApiManager.Lib/Dto/Set/SetDto.cs
+++ b/src/MtgApiManager.Lib/Dto/Set/SetDto.cs
@@ -3,7 +3,7 @@
 
 namespace MtgApiManager.Lib.Dto
 {
-    public class SetDto
+    internal class SetDto
     {
         [JsonPropertyName("block")]
         public string Block { get; set; }
diff --git a/src/MtgApiManager.Lib/Model/IModelMapper.cs b/src/MtgApiManager.Lib/Model/IModelMapper.cs
index 368e375..65b89d5 100644
--- a/src/MtgApiManager.Lib/Model/IModelMapper.cs
+++ b/src/MtgApiManager.Lib/Model/IModelMapper.cs
@@ -2,7 +2,7 @@
 
 namespace MtgApiManager.Lib.Model
 {
-    public interface IModelMapper
+    internal interface IModelMapper
     {
         Card MapCard(CardDto cardDto);
 
diff --git a/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj b/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj
index d3cfee0..86c803c 100644
--- a/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj
+++ b/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj
@@ -51,4 +51,13 @@
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>MtgApiManager.Lib.Test</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
+    </AssemblyAttribute>    
+  </ItemGroup>
+
 </Project>
diff --git a/src/MtgApiManager.Lib/MtgApiManager.Lib.xml b/src/MtgApiManager.Lib/MtgApiManager.Lib.xml
index 6c86cb7..3d7aa63 100644
--- a/src/MtgApiManager.Lib/MtgApiManager.Lib.xml
+++ b/src/MtgApiManager.Lib/MtgApiManager.Lib.xml
@@ -387,46 +387,6 @@
             <param name="requestsPerHour">The number of calls permitted per hour.</param>
             <returns>the delay in milliseconds.</returns>
         </member>
-        <member name="T:MtgApiManager.Lib.Dto.RootCardDto">
-            <summary>
-            Object representing a the root wrapper to read a single card.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.RootCardListDto">
-            <summary>
-            Object representing a the root wrapper to read a list of cards.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.MtgResponseBase">
-            <summary>
-            Base class for an MTG response.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.RootCardSubTypeDto">
-            <summary>
-            Object representing a root wrapper to read in card sub types.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.RootCardSuperTypeDto">
-            <summary>
-            Object representing a root wrapper to read in card super types.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.RootCardTypeDto">
-            <summary>
-            Object representing a root wrapper to read in card types.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.Set.RootSetDto">
-            <summary>
-            Object representing a root wrapper to read a single set.
-            </summary>
-        </member>
-        <member name="T:MtgApiManager.Lib.Dto.Set.RootSetListDto">
-            <summary>
-            Object representing a the root wrapper to read a list of sets.
-            </summary>
-        </member>
         <member name="T:MtgApiManager.Lib.Model.Card">
             <summary>
             Object representing a MTG card.
@@ -908,104 +868,70 @@
             Gets or sets the types of the card. These appear to the left of the dash in a card type. Example values: Instant, Sorcery, Artifact, Creature, Enchantment, Land, Planeswalker
             </summary>
         </member>
-        <member name="T:MtgApiManager.Lib.Service.CardService">
-            <summary>
-            Object representing a MTG card.
-            </summary>
+        <member name="M:MtgApiManager.Lib.Service.CardService.AllAsync">
+            <inheritdoc />
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.CardService"/> class. Defaults to version 1.0 of the API.
-            </summary>
+        <member name="M:MtgApiManager.Lib.Service.CardService.FindAsync(System.Int32)">
+            <inheritdoc />
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.#ctor(MtgApiManager.Lib.Core.IMtgApiServiceAdapter,MtgApiManager.Lib.Model.IModelMapper,MtgApiManager.Lib.Core.ApiVersion,System.Boolean)">
-            <summary>
-            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.CardService"/> class.
-            </summary>
-            <param name="serviceAdapter">The service adapter used to interact with the MTG API.</param>
-            <param name="modelMapper">Used to map entity objects to models.</param>
-            <param name="version">The version of the API</param>
-            <param name="rateLimitOn">Turn the rate limit on or off.</param>
+        <member name="M:MtgApiManager.Lib.Service.CardService.FindAsync(System.String)">
+            <inheritdoc />
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.AllAsync">
-            <summary>
-            Gets all the <see cref="T:MtgApiManager.Lib.Model.Card"/> defined by the query parameters.
-            </summary>
-            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing all the items.</returns>
+        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardSubTypesAsync">
+            <inheritdoc />
+        </member>
+        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardSuperTypesAsync">
+            <inheritdoc />
+        </member>
+        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardTypesAsync">
+            <inheritdoc />
+        </member>
+        <member name="M:MtgApiManager.Lib.Service.CardService.Where``1(System.Linq.Expressions.Expression{System.Func{MtgApiManager.Lib.Service.CardQueryParameter,``0}},``0)">
+            <inheritdoc />
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.Find(System.Int32)">
+        <member name="T:MtgApiManager.Lib.Service.ICardService">
             <summary>
-            Find a specific card by its multi verse identifier.
-            </summary>
-            <param name="multiverseId">The multi verse identifier to query for.</param>
-            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:MtgApiManager.Lib.Model.Card"/> or an exception.</returns>
+            Object representing a MTG card.
+            </summary>    
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.Find(System.String)">
+        <member name="M:MtgApiManager.Lib.Service.ICardService.AllAsync">
             <summary>
-            Find a specific card by its multi verse identifier.
+            Gets all the <see cref="T:MtgApiManager.Lib.Model.Card"/> defined by the query parameters.
             </summary>
-            <param name="id">The identifier to query for.</param>
-            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:MtgApiManager.Lib.Model.Card"/> or an exception.</returns>
+            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing all the items.</returns>        
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.FindAsync(System.Int32)">
+        <member name="M:MtgApiManager.Lib.Service.ICardService.FindAsync(System.Int32)">
             <summary>
             Find a specific card by its multi verse identifier.
             </summary>
             <param name="multiverseId">The multi verse identifier to query for.</param>
             <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:MtgApiManager.Lib.Model.Card"/> or an exception.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.FindAsync(System.String)">
+        <member name="M:MtgApiManager.Lib.Service.ICardService.FindAsync(System.String)">
             <summary>
             Find a specific card by its multi verse identifier.
             </summary>
             <param name="id">The identifier to query for.</param>
             <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:MtgApiManager.Lib.Model.Card"/> or an exception.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardSubTypes">
+        <member name="M:MtgApiManager.Lib.Service.ICardService.GetCardSubTypesAsync">
             <summary>
             Gets a list of all the card sub types.
             </summary>
             <returns>A list of all the card super types.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardSubTypesAsync">
-            <summary>
-            Gets a list of all the card sub types.
-            </summary>
-            <returns>A list of all the card super types.</returns>
-        </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardSuperTypes">
-            <summary>
-            Gets a list of all the card super types.
-            </summary>
-            <returns>A list of all the card super types.</returns>
-        </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardSuperTypesAsync">
+        <member name="M:MtgApiManager.Lib.Service.ICardService.GetCardSuperTypesAsync">
             <summary>
             Gets a list of all the card super types.
             </summary>
             <returns>A list of all the card super types.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardTypes">
+        <member name="M:MtgApiManager.Lib.Service.ICardService.GetCardTypesAsync">
             <summary>
             Gets a list of all the card types.
             </summary>
             <returns>A list of all the card types.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.GetCardTypesAsync">
-            <summary>
-            Gets a list of all the card types.
-            </summary>
-            <returns>A list of all the card types.</returns>
-        </member>
-        <member name="M:MtgApiManager.Lib.Service.CardService.Where``1(System.Linq.Expressions.Expression{System.Func{MtgApiManager.Lib.Service.CardQueryParameter,``0}},``0)">
-            <summary>
-            Adds a query parameter.
-            </summary>
-            <typeparam name="U">The type of property to add the query for.</typeparam>
-            <param name="property">The property to add the query for.</param>
-            <param name="value">The value of the query.</param>
-            <returns>The instance of its self with the new query parameter.</returns>
-        </member>
         <member name="T:MtgApiManager.Lib.Service.IMtgQueryable`2">
             <summary>
             Defines an object to be query able against the MTG API.
@@ -1022,59 +948,66 @@
             <param name="value">The value of the query.</param>
             <returns>The instance of its self with the new query parameter.</returns>
         </member>
-        <member name="T:MtgApiManager.Lib.Service.QueryParameterBase">
+        <member name="T:MtgApiManager.Lib.Service.IQueryParameter">
+            <summary>
+            Defines a query parameter
+            </summary>
+        </member>
+        <member name="T:MtgApiManager.Lib.Service.IMtgServiceProvider">
             <summary>
-            Base class for query parameters.
+            Used to get an instance of a service class.
             </summary>
         </member>
-        <member name="T:MtgApiManager.Lib.Service.ServiceBase`1">
+        <member name="M:MtgApiManager.Lib.Service.IMtgServiceProvider.GetCardService">
             <summary>
-            Base class for a service.
+            Gets an instance of the card service.
             </summary>
-            <typeparam name="TModel">The type of model used by the service.</typeparam>
+            <returns>An instance of the card service.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.#ctor(MtgApiManager.Lib.Core.IMtgApiServiceAdapter,MtgApiManager.Lib.Model.IModelMapper,MtgApiManager.Lib.Core.ApiVersion,MtgApiManager.Lib.Core.ApiEndPoint,System.Boolean)">
+        <member name="M:MtgApiManager.Lib.Service.IMtgServiceProvider.GetSetService">
             <summary>
-            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.ServiceBase`1"/> class.
+            Gets an instance of the set service.
             </summary>
-            <param name="serviceAdapter">The service adapter used to interact with the MTG API.</param>
-            <param name="modelMapper">Used to map entity objects to models.</param>
-            <param name="version">The version of the API (currently only 1 version.)</param>
-            <param name="endpoint">The end point of the service.</param>
-            <param name="rateLimitOn">Turn the rate limit on or off.</param>
+            <returns>An instance of the set service.</returns>
         </member>
-        <member name="P:MtgApiManager.Lib.Service.ServiceBase`1.WhereQueries">
+        <member name="T:MtgApiManager.Lib.Service.ISetService">
             <summary>
-            Gets the list of where queries.
+            Object representing a MTG set.
             </summary>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.AllAsync">
+        <member name="M:MtgApiManager.Lib.Service.ISetService.AllAsync">
             <summary>
-            Gets all the objects defined by the query parameters.
+            Gets all the <see cref="T:MtgApiManager.Lib.Model.Set"/> defined by the query parameters.
             </summary>
             <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing all the items.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.BuildUri(System.Collections.Generic.Dictionary{System.String,System.String})">
+        <member name="M:MtgApiManager.Lib.Service.ISetService.FindAsync(System.String)">
             <summary>
-            Builds the URL to call the web service.
+            Find a specific card by its set code.
             </summary>
-            <param name="parameters">The list of parameters to add to the query.</param>
-            <returns>The URL to make the call with.</returns>
+            <param name="code">The set code to query for.</param>
+            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:MtgApiManager.Lib.Model.Set"/> or an exception.</returns>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.BuildUri(System.String)">
+        <member name="M:MtgApiManager.Lib.Service.ISetService.GenerateBoosterAsync(System.String)">
             <summary>
-            Builds the URL to call the web service.
+             Generates a booster pack for a specific set asynchronously.
             </summary>
-            <param name="parameterValue">The parameter value to add.</param>
-            <returns>The URL to make the call with.</returns>
+            <param name="code">The set code to generate a booster for.</param>
+            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:System.Collections.Generic.List`1"/> or an exception.</returns>
+        </member>
+        <member name="T:MtgApiManager.Lib.Service.MtgServiceProvider">
+            <inheritdoc />
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.CallWebServiceGet``1(System.Uri)">
+        <member name="M:MtgApiManager.Lib.Service.MtgServiceProvider.#ctor">
             <summary>
-            Makes a GET call to the web service.
+            Initializes a new instance of the service provider.
             </summary>
-            <typeparam name="T">The type of object to serialize the response into.</typeparam>
-            <param name="requestUri">The URL to call.</param>
-            <returns>The response of the GET serialized into the specified object.</returns>
+        </member>
+        <member name="M:MtgApiManager.Lib.Service.MtgServiceProvider.GetCardService">
+            <inheritdoc />
+        </member>
+        <member name="M:MtgApiManager.Lib.Service.MtgServiceProvider.GetSetService">
+            <inheritdoc />
         </member>
         <member name="T:MtgApiManager.Lib.Service.SetQueryParameter">
             <summary>
@@ -1091,53 +1024,17 @@
             Gets or sets the name of the set.
             </summary>
         </member>
-        <member name="T:MtgApiManager.Lib.Service.SetService">
-            <summary>
-            Object representing a MTG set.
-            </summary>
-        </member>
-        <member name="M:MtgApiManager.Lib.Service.SetService.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.SetService"/> class. Defaults to version 1.0 of the API.
-            </summary>
-        </member>
-        <member name="M:MtgApiManager.Lib.Service.SetService.#ctor(MtgApiManager.Lib.Core.IMtgApiServiceAdapter,MtgApiManager.Lib.Model.IModelMapper,MtgApiManager.Lib.Core.ApiVersion,System.Boolean)">
-            <summary>
-            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.SetService"/> class.
-            </summary>
-            <param name="serviceAdapter">The service adapter used to interact with the MTG API.</param>
-            <param name="modelMapper">Used to map entity objects to models.</param>
-            <param name="version">The version of the API</param>
-            <param name="rateLimitOn">Turn the rate limit on or off.</param>
-        </member>
         <member name="M:MtgApiManager.Lib.Service.SetService.AllAsync">
-            <summary>
-            Gets all the <see cref="T:MtgApiManager.Lib.Model.Set"/> defined by the query parameters.
-            </summary>
-            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing all the items.</returns>
+            <inheritdoc />
         </member>
         <member name="M:MtgApiManager.Lib.Service.SetService.FindAsync(System.String)">
-            <summary>
-            Find a specific card by its set code.
-            </summary>
-            <param name="code">The set code to query for.</param>
-            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:MtgApiManager.Lib.Model.Set"/> or an exception.</returns>
+            <inheritdoc />
         </member>
         <member name="M:MtgApiManager.Lib.Service.SetService.GenerateBoosterAsync(System.String)">
-            <summary>
-             Generates a booster pack for a specific set asynchronously.
-            </summary>
-            <param name="code">The set code to generate a booster for.</param>
-            <returns>A <see cref="T:MtgApiManager.Lib.Core.Exceptional`1"/> representing the result containing a <see cref="T:System.Collections.Generic.List`1"/> or an exception.</returns>
+            <inheritdoc />
         </member>
         <member name="M:MtgApiManager.Lib.Service.SetService.Where``1(System.Linq.Expressions.Expression{System.Func{MtgApiManager.Lib.Service.SetQueryParameter,``0}},``0)">
-            <summary>
-            Adds a query parameter.
-            </summary>
-            <typeparam name="U">The type of property to add the query for.</typeparam>
-            <param name="property">The property to add the query for.</param>
-            <param name="value">The value of the query.</param>
-            <returns>The instance of its self with the new query parameter.</returns>
+            <inheritdoc />
         </member>
         <member name="T:MtgApiManager.Lib.Utility.Extensions">
             <summary>
diff --git a/src/MtgApiManager.Lib/Service/CardQueryParameter.cs b/src/MtgApiManager.Lib/Service/CardQueryParameter.cs
index 1c72d75..7195c87 100644
--- a/src/MtgApiManager.Lib/Service/CardQueryParameter.cs
+++ b/src/MtgApiManager.Lib/Service/CardQueryParameter.cs
@@ -5,7 +5,7 @@ namespace MtgApiManager.Lib.Service
     /// <summary>
     /// Query parameters for the <see cref="Model.Card"/> object.
     /// </summary>
-    public class CardQueryParameter : QueryParameterBase
+    public class CardQueryParameter : IQueryParameter
     {
         /// <summary>
         /// Gets or sets the artist of the card.
diff --git a/src/MtgApiManager.Lib/Service/CardService.cs b/src/MtgApiManager.Lib/Service/CardService.cs
index 248c7e3..0d9fab1 100644
--- a/src/MtgApiManager.Lib/Service/CardService.cs
+++ b/src/MtgApiManager.Lib/Service/CardService.cs
@@ -10,27 +10,8 @@
 
 namespace MtgApiManager.Lib.Service
 {
-    /// <summary>
-    /// Object representing a MTG card.
-    /// </summary>
-    public class CardService
-        : ServiceBase<Card>, IMtgQueryable<CardService, CardQueryParameter>
+    internal class CardService : ServiceBase<Card>, ICardService
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CardService"/> class. Defaults to version 1.0 of the API.
-        /// </summary>
-        public CardService()
-            : this(new MtgApiServiceAdapter(), new ModelMapper(), ApiVersion.V1_0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CardService"/> class.
-        /// </summary>
-        /// <param name="serviceAdapter">The service adapter used to interact with the MTG API.</param>
-        /// <param name="modelMapper">Used to map entity objects to models.</param>
-        /// <param name="version">The version of the API</param>
-        /// <param name="rateLimitOn">Turn the rate limit on or off.</param>
         public CardService(
             IMtgApiServiceAdapter serviceAdapter,
             IModelMapper modelMapper,
@@ -40,10 +21,7 @@ public CardService(
         {
         }
 
-        /// <summary>
-        /// Gets all the <see cref="Card"/> defined by the query parameters.
-        /// </summary>
-        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
+        /// <inheritdoc />
         public async override Task<Exceptional<List<Card>>> AllAsync()
         {
             try
@@ -59,32 +37,10 @@ public async override Task<Exceptional<List<Card>>> AllAsync()
             }
         }
 
-        /// <summary>
-        /// Find a specific card by its multi verse identifier.
-        /// </summary>
-        /// <param name="multiverseId">The multi verse identifier to query for.</param>
-        /// <returns>A <see cref="Exceptional{Card}"/> representing the result containing a <see cref="Card"/> or an exception.</returns>
-        public Exceptional<Card> Find(int multiverseId) => FindAsync(multiverseId.ToString()).Result;
-
-        /// <summary>
-        /// Find a specific card by its multi verse identifier.
-        /// </summary>
-        /// <param name="id">The identifier to query for.</param>
-        /// <returns>A <see cref="Exceptional{Card}"/> representing the result containing a <see cref="Card"/> or an exception.</returns>
-        public Exceptional<Card> Find(string id) => FindAsync(id).Result;
-
-        /// <summary>
-        /// Find a specific card by its multi verse identifier.
-        /// </summary>
-        /// <param name="multiverseId">The multi verse identifier to query for.</param>
-        /// <returns>A <see cref="Exceptional{Card}"/> representing the result containing a <see cref="Card"/> or an exception.</returns>
+        /// <inheritdoc />
         public Task<Exceptional<Card>> FindAsync(int multiverseId) => FindAsync(multiverseId.ToString());
 
-        /// <summary>
-        /// Find a specific card by its multi verse identifier.
-        /// </summary>
-        /// <param name="id">The identifier to query for.</param>
-        /// <returns>A <see cref="Exceptional{Card}"/> representing the result containing a <see cref="Card"/> or an exception.</returns>
+        /// <inheritdoc />
         public async Task<Exceptional<Card>> FindAsync(string id)
         {
             try
@@ -100,29 +56,7 @@ public async Task<Exceptional<Card>> FindAsync(string id)
             }
         }
 
-        /// <summary>
-        /// Gets a list of all the card sub types.
-        /// </summary>
-        /// <returns>A list of all the card super types.</returns>
-        public Exceptional<List<string>> GetCardSubTypes()
-        {
-            try
-            {
-                var url = new Uri(new Uri(BaseMtgUrl), string.Concat(Version.GetDescription(), "/", ApiEndPoint.CardSubTypes.GetDescription()));
-                var rootTypeList = CallWebServiceGet<RootCardSubTypeDto>(url).Result;
-
-                return Exceptional<List<string>>.Success(rootTypeList.SubTypes, MtgApiController.CreatePagingInfo());
-            }
-            catch (AggregateException ex)
-            {
-                return Exceptional<List<string>>.Failure(ex.Flatten().InnerException);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all the card sub types.
-        /// </summary>
-        /// <returns>A list of all the card super types.</returns>
+        /// <inheritdoc />
         public async Task<Exceptional<List<string>>> GetCardSubTypesAsync()
         {
             try
@@ -138,29 +72,7 @@ public async Task<Exceptional<List<string>>> GetCardSubTypesAsync()
             }
         }
 
-        /// <summary>
-        /// Gets a list of all the card super types.
-        /// </summary>
-        /// <returns>A list of all the card super types.</returns>
-        public Exceptional<List<string>> GetCardSuperTypes()
-        {
-            try
-            {
-                var url = new Uri(new Uri(BaseMtgUrl), string.Concat(Version.GetDescription(), "/", ApiEndPoint.CardSuperTypes.GetDescription()));
-                var rootTypeList = CallWebServiceGet<RootCardSuperTypeDto>(url).Result;
-
-                return Exceptional<List<string>>.Success(rootTypeList.SuperTypes, MtgApiController.CreatePagingInfo());
-            }
-            catch (AggregateException ex)
-            {
-                return Exceptional<List<string>>.Failure(ex.Flatten().InnerException);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all the card super types.
-        /// </summary>
-        /// <returns>A list of all the card super types.</returns>
+        /// <inheritdoc />
         public async Task<Exceptional<List<string>>> GetCardSuperTypesAsync()
         {
             try
@@ -176,29 +88,7 @@ public async Task<Exceptional<List<string>>> GetCardSuperTypesAsync()
             }
         }
 
-        /// <summary>
-        /// Gets a list of all the card types.
-        /// </summary>
-        /// <returns>A list of all the card types.</returns>
-        public Exceptional<List<string>> GetCardTypes()
-        {
-            try
-            {
-                var url = new Uri(new Uri(BaseMtgUrl), string.Concat(Version.GetDescription(), "/", ApiEndPoint.CardTypes.GetDescription()));
-                var rootTypeList = CallWebServiceGet<RootCardTypeDto>(url).Result;
-
-                return Exceptional<List<string>>.Success(rootTypeList.Types, MtgApiController.CreatePagingInfo());
-            }
-            catch (AggregateException ex)
-            {
-                return Exceptional<List<string>>.Failure(ex.Flatten().InnerException);
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all the card types.
-        /// </summary>
-        /// <returns>A list of all the card types.</returns>
+        /// <inheritdoc />
         public async Task<Exceptional<List<string>>> GetCardTypesAsync()
         {
             try
@@ -214,14 +104,9 @@ public async Task<Exceptional<List<string>>> GetCardTypesAsync()
             }
         }
 
-        /// <summary>
-        /// Adds a query parameter.
-        /// </summary>
-        /// <typeparam name="U">The type of property to add the query for.</typeparam>
-        /// <param name="property">The property to add the query for.</param>
-        /// <param name="value">The value of the query.</param>
-        /// <returns>The instance of its self with the new query parameter.</returns>
-        public CardService Where<U>(Expression<Func<CardQueryParameter, U>> property, U value)
+
+        /// <inheritdoc />
+        public ICardService Where<U>(Expression<Func<CardQueryParameter, U>> property, U value)
         {
             if (property == null)
             {
diff --git a/src/MtgApiManager.Lib/Service/ICardService.cs b/src/MtgApiManager.Lib/Service/ICardService.cs
new file mode 100644
index 0000000..85426f0
--- /dev/null
+++ b/src/MtgApiManager.Lib/Service/ICardService.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MtgApiManager.Lib.Core;
+using MtgApiManager.Lib.Model;
+
+namespace MtgApiManager.Lib.Service
+{
+    /// <summary>
+    /// Object representing a MTG card.
+    /// </summary>    
+    public interface ICardService : IMtgQueryable<ICardService, CardQueryParameter>
+    {
+        /// <summary>
+        /// Gets all the <see cref="Card"/> defined by the query parameters.
+        /// </summary>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>        
+        Task<Exceptional<List<Card>>> AllAsync();
+
+        /// <summary>
+        /// Find a specific card by its multi verse identifier.
+        /// </summary>
+        /// <param name="multiverseId">The multi verse identifier to query for.</param>
+        /// <returns>A <see cref="Exceptional{Card}"/> representing the result containing a <see cref="Card"/> or an exception.</returns>
+        Task<Exceptional<Card>> FindAsync(int multiverseId);
+
+        /// <summary>
+        /// Find a specific card by its multi verse identifier.
+        /// </summary>
+        /// <param name="id">The identifier to query for.</param>
+        /// <returns>A <see cref="Exceptional{Card}"/> representing the result containing a <see cref="Card"/> or an exception.</returns>
+        Task<Exceptional<Card>> FindAsync(string id);
+
+        /// <summary>
+        /// Gets a list of all the card sub types.
+        /// </summary>
+        /// <returns>A list of all the card super types.</returns>
+        Task<Exceptional<List<string>>> GetCardSubTypesAsync();
+
+        /// <summary>
+        /// Gets a list of all the card super types.
+        /// </summary>
+        /// <returns>A list of all the card super types.</returns>
+        Task<Exceptional<List<string>>> GetCardSuperTypesAsync();
+
+        /// <summary>
+        /// Gets a list of all the card types.
+        /// </summary>
+        /// <returns>A list of all the card types.</returns>
+        Task<Exceptional<List<string>>> GetCardTypesAsync();
+    }
+}
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Service/IMtgQueryable.cs b/src/MtgApiManager.Lib/Service/IMtgQueryable.cs
index 7727b8e..e28c614 100644
--- a/src/MtgApiManager.Lib/Service/IMtgQueryable.cs
+++ b/src/MtgApiManager.Lib/Service/IMtgQueryable.cs
@@ -9,7 +9,7 @@
     /// <typeparam name="TService">The type of service.</typeparam>
     /// <typeparam name="TQuery">The type of query.</typeparam>
     public interface IMtgQueryable<TService, TQuery>
-        where TQuery : QueryParameterBase
+        where TQuery : IQueryParameter
     {
         /// <summary>
         /// Adds a query parameter.
diff --git a/src/MtgApiManager.Lib/Service/IQueryParameter.cs b/src/MtgApiManager.Lib/Service/IQueryParameter.cs
new file mode 100644
index 0000000..637ac35
--- /dev/null
+++ b/src/MtgApiManager.Lib/Service/IQueryParameter.cs
@@ -0,0 +1,9 @@
+namespace MtgApiManager.Lib.Service
+{
+    /// <summary>
+    /// Defines a query parameter
+    /// </summary>
+    public interface IQueryParameter
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Service/IServiceProvider.cs b/src/MtgApiManager.Lib/Service/IServiceProvider.cs
new file mode 100644
index 0000000..1574f81
--- /dev/null
+++ b/src/MtgApiManager.Lib/Service/IServiceProvider.cs
@@ -0,0 +1,20 @@
+namespace MtgApiManager.Lib.Service
+{
+    /// <summary>
+    /// Used to get an instance of a service class.
+    /// </summary>
+    public interface IMtgServiceProvider
+    {
+        /// <summary>
+        /// Gets an instance of the card service.
+        /// </summary>
+        /// <returns>An instance of the card service.</returns>
+        ICardService GetCardService();
+
+        /// <summary>
+        /// Gets an instance of the set service.
+        /// </summary>
+        /// <returns>An instance of the set service.</returns>
+        ISetService GetSetService();
+    }
+}
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Service/ISetService.cs b/src/MtgApiManager.Lib/Service/ISetService.cs
new file mode 100644
index 0000000..4f1dc6a
--- /dev/null
+++ b/src/MtgApiManager.Lib/Service/ISetService.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MtgApiManager.Lib.Core;
+using MtgApiManager.Lib.Model;
+
+namespace MtgApiManager.Lib.Service
+{
+    /// <summary>
+    /// Object representing a MTG set.
+    /// </summary>
+    public interface ISetService : IMtgQueryable<ISetService, SetQueryParameter>
+    {
+        /// <summary>
+        /// Gets all the <see cref="Set"/> defined by the query parameters.
+        /// </summary>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
+        Task<Exceptional<List<Set>>> AllAsync();
+
+        /// <summary>
+        /// Find a specific card by its set code.
+        /// </summary>
+        /// <param name="code">The set code to query for.</param>
+        /// <returns>A <see cref="Exceptional{Set}"/> representing the result containing a <see cref="Set"/> or an exception.</returns>
+        Task<Exceptional<Set>> FindAsync(string code);
+
+        /// <summary>
+        ///  Generates a booster pack for a specific set asynchronously.
+        /// </summary>
+        /// <param name="code">The set code to generate a booster for.</param>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing a <see cref="List{Card}"/> or an exception.</returns>
+        Task<Exceptional<List<Card>>> GenerateBoosterAsync(string code);
+    }
+}
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Service/QueryParameterBase.cs b/src/MtgApiManager.Lib/Service/QueryParameterBase.cs
deleted file mode 100644
index 98f2ef7..0000000
--- a/src/MtgApiManager.Lib/Service/QueryParameterBase.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// <copyright file="QueryParameterBase.cs">
-//     Copyright (c) 2014. All rights reserved.
-// </copyright>
-// <author>Jason Regnier</author>
-namespace MtgApiManager.Lib.Service
-{
-    /// <summary>
-    /// Base class for query parameters.
-    /// </summary>
-    public class QueryParameterBase
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Service/ServiceBase.cs b/src/MtgApiManager.Lib/Service/ServiceBase.cs
index 4ef859f..1555f86 100644
--- a/src/MtgApiManager.Lib/Service/ServiceBase.cs
+++ b/src/MtgApiManager.Lib/Service/ServiceBase.cs
@@ -3,30 +3,20 @@
 using System.Linq;
 using System.Threading.Tasks;
 using MtgApiManager.Lib.Core;
+using MtgApiManager.Lib.Dto;
 using MtgApiManager.Lib.Model;
 using MtgApiManager.Lib.Utility;
 
 namespace MtgApiManager.Lib.Service
 {
-    /// <summary>
-    /// Base class for a service.
-    /// </summary>
-    /// <typeparam name="TModel">The type of model used by the service.</typeparam>
-    public abstract class ServiceBase<TModel>
+    internal abstract class ServiceBase<TModel>
         where TModel : class
     {
         private const string BASE_URL = "https://api.magicthegathering.io";
 
+        private readonly ApiEndPoint _endPoint;
         private readonly bool _isRateLimitOn;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBase{TModel}"/> class.
-        /// </summary>
-        /// <param name="serviceAdapter">The service adapter used to interact with the MTG API.</param>
-        /// <param name="modelMapper">Used to map entity objects to models.</param>
-        /// <param name="version">The version of the API (currently only 1 version.)</param>
-        /// <param name="endpoint">The end point of the service.</param>
-        /// <param name="rateLimitOn">Turn the rate limit on or off.</param>
         protected ServiceBase(
             IMtgApiServiceAdapter serviceAdapter,
             IModelMapper modelMapper,
@@ -37,35 +27,23 @@ protected ServiceBase(
             Adapter = serviceAdapter;
             ModelMapper = modelMapper;
             Version = version;
-            EndPoint = endpoint;
+            _endPoint = endpoint;
             _isRateLimitOn = rateLimitOn;
             WhereQueries = new Dictionary<string, string>();
         }
 
         protected IMtgApiServiceAdapter Adapter { get; }
-        protected string BaseMtgUrl => BASE_URL;
-        protected ApiEndPoint EndPoint { get; }
+
+        protected static string BaseMtgUrl => BASE_URL;
 
         protected IModelMapper ModelMapper { get; }
 
         protected ApiVersion Version { get; }
 
-        /// <summary>
-        /// Gets the list of where queries.
-        /// </summary>
         protected Dictionary<string, string> WhereQueries { get; }
 
-        /// <summary>
-        /// Gets all the objects defined by the query parameters.
-        /// </summary>
-        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
         public abstract Task<Exceptional<List<TModel>>> AllAsync();
 
-        /// <summary>
-        /// Builds the URL to call the web service.
-        /// </summary>
-        /// <param name="parameters">The list of parameters to add to the query.</param>
-        /// <returns>The URL to make the call with.</returns>
         protected Uri BuildUri(Dictionary<string, string> parameters)
         {
             if (parameters == null)
@@ -76,7 +54,7 @@ protected Uri BuildUri(Dictionary<string, string> parameters)
             var urlBuilder = new UriBuilder(
                 new Uri(
                     new Uri(BaseMtgUrl),
-                    string.Concat(Version.GetDescription(), "/", EndPoint.GetDescription())));
+                    string.Concat(Version.GetDescription(), "/", _endPoint.GetDescription())));
 
             var paramList = parameters
                 .Select(p => $"{p.Key}={p.Value}")
@@ -87,11 +65,6 @@ protected Uri BuildUri(Dictionary<string, string> parameters)
             return urlBuilder.Uri;
         }
 
-        /// <summary>
-        /// Builds the URL to call the web service.
-        /// </summary>
-        /// <param name="parameterValue">The parameter value to add.</param>
-        /// <returns>The URL to make the call with.</returns>
         protected Uri BuildUri(string parameterValue)
         {
             if (string.IsNullOrWhiteSpace(parameterValue))
@@ -101,16 +74,10 @@ protected Uri BuildUri(string parameterValue)
 
             return new Uri(
                 new Uri(BaseMtgUrl),
-                string.Concat(Version.GetDescription(), "/", EndPoint.GetDescription(), "/", parameterValue));
+                string.Concat(Version.GetDescription(), "/", _endPoint.GetDescription(), "/", parameterValue));
         }
 
-        /// <summary>
-        /// Makes a GET call to the web service.
-        /// </summary>
-        /// <typeparam name="T">The type of object to serialize the response into.</typeparam>
-        /// <param name="requestUri">The URL to call.</param>
-        /// <returns>The response of the GET serialized into the specified object.</returns>
-        protected Task<T> CallWebServiceGet<T>(Uri requestUri) where T : Dto.MtgResponseBase
+        protected Task<T> CallWebServiceGet<T>(Uri requestUri) where T : IMtgResponse
         {
             if (requestUri == null)
             {
@@ -120,11 +87,13 @@ protected Task<T> CallWebServiceGet<T>(Uri requestUri) where T : Dto.MtgResponse
             return CallWebServiceGetInternal<T>(requestUri);
         }
 
-        protected async Task<T> CallWebServiceGetInternal<T>(Uri requestUri) where T : Dto.MtgResponseBase
+        protected async Task<T> CallWebServiceGetInternal<T>(Uri requestUri) where T : IMtgResponse
         {
             // Makes sure that th rate limit is not reached.
             if (_isRateLimitOn)
+            {
                 await MtgApiController.HandleRateLimit().ConfigureAwait(false);
+            }
 
             return await Adapter.WebGetAsync<T>(requestUri).ConfigureAwait(false);
         }
diff --git a/src/MtgApiManager.Lib/Service/ServiceProvider.cs b/src/MtgApiManager.Lib/Service/ServiceProvider.cs
new file mode 100644
index 0000000..7fb9b5a
--- /dev/null
+++ b/src/MtgApiManager.Lib/Service/ServiceProvider.cs
@@ -0,0 +1,48 @@
+using MtgApiManager.Lib.Core;
+using MtgApiManager.Lib.Model;
+
+namespace MtgApiManager.Lib.Service
+{
+    /// <inheritdoc />
+    public class MtgServiceProvider : IMtgServiceProvider
+    {
+        private readonly ApiVersion _apiVersion;
+        private readonly IMtgApiServiceAdapter _serviceAdapter;
+        private readonly IModelMapper _modelMapper;
+        private readonly bool _rateLimitOn;
+        private ICardService _cardService;
+        private ISetService _setService;
+
+        /// <summary>
+        /// Initializes a new instance of the service provider.
+        /// </summary>
+        public MtgServiceProvider()
+            : this(new MtgApiServiceAdapter(), new ModelMapper())
+        {
+        }
+
+        internal MtgServiceProvider(
+            IMtgApiServiceAdapter serviceAdapter,
+            IModelMapper modelMapper,
+            bool rateLimitOn = true)
+        {
+            _serviceAdapter = serviceAdapter;
+            _modelMapper = modelMapper;
+            _rateLimitOn = rateLimitOn;
+            _apiVersion = ApiVersion.V1_0;
+        }
+
+        /// <inheritdoc />
+        public ICardService GetCardService()
+        {
+            return _cardService ??= new CardService(_serviceAdapter, _modelMapper, _apiVersion, _rateLimitOn);
+        }
+
+        /// <inheritdoc />
+        public ISetService GetSetService()
+        {
+            return _setService ??= new SetService(_serviceAdapter, _modelMapper, _apiVersion, _rateLimitOn);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/MtgApiManager.Lib/Service/SetQueryParameter.cs b/src/MtgApiManager.Lib/Service/SetQueryParameter.cs
index e1c57cd..8e4594e 100644
--- a/src/MtgApiManager.Lib/Service/SetQueryParameter.cs
+++ b/src/MtgApiManager.Lib/Service/SetQueryParameter.cs
@@ -5,7 +5,7 @@ namespace MtgApiManager.Lib.Service
     /// <summary>
     /// Query parameters for the <see cref="Model.Set"/> object.
     /// </summary>
-    public class SetQueryParameter : QueryParameterBase
+    public class SetQueryParameter : IQueryParameter
     {
         /// <summary>
         /// Gets or sets the block the set is in.
diff --git a/src/MtgApiManager.Lib/Service/SetService.cs b/src/MtgApiManager.Lib/Service/SetService.cs
index dce3474..798d1a3 100644
--- a/src/MtgApiManager.Lib/Service/SetService.cs
+++ b/src/MtgApiManager.Lib/Service/SetService.cs
@@ -12,27 +12,8 @@
 
 namespace MtgApiManager.Lib.Service
 {
-    /// <summary>
-    /// Object representing a MTG set.
-    /// </summary>
-    public class SetService
-        : ServiceBase<Set>, IMtgQueryable<SetService, SetQueryParameter>
+    internal class SetService : ServiceBase<Set>, ISetService
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetService"/> class. Defaults to version 1.0 of the API.
-        /// </summary>
-        public SetService()
-            : this(new MtgApiServiceAdapter(), new ModelMapper(), ApiVersion.V1_0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetService"/> class.
-        /// </summary>
-        /// <param name="serviceAdapter">The service adapter used to interact with the MTG API.</param>
-        /// <param name="modelMapper">Used to map entity objects to models.</param>
-        /// <param name="version">The version of the API</param>
-        /// <param name="rateLimitOn">Turn the rate limit on or off.</param>
         public SetService(
             IMtgApiServiceAdapter serviceAdapter,
             IModelMapper modelMapper,
@@ -42,10 +23,7 @@ public SetService(
         {
         }
 
-        /// <summary>
-        /// Gets all the <see cref="Set"/> defined by the query parameters.
-        /// </summary>
-        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
+        /// <inheritdoc />
         public async override Task<Exceptional<List<Set>>> AllAsync()
         {
             try
@@ -60,11 +38,7 @@ public async override Task<Exceptional<List<Set>>> AllAsync()
             }
         }
 
-        /// <summary>
-        /// Find a specific card by its set code.
-        /// </summary>
-        /// <param name="code">The set code to query for.</param>
-        /// <returns>A <see cref="Exceptional{Set}"/> representing the result containing a <see cref="Set"/> or an exception.</returns>
+        /// <inheritdoc />
         public async Task<Exceptional<Set>> FindAsync(string code)
         {
             try
@@ -80,11 +54,7 @@ public async Task<Exceptional<Set>> FindAsync(string code)
             }
         }
 
-        /// <summary>
-        ///  Generates a booster pack for a specific set asynchronously.
-        /// </summary>
-        /// <param name="code">The set code to generate a booster for.</param>
-        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing a <see cref="List{Card}"/> or an exception.</returns>
+        /// <inheritdoc />
         public async Task<Exceptional<List<Card>>> GenerateBoosterAsync(string code)
         {
             try
@@ -104,14 +74,8 @@ public async Task<Exceptional<List<Card>>> GenerateBoosterAsync(string code)
             }
         }
 
-        /// <summary>
-        /// Adds a query parameter.
-        /// </summary>
-        /// <typeparam name="U">The type of property to add the query for.</typeparam>
-        /// <param name="property">The property to add the query for.</param>
-        /// <param name="value">The value of the query.</param>
-        /// <returns>The instance of its self with the new query parameter.</returns>
-        public SetService Where<U>(Expression<Func<SetQueryParameter, U>> property, U value)
+        /// <inheritdoc />
+        public ISetService Where<U>(Expression<Func<SetQueryParameter, U>> property, U value)
         {
             if (property == null)
             {
diff --git a/src/MtgApiManager.Lib/Utility/Extensions.cs b/src/MtgApiManager.Lib/Utility/Extensions.cs
index a1fcf13..67efe22 100644
--- a/src/MtgApiManager.Lib/Utility/Extensions.cs
+++ b/src/MtgApiManager.Lib/Utility/Extensions.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// Contains extension methods.
     /// </summary>
-    public static class Extensions
+    internal static class Extensions
     {
         /// <summary>
         /// Extracts the description attribute from an <see cref="Enum"/> type.
diff --git a/src/MtgApiManager.Lib/Utility/QueryUtility.cs b/src/MtgApiManager.Lib/Utility/QueryUtility.cs
index 902dba2..46f0fcd 100644
--- a/src/MtgApiManager.Lib/Utility/QueryUtility.cs
+++ b/src/MtgApiManager.Lib/Utility/QueryUtility.cs
@@ -7,7 +7,7 @@ namespace MtgApiManager.Lib.Utility
     /// <summary>
     /// Utility methods dealing with queries.
     /// </summary>
-    public static class QueryUtility
+    internal static class QueryUtility
     {
         /// <summary>
         /// Gets the property name from a member expression.