diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 0000000..4628051
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,7 @@
+[*.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/ServiceBaseObjectService.cs b/src/MtgApiManager.Lib.Test/Service/ServiceBaseObjectService.cs
index 79d9d13..f2b8200 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<CardService, Card>
+    public 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/MtgApiManager.Lib.csproj b/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj
index 42f6379..d3cfee0 100644
--- a/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj
+++ b/src/MtgApiManager.Lib/MtgApiManager.Lib.csproj
@@ -48,6 +48,7 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MtgApiManager.Lib/MtgApiManager.Lib.xml b/src/MtgApiManager.Lib/MtgApiManager.Lib.xml
index fe131a5..6c86cb7 100644
--- a/src/MtgApiManager.Lib/MtgApiManager.Lib.xml
+++ b/src/MtgApiManager.Lib/MtgApiManager.Lib.xml
@@ -923,14 +923,15 @@
             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>
         <member name="M:MtgApiManager.Lib.Service.CardService.AllAsync">
             <summary>
-            Gets all the <see cref="!:TModel"/> defined by the query parameters.
+            Gets all the <see cref="T:MtgApiManager.Lib.Model.Card"/> defined by the query parameters.
             </summary>
-            <returns>A <see cref="!:Exceptional&lt;List&lt;Card&gt;&gt;"/> representing the result containing all the items.</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.Find(System.Int32)">
             <summary>
@@ -1026,53 +1027,48 @@
             Base class for query parameters.
             </summary>
         </member>
-        <member name="T:MtgApiManager.Lib.Service.ServiceBase`2">
+        <member name="T:MtgApiManager.Lib.Service.ServiceBase`1">
             <summary>
             Base class for a service.
             </summary>
-            <typeparam name="TService">The type of service.</typeparam>
             <typeparam name="TModel">The type of model used by the service.</typeparam>
         </member>
-        <member name="F:MtgApiManager.Lib.Service.ServiceBase`2.BaseMtgUrl">
-            <summary>
-            The base URL to the MTG API.
-            </summary>
-        </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`2.#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.ServiceBase`1.#ctor(MtgApiManager.Lib.Core.IMtgApiServiceAdapter,MtgApiManager.Lib.Model.IModelMapper,MtgApiManager.Lib.Core.ApiVersion,MtgApiManager.Lib.Core.ApiEndPoint,System.Boolean)">
             <summary>
-            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.ServiceBase`2"/> class.
+            Initializes a new instance of the <see cref="T:MtgApiManager.Lib.Service.ServiceBase`1"/> 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>
         </member>
-        <member name="P:MtgApiManager.Lib.Service.ServiceBase`2.WhereQueries">
+        <member name="P:MtgApiManager.Lib.Service.ServiceBase`1.WhereQueries">
             <summary>
             Gets the list of where queries.
             </summary>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`2.AllAsync">
+        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.AllAsync">
             <summary>
-            Gets all the <see cref="!:TModel"/> defined by the query parameters.
+            Gets all the objects defined by the query parameters.
             </summary>
-            <returns>A <see cref="!:Exceptional&lt;List&lt;TModel&gt;&gt;"/> representing the result containing all the items.</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.ServiceBase`2.BuildUri(System.Collections.Generic.Dictionary{System.String,System.String})">
+        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.BuildUri(System.Collections.Generic.Dictionary{System.String,System.String})">
             <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>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`2.BuildUri(System.String)">
+        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.BuildUri(System.String)">
             <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>
         </member>
-        <member name="M:MtgApiManager.Lib.Service.ServiceBase`2.CallWebServiceGet``1(System.Uri)">
+        <member name="M:MtgApiManager.Lib.Service.ServiceBase`1.CallWebServiceGet``1(System.Uri)">
             <summary>
             Makes a GET call to the web service.
             </summary>
@@ -1110,14 +1106,15 @@
             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="!:TModel"/> 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="!:Exceptional&lt;List&lt;Set&gt;&gt;"/> representing the result containing all the items.</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.SetService.FindAsync(System.String)">
             <summary>
@@ -1131,7 +1128,7 @@
              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&lt;List&lt;Card&gt;&gt;"/> representing the result containing a <see cref="T:System.Collections.Generic.List`1"/> or an exception.</returns>
+            <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="M:MtgApiManager.Lib.Service.SetService.Where``1(System.Linq.Expressions.Expression{System.Func{MtgApiManager.Lib.Service.SetQueryParameter,``0}},``0)">
             <summary>
@@ -1165,7 +1162,7 @@
             </summary>
             <typeparam name="T">The type to look for the property in.</typeparam>
             <param name="propertyName">The name of the property to get the query parameter for.</param>
-            <returns>A <see cref="T:System.String"/> representing the query name defined in the <see cref="!:JsonProperty"/></returns>
+            <returns>A <see cref="T:System.String"/> representing the query name defined in the JSON property</returns>
         </member>
         <member name="T:MtgApiController">
             <summary>
diff --git a/src/MtgApiManager.Lib/Service/CardService.cs b/src/MtgApiManager.Lib/Service/CardService.cs
index b7b96ec..248c7e3 100644
--- a/src/MtgApiManager.Lib/Service/CardService.cs
+++ b/src/MtgApiManager.Lib/Service/CardService.cs
@@ -14,7 +14,7 @@ namespace MtgApiManager.Lib.Service
     /// Object representing a MTG card.
     /// </summary>
     public class CardService
-        : ServiceBase<CardService, Card>, IMtgQueryable<CardService, CardQueryParameter>
+        : ServiceBase<Card>, IMtgQueryable<CardService, CardQueryParameter>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CardService"/> class. Defaults to version 1.0 of the API.
@@ -28,6 +28,7 @@ public CardService()
         /// 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(
@@ -40,9 +41,9 @@ public CardService(
         }
 
         /// <summary>
-        /// Gets all the <see cref="TModel"/> defined by the query parameters.
+        /// Gets all the <see cref="Card"/> defined by the query parameters.
         /// </summary>
-        /// <returns>A <see cref="Exceptional{List{Card}}"/> representing the result containing all the items.</returns>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
         public async override Task<Exceptional<List<Card>>> AllAsync()
         {
             try
diff --git a/src/MtgApiManager.Lib/Service/ServiceBase.cs b/src/MtgApiManager.Lib/Service/ServiceBase.cs
index c082bdc..4ef859f 100644
--- a/src/MtgApiManager.Lib/Service/ServiceBase.cs
+++ b/src/MtgApiManager.Lib/Service/ServiceBase.cs
@@ -11,23 +11,19 @@ namespace MtgApiManager.Lib.Service
     /// <summary>
     /// Base class for a service.
     /// </summary>
-    /// <typeparam name="TService">The type of service.</typeparam>
     /// <typeparam name="TModel">The type of model used by the service.</typeparam>
-    public abstract class ServiceBase<TService, TModel>
-        where TService : class
+    public abstract class ServiceBase<TModel>
         where TModel : class
     {
-        /// <summary>
-        /// The base URL to the MTG API.
-        /// </summary>
-        protected const string BaseMtgUrl = "https://api.magicthegathering.io";
+        private const string BASE_URL = "https://api.magicthegathering.io";
 
         private readonly bool _isRateLimitOn;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBase{TService, TModel}"/> class.
+        /// 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>
@@ -47,7 +43,7 @@ protected ServiceBase(
         }
 
         protected IMtgApiServiceAdapter Adapter { get; }
-
+        protected string BaseMtgUrl => BASE_URL;
         protected ApiEndPoint EndPoint { get; }
 
         protected IModelMapper ModelMapper { get; }
@@ -60,9 +56,9 @@ protected ServiceBase(
         protected Dictionary<string, string> WhereQueries { get; }
 
         /// <summary>
-        /// Gets all the <see cref="TModel"/> defined by the query parameters.
+        /// Gets all the objects defined by the query parameters.
         /// </summary>
-        /// <returns>A <see cref="Exceptional{List{TModel}}"/> representing the result containing all the items.</returns>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
         public abstract Task<Exceptional<List<TModel>>> AllAsync();
 
         /// <summary>
diff --git a/src/MtgApiManager.Lib/Service/SetService.cs b/src/MtgApiManager.Lib/Service/SetService.cs
index c1faf39..dce3474 100644
--- a/src/MtgApiManager.Lib/Service/SetService.cs
+++ b/src/MtgApiManager.Lib/Service/SetService.cs
@@ -16,7 +16,7 @@ namespace MtgApiManager.Lib.Service
     /// Object representing a MTG set.
     /// </summary>
     public class SetService
-        : ServiceBase<SetService, Set>, IMtgQueryable<SetService, SetQueryParameter>
+        : ServiceBase<Set>, IMtgQueryable<SetService, SetQueryParameter>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SetService"/> class. Defaults to version 1.0 of the API.
@@ -30,6 +30,7 @@ public SetService()
         /// 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(
@@ -42,9 +43,9 @@ public SetService(
         }
 
         /// <summary>
-        /// Gets all the <see cref="TModel"/> defined by the query parameters.
+        /// Gets all the <see cref="Set"/> defined by the query parameters.
         /// </summary>
-        /// <returns>A <see cref="Exceptional{List{Set}}"/> representing the result containing all the items.</returns>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing all the items.</returns>
         public async override Task<Exceptional<List<Set>>> AllAsync()
         {
             try
@@ -83,7 +84,7 @@ public async Task<Exceptional<Set>> FindAsync(string code)
         ///  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{List{Card}}"/> representing the result containing a <see cref="List{Card}"/> or an exception.</returns>
+        /// <returns>A <see cref="Exceptional{T}"/> representing the result containing a <see cref="List{Card}"/> or an exception.</returns>
         public async Task<Exceptional<List<Card>>> GenerateBoosterAsync(string code)
         {
             try
diff --git a/src/MtgApiManager.Lib/Utility/QueryUtility.cs b/src/MtgApiManager.Lib/Utility/QueryUtility.cs
index 4f32c9b..902dba2 100644
--- a/src/MtgApiManager.Lib/Utility/QueryUtility.cs
+++ b/src/MtgApiManager.Lib/Utility/QueryUtility.cs
@@ -14,7 +14,7 @@ public static class QueryUtility
         /// </summary>
         /// <typeparam name="T">The type to look for the property in.</typeparam>
         /// <param name="propertyName">The name of the property to get the query parameter for.</param>
-        /// <returns>A <see cref="string"/> representing the query name defined in the <see cref="JsonProperty"/></returns>
+        /// <returns>A <see cref="string"/> representing the query name defined in the JSON property</returns>
         public static string GetQueryPropertyName<T>(string propertyName)
         {
             if (string.IsNullOrEmpty(propertyName))
diff --git a/src/MtgApiManager.sln b/src/MtgApiManager.sln
index f627154..98d02de 100644
--- a/src/MtgApiManager.sln
+++ b/src/MtgApiManager.sln
@@ -11,14 +11,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MtgApiManager.Lib.TestApp",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{E59A8693-3B65-4309-A1DB-36F8A1658876}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{71717EE0-3EB9-4509-8EA5-156B3CB7673D}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E59A8693-3B65-4309-A1DB-36F8A1658876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E59A8693-3B65-4309-A1DB-36F8A1658876}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{363A4B72-00F1-494C-9A0B-7BAFAC907C75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{363A4B72-00F1-494C-9A0B-7BAFAC907C75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{363A4B72-00F1-494C-9A0B-7BAFAC907C75}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,6 +34,8 @@ Global
 		{6C5F645B-CB4E-4460-9862-94CCFE52CF64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C5F645B-CB4E-4460-9862-94CCFE52CF64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C5F645B-CB4E-4460-9862-94CCFE52CF64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E59A8693-3B65-4309-A1DB-36F8A1658876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E59A8693-3B65-4309-A1DB-36F8A1658876}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE