diff --git a/ESI.NET/ESI.NET.csproj b/ESI.NET/ESI.NET.csproj
index cb1585f..42392cf 100644
--- a/ESI.NET/ESI.NET.csproj
+++ b/ESI.NET/ESI.NET.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netstandard2.0;net462;net47;net471;net472;net48;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;netcoreapp3.1;netstandard2.0;net8.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Version>2023.12.12</Version>
     <Authors>Psianna Archeia</Authors>
@@ -21,15 +21,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
diff --git a/ESI.NET/EsiClient.cs b/ESI.NET/EsiClient.cs
index 5b00fe4..b84e5e1 100644
--- a/ESI.NET/EsiClient.cs
+++ b/ESI.NET/EsiClient.cs
@@ -141,6 +141,7 @@ public void SetCharacterData(AuthorizedCharacterData data)
             Universe = new UniverseLogic(client, config, data);
         }
 
+        [Obsolete]
         public void SetIfNoneMatchHeader(string eTag)
             => EsiRequest.ETag = eTag;
     }
diff --git a/ESI.NET/EsiRequest.cs b/ESI.NET/EsiRequest.cs
index 73b7606..f68b700 100644
--- a/ESI.NET/EsiRequest.cs
+++ b/ESI.NET/EsiRequest.cs
@@ -4,6 +4,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace ESI.NET
@@ -12,7 +13,18 @@ internal static class EsiRequest
     {
         internal static string ETag;
 
-        public static async Task<EsiResponse<T>> Execute<T>(HttpClient client, EsiConfig config, RequestSecurity security, HttpMethod httpMethod, string endpoint, Dictionary<string, string> replacements = null, string[] parameters = null, object body = null, string token = null)
+        public static async Task<EsiResponse<T>> Execute<T>(
+            HttpClient client, 
+            EsiConfig config,
+            RequestSecurity security, 
+            HttpMethod httpMethod, 
+            string endpoint,
+            string eTag = null,
+            CancellationToken cancellationToken = default,
+            Dictionary<string, string> replacements = null,
+            string[] parameters = null,
+            object body = null,
+            string token = null)
         {
             var path = $"{httpMethod}|{endpoint}";
 
@@ -32,22 +44,24 @@ public static async Task<EsiResponse<T>> Execute<T>(HttpClient client, EsiConfig
             if (security == RequestSecurity.Authenticated)
             {
                 if (token == null)
-                    throw new ArgumentException("The request endpoint requires SSO authentication and a Token has not been provided.");
+                    throw new ArgumentException(
+                        "The request endpoint requires SSO authentication and a Token has not been provided.");
                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
-            if (ETag != null)
+            if (eTag != null || ETag != null)
             {
-                request.Headers.Add("If-None-Match", $"\"{ETag}\"");
+                request.Headers.Add("If-None-Match", $"\"{eTag ?? ETag}\"");
                 ETag = null;
             }
 
             //Serialize post body data
             if (body != null)
-                request.Content = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
+                request.Content =
+                    new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
 
             //Output final object
-            return new EsiResponse<T>(await client.SendAsync(request).ConfigureAwait(false), path);
+            return new EsiResponse<T>(await client.SendAsync(request, cancellationToken).ConfigureAwait(false), path);
         }
 
         public enum RequestSecurity
@@ -56,4 +70,4 @@ public enum RequestSecurity
             Authenticated
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ESI.NET/Logic/AllianceLogic.cs b/ESI.NET/Logic/AllianceLogic.cs
index 2433f17..b2e1467 100644
--- a/ESI.NET/Logic/AllianceLogic.cs
+++ b/ESI.NET/Logic/AllianceLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.Alliance;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -12,22 +13,32 @@ public class AllianceLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public AllianceLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public AllianceLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /alliances/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> All()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/alliances/");
+        public async Task<EsiResponse<int[]>> All(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/alliances/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /alliances/{alliance_id}/
         /// </summary>
         /// <param name="allianceId"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Alliance>> Information(int alliance_id)
-            => await Execute<Alliance>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/alliances/{alliance_id}/",
+        public async Task<EsiResponse<Alliance>> Information(int alliance_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Alliance>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/alliances/{alliance_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "alliance_id", alliance_id.ToString() }
@@ -38,8 +49,12 @@ public async Task<EsiResponse<Alliance>> Information(int alliance_id)
         /// </summary>
         /// <param name="alliance_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Corporations(int alliance_id)
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/alliances/{alliance_id}/corporations/",
+        public async Task<EsiResponse<int[]>> Corporations(int alliance_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/alliances/{alliance_id}/corporations/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "alliance_id", alliance_id.ToString() }
@@ -50,8 +65,12 @@ public async Task<EsiResponse<int[]>> Corporations(int alliance_id)
         /// </summary>
         /// <param name="alliance_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Images>> Icons(int alliance_id)
-            => await Execute<Images>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/alliances/{alliance_id}/icons/",
+        public async Task<EsiResponse<Images>> Icons(int alliance_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Images>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/alliances/{alliance_id}/icons/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "alliance_id", alliance_id.ToString() }
diff --git a/ESI.NET/Logic/AssetsLogic.cs b/ESI.NET/Logic/AssetsLogic.cs
index 7a3d86d..0bedda8 100644
--- a/ESI.NET/Logic/AssetsLogic.cs
+++ b/ESI.NET/Logic/AssetsLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -32,8 +33,12 @@ public AssetsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Item>>> ForCharacter(int page = 1)
-            => await Execute<List<Item>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/assets/",
+        public async Task<EsiResponse<List<Item>>> ForCharacter(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Item>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/assets/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -49,8 +54,11 @@ public async Task<EsiResponse<List<Item>>> ForCharacter(int page = 1)
         /// </summary>
         /// <param name="item_ids"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ItemLocation>>> LocationsForCharacter(List<long> item_ids)
-            => await Execute<List<ItemLocation>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/assets/locations/",
+        public async Task<EsiResponse<List<ItemLocation>>> LocationsForCharacter(List<long> item_ids,
+             CancellationToken cancellationToken = default)
+            => await Execute<List<ItemLocation>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/assets/locations/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -63,8 +71,11 @@ public async Task<EsiResponse<List<ItemLocation>>> LocationsForCharacter(List<lo
         /// </summary>
         /// <param name="item_ids"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ItemName>>> NamesForCharacter(List<long> item_ids)
-            => await Execute<List<ItemName>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/assets/names/",
+        public async Task<EsiResponse<List<ItemName>>> NamesForCharacter(List<long> item_ids,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ItemName>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/assets/names/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -78,8 +89,12 @@ public async Task<EsiResponse<List<ItemName>>> NamesForCharacter(List<long> item
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Item>>> ForCorporation(int page = 1)
-            => await Execute<List<Item>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/assets/",
+        public async Task<EsiResponse<List<Item>>> ForCorporation(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Item>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/assets/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -95,8 +110,11 @@ public async Task<EsiResponse<List<Item>>> ForCorporation(int page = 1)
         /// </summary>
         /// <param name="item_ids"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ItemLocation>>> LocationsForCorporation(List<long> item_ids)
-            => await Execute<List<ItemLocation>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/corporations/{corporation_id}/assets/locations/",
+        public async Task<EsiResponse<List<ItemLocation>>> LocationsForCorporation(List<long> item_ids,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ItemLocation>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/corporations/{corporation_id}/assets/locations/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -109,8 +127,10 @@ public async Task<EsiResponse<List<ItemLocation>>> LocationsForCorporation(List<
         /// </summary>
         /// <param name="item_ids"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ItemName>>> NamesForCorporation(List<long> item_ids)
-            => await Execute<List<ItemName>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/corporations/{corporation_id}/assets/names/",
+        public async Task<EsiResponse<List<ItemName>>> NamesForCorporation(List<long> item_ids, CancellationToken cancellationToken = default)
+            => await Execute<List<ItemName>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/corporations/{corporation_id}/assets/names/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
diff --git a/ESI.NET/Logic/BookmarksLogic.cs b/ESI.NET/Logic/BookmarksLogic.cs
index 3c5089a..42c95af 100644
--- a/ESI.NET/Logic/BookmarksLogic.cs
+++ b/ESI.NET/Logic/BookmarksLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -14,7 +15,9 @@ public class BookmarksLogic
         private readonly AuthorizedCharacterData _data;
         private readonly int character_id, corporation_id;
 
-        public BookmarksLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData data = null)
+        public BookmarksLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData data = null,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
         {
             _client = client;
             _config = config;
@@ -31,8 +34,12 @@ public BookmarksLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDa
         /// /characters/{character_id}/bookmarks/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Bookmark>>> ForCharacter(int page = 1)
-            => await Execute<List<Bookmark>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/bookmarks/",
+        public async Task<EsiResponse<List<Bookmark>>> ForCharacter(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Bookmark>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/bookmarks/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -47,8 +54,12 @@ public async Task<EsiResponse<List<Bookmark>>> ForCharacter(int page = 1)
         /// /characters/{character_id}/bookmarks/folders/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Folder>>> FoldersForCharacter(int page = 1)
-            => await Execute<List<Folder>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/bookmarks/folders/",
+        public async Task<EsiResponse<List<Folder>>> FoldersForCharacter(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Folder>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/bookmarks/folders/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -63,8 +74,12 @@ public async Task<EsiResponse<List<Folder>>> FoldersForCharacter(int page = 1)
         /// /corporations/{corporation_id}/bookmarks/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Bookmark>>> ForCorporation(int page = 1)
-            => await Execute<List<Bookmark>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/bookmarks/",
+        public async Task<EsiResponse<List<Bookmark>>> ForCorporation(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Bookmark>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/bookmarks/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -79,8 +94,12 @@ public async Task<EsiResponse<List<Bookmark>>> ForCorporation(int page = 1)
         /// /corporations/{corporation_id}/bookmarks/folders/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Folder>>> FoldersForCorporation(int page = 1)
-            => await Execute<List<Folder>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/bookmarks/folders/",
+        public async Task<EsiResponse<List<Folder>>> FoldersForCorporation(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Folder>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/bookmarks/folders/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
diff --git a/ESI.NET/Logic/CalendarLogic.cs b/ESI.NET/Logic/CalendarLogic.cs
index 18da2b6..83db6a7 100644
--- a/ESI.NET/Logic/CalendarLogic.cs
+++ b/ESI.NET/Logic/CalendarLogic.cs
@@ -3,6 +3,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -29,8 +30,12 @@ public CalendarLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDat
         /// /characters/{character_id}/calendar/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<CalendarItem>>> Events()
-            => await Execute<List<CalendarItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/calendar/",
+        public async Task<EsiResponse<List<CalendarItem>>> Events(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<CalendarItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/calendar/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -42,8 +47,12 @@ public async Task<EsiResponse<List<CalendarItem>>> Events()
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Event>> Event(int event_id)
-            => await Execute<Event>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/calendar/{event_id}/",
+        public async Task<EsiResponse<Event>> Event(int event_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Event>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/calendar/{event_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -57,8 +66,11 @@ public async Task<EsiResponse<Event>> Event(int event_id)
         /// <param name="event_id"></param>
         /// <param name="response"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Event>> Respond(int event_id, EventResponse eventResponse)
-            => await Execute<Event>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/characters/{character_id}/calendar/{event_id}/",
+        public async Task<EsiResponse<Event>> Respond(int event_id, EventResponse eventResponse,
+            CancellationToken cancellationToken = default)
+            => await Execute<Event>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/characters/{character_id}/calendar/{event_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -75,8 +87,12 @@ public async Task<EsiResponse<Event>> Respond(int event_id, EventResponse eventR
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Response>>> Responses(int event_id)
-            => await Execute<List<Response>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/calendar/{event_id}/attendees/",
+        public async Task<EsiResponse<List<Response>>> Responses(int event_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Response>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/calendar/{event_id}/attendees/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
diff --git a/ESI.NET/Logic/CharacterLogic.cs b/ESI.NET/Logic/CharacterLogic.cs
index 965ae03..eeb017a 100644
--- a/ESI.NET/Logic/CharacterLogic.cs
+++ b/ESI.NET/Logic/CharacterLogic.cs
@@ -3,6 +3,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -30,8 +31,11 @@ public CharacterLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDa
         /// </summary>
         /// <param name="characterIds">dynamic = long</param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Affiliation>>> Affiliation(int[] character_ids)
-            => await Execute<List<Affiliation>>(_client, _config, RequestSecurity.Public, HttpMethod.Post, "/characters/affiliation/",
+        public async Task<EsiResponse<List<Affiliation>>> Affiliation(int[] character_ids,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Affiliation>>(_client, _config, RequestSecurity.Public, HttpMethod.Post,
+                "/characters/affiliation/",
+                cancellationToken: cancellationToken,
                 body: character_ids);
 
         /// <summary>
@@ -39,8 +43,12 @@ public async Task<EsiResponse<List<Affiliation>>> Affiliation(int[] character_id
         /// </summary>
         /// <param name="characterIds"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Character>>> Names(int[] character_ids)
-            => await Execute<List<Character>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/characters/names/",
+        public async Task<EsiResponse<List<Character>>> Names(int[] character_ids, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Character>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/characters/names/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"character_ids={string.Join(",", character_ids)}"
@@ -51,8 +59,12 @@ public async Task<EsiResponse<List<Character>>> Names(int[] character_ids)
         /// </summary>
         /// <param name="character_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Information>> Information(int character_id)
-            => await Execute<Information>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/characters/{character_id}/",
+        public async Task<EsiResponse<Information>> Information(int character_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Information>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/characters/{character_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -62,8 +74,12 @@ public async Task<EsiResponse<Information>> Information(int character_id)
         /// /characters/{character_id}/agents_research/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Agent>>> AgentsResearch()
-            => await Execute<List<Agent>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/agents_research/",
+        public async Task<EsiResponse<List<Agent>>> AgentsResearch(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Agent>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/agents_research/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -75,8 +91,12 @@ public async Task<EsiResponse<List<Agent>>> AgentsResearch()
         /// </summary>
         /// <param name="page">Which page of results to return</param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Blueprint>>> Blueprints(int page = 1)
-            => await Execute<List<Blueprint>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/blueprints/",
+        public async Task<EsiResponse<List<Blueprint>>> Blueprints(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Blueprint>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/blueprints/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -91,8 +111,12 @@ public async Task<EsiResponse<List<Blueprint>>> Blueprints(int page = 1)
         /// /characters/{character_id}/chat_channels/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ChatChannel>>> ChatChannels()
-            => await Execute<List<ChatChannel>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/chat_channels/",
+        public async Task<EsiResponse<List<ChatChannel>>> ChatChannels(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ChatChannel>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/chat_channels/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -104,8 +128,12 @@ public async Task<EsiResponse<List<ChatChannel>>> ChatChannels()
         /// </summary>
         /// <param name="character_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<CorporationHistory>>> CorporationHistory(int character_id)
-            => await Execute<List<CorporationHistory>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/characters/{character_id}/corporationhistory/",
+        public async Task<EsiResponse<List<CorporationHistory>>> CorporationHistory(int character_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<CorporationHistory>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/characters/{character_id}/corporationhistory/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -116,8 +144,10 @@ public async Task<EsiResponse<List<CorporationHistory>>> CorporationHistory(int
         /// </summary>
         /// <param name="character_ids">The target characters to calculate the charge for</param>
         /// <returns></returns>
-        public async Task<EsiResponse<decimal>> CSPA(object character_ids)
-            => await Execute<decimal>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/cspa/",
+        public async Task<EsiResponse<decimal>> CSPA(object character_ids, CancellationToken cancellationToken = default)
+            => await Execute<decimal>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/cspa/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -129,8 +159,12 @@ public async Task<EsiResponse<decimal>> CSPA(object character_ids)
         /// /characters/{character_id}/fatigue/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Fatigue>> Fatigue()
-            => await Execute<Fatigue>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/fatigue/",
+        public async Task<EsiResponse<Fatigue>> Fatigue(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Fatigue>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/fatigue/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -141,8 +175,12 @@ public async Task<EsiResponse<Fatigue>> Fatigue()
         /// /characters/{character_id}/medals/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Medal>>> Medals()
-            => await Execute<List<Medal>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/medals/",
+        public async Task<EsiResponse<List<Medal>>> Medals(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Medal>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/medals/",
+                eTag: eTag,
+                cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -153,8 +191,12 @@ public async Task<EsiResponse<List<Medal>>> Medals()
         /// /characters/{character_id}/notifications/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Notification>>> Notifications()
-            => await Execute<List<Notification>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/notifications/",
+        public async Task<EsiResponse<List<Notification>>> Notifications(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Notification>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/notifications/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -166,7 +208,8 @@ public async Task<EsiResponse<List<Notification>>> Notifications()
         /// </summary>
         /// <returns></returns>
         public async Task<EsiResponse<List<ContactNotification>>> ContactNotifications()
-            => await Execute<List<ContactNotification>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/notifications/contacts/",
+            => await Execute<List<ContactNotification>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/notifications/contacts/",
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -179,7 +222,8 @@ public async Task<EsiResponse<List<ContactNotification>>> ContactNotifications()
         /// <param name="character_id"></param>
         /// <returns></returns>
         public async Task<EsiResponse<Images>> Portrait(int character_id)
-            => await Execute<Images>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/characters/{character_id}/portrait/",
+            => await Execute<Images>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/characters/{character_id}/portrait/",
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -190,7 +234,8 @@ public async Task<EsiResponse<Images>> Portrait(int character_id)
         /// </summary>
         /// <returns></returns>
         public async Task<EsiResponse<Roles>> Roles()
-            => await Execute<Roles>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/roles/",
+            => await Execute<Roles>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/roles/",
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -202,7 +247,8 @@ public async Task<EsiResponse<Roles>> Roles()
         /// </summary>
         /// <returns></returns>
         public async Task<EsiResponse<List<Standing>>> Standings()
-            => await Execute<List<Standing>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/standings/",
+            => await Execute<List<Standing>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/standings/",
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -214,7 +260,8 @@ public async Task<EsiResponse<List<Standing>>> Standings()
         /// </summary>
         /// <returns></returns>
         public async Task<EsiResponse<List<Title>>> Titles()
-            => await Execute<List<Title>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/titles/",
+            => await Execute<List<Title>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/titles/",
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/ClonesLogic.cs b/ESI.NET/Logic/ClonesLogic.cs
index a03e7c4..e453cc4 100644
--- a/ESI.NET/Logic/ClonesLogic.cs
+++ b/ESI.NET/Logic/ClonesLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -28,8 +29,12 @@ public ClonesLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// /characters/{character_id}/clones/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Clones>> List()
-            => await Execute<Clones>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/clones/",
+        public async Task<EsiResponse<Clones>> List(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Clones>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/clones/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -40,8 +45,12 @@ public async Task<EsiResponse<Clones>> List()
         /// /characters/{character_id}/implants/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Implants()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/implants/",
+        public async Task<EsiResponse<int[]>> Implants(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/implants/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/ContactsLogic.cs b/ESI.NET/Logic/ContactsLogic.cs
index 55a25a7..52d3757 100644
--- a/ESI.NET/Logic/ContactsLogic.cs
+++ b/ESI.NET/Logic/ContactsLogic.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -35,8 +36,12 @@ public ContactsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDat
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Contact>>> ListForCharacter(int page = 1)
-            => await Execute<List<Contact>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/contacts/",
+        public async Task<EsiResponse<List<Contact>>> ListForCharacter(int page = 1,
+            string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<Contact>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/contacts/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -52,8 +57,12 @@ public async Task<EsiResponse<List<Contact>>> ListForCharacter(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Contact>>> ListForCorporation(int page = 1)
-            => await Execute<List<Contact>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/contacts/",
+        public async Task<EsiResponse<List<Contact>>> ListForCorporation(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Contact>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/contacts/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -69,8 +78,12 @@ public async Task<EsiResponse<List<Contact>>> ListForCorporation(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Contact>>> ListForAlliance(int page = 1)
-            => await Execute<List<Contact>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/alliances/{alliance_id}/contacts/",
+        public async Task<EsiResponse<List<Contact>>> ListForAlliance(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Contact>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/alliances/{alliance_id}/contacts/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "alliance_id", alliance_id.ToString() }
@@ -89,7 +102,8 @@ public async Task<EsiResponse<List<Contact>>> ListForAlliance(int page = 1)
         /// <param name="label_ids"></param>
         /// <param name="watched"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Add(int[] contact_ids, decimal standing, int[] label_ids = null, bool? watched = null)
+        public async Task<EsiResponse<int[]>> Add(int[] contact_ids, decimal standing, int[] label_ids = null,
+            bool? watched = null,CancellationToken cancellationToken = default)
         {
             var body = contact_ids;
 
@@ -101,7 +115,9 @@ public async Task<EsiResponse<int[]>> Add(int[] contact_ids, decimal standing, i
             if (watched != null)
                 parameters.Add($"watched={watched}");
 
-            return await Execute<int[]>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/contacts/",
+            return await Execute<int[]>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/contacts/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -119,7 +135,8 @@ public async Task<EsiResponse<int[]>> Add(int[] contact_ids, decimal standing, i
         /// <param name="label_id"></param>
         /// <param name="watched"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> Update(int[] contact_ids, decimal standing, int[] label_ids = null, bool? watched = null)
+        public async Task<EsiResponse<string>> Update(int[] contact_ids, decimal standing, int[] label_ids = null,
+            bool? watched = null, CancellationToken cancellationToken = default)
         {
             var body = contact_ids;
 
@@ -131,7 +148,9 @@ public async Task<EsiResponse<string>> Update(int[] contact_ids, decimal standin
             if (watched != null)
                 parameters.Add($"watched={watched}");
 
-            return await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/characters/{character_id}/contacts/",
+            return await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/characters/{character_id}/contacts/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -146,8 +165,10 @@ public async Task<EsiResponse<string>> Update(int[] contact_ids, decimal standin
         /// </summary>
         /// <param name="contact_ids"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> Delete(int[] contact_ids)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/characters/{character_id}/contacts/",
+        public async Task<EsiResponse<string>> Delete(int[] contact_ids, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/characters/{character_id}/contacts/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -162,8 +183,12 @@ public async Task<EsiResponse<string>> Delete(int[] contact_ids)
         /// /characters/{character_id}/contacts/labels/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Label>>> LabelsForCharacter()
-            => await Execute<List<Label>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/contacts/labels/",
+        public async Task<EsiResponse<List<Label>>> LabelsForCharacter(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Label>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/contacts/labels/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -174,8 +199,12 @@ public async Task<EsiResponse<List<Label>>> LabelsForCharacter()
         /// /corporations/{corporation_id}/contacts/labels/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Label>>> LabelsForCorporation()
-            => await Execute<List<Label>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/contacts/labels/",
+        public async Task<EsiResponse<List<Label>>> LabelsForCorporation(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Label>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/contacts/labels/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -187,7 +216,8 @@ public async Task<EsiResponse<List<Label>>> LabelsForCorporation()
         /// </summary>
         /// <returns></returns>
         public async Task<EsiResponse<List<Label>>> LabelsForAlliance()
-            => await Execute<List<Label>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/alliances/{alliance_id}/contacts/labels/",
+            => await Execute<List<Label>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/alliances/{alliance_id}/contacts/labels/",
                 replacements: new Dictionary<string, string>()
                 {
                     { "alliance_id", alliance_id.ToString() }
diff --git a/ESI.NET/Logic/ContractsLogic.cs b/ESI.NET/Logic/ContractsLogic.cs
index a83c643..3db04d7 100644
--- a/ESI.NET/Logic/ContractsLogic.cs
+++ b/ESI.NET/Logic/ContractsLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -32,8 +33,12 @@ public ContractsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDa
         /// </summary>
         /// <param name="region_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Contract>>> Contracts(int region_id, int page = 1)
-            => await Execute<List<Contract>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/contracts/public/{region_id}/",
+        public async Task<EsiResponse<List<Contract>>> Contracts(int region_id, int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Contract>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/contracts/public/{region_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "region_id", region_id.ToString() }
@@ -48,8 +53,13 @@ public async Task<EsiResponse<List<Contract>>> Contracts(int region_id, int page
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ContractItem>>> ContractItems(int contract_id, int page = 1)
-            => await Execute<List<ContractItem>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/contracts/public/items/{contract_id}/",
+        public async Task<EsiResponse<List<ContractItem>>> ContractItems(int contract_id, int page = 1,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ContractItem>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/contracts/public/items/{contract_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "contract_id", contract_id.ToString() }
@@ -64,8 +74,12 @@ public async Task<EsiResponse<List<ContractItem>>> ContractItems(int contract_id
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Bid>>> ContractBids(int contract_id, int page = 1)
-            => await Execute<List<Bid>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/contracts/public/bids/{contract_id}/",
+        public async Task<EsiResponse<List<Bid>>> ContractBids(int contract_id, int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Bid>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/contracts/public/bids/{contract_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "contract_id", contract_id.ToString() }
@@ -79,8 +93,12 @@ public async Task<EsiResponse<List<Bid>>> ContractBids(int contract_id, int page
         /// /characters/{character_id}/contracts/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Contract>>> CharacterContracts(int page = 1)
-            => await Execute<List<Contract>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/contracts/",
+        public async Task<EsiResponse<List<Contract>>> CharacterContracts(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Contract>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/contracts/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -96,8 +114,12 @@ public async Task<EsiResponse<List<Contract>>> CharacterContracts(int page = 1)
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ContractItem>>> CharacterContractItems(int contract_id, int page = 1)
-            => await Execute<List<ContractItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/contracts/{contract_id}/items/",
+        public async Task<EsiResponse<List<ContractItem>>> CharacterContractItems(int contract_id, int page = 1,
+            string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<ContractItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/contracts/{contract_id}/items/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -114,8 +136,12 @@ public async Task<EsiResponse<List<ContractItem>>> CharacterContractItems(int co
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Bid>>> CharacterContractBids(int contract_id, int page = 1)
-            => await Execute<List<Bid>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/contracts/{contract_id}/bids/",
+        public async Task<EsiResponse<List<Bid>>> CharacterContractBids(int contract_id, int page = 1,
+            string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<Bid>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/contracts/{contract_id}/bids/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -131,8 +157,12 @@ public async Task<EsiResponse<List<Bid>>> CharacterContractBids(int contract_id,
         /// /corporations/{corporation_id}/contracts/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Contract>>> CorporationContracts(int page = 1)
-            => await Execute<List<Contract>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/contracts/",
+        public async Task<EsiResponse<List<Contract>>> CorporationContracts(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Contract>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/contracts/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -148,8 +178,13 @@ public async Task<EsiResponse<List<Contract>>> CorporationContracts(int page = 1
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ContractItem>>> CorporationContractItems(int contract_id, int page = 1)
-            => await Execute<List<ContractItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/contracts/{contract_id}/items/",
+        public async Task<EsiResponse<List<ContractItem>>> CorporationContractItems(int contract_id, int page = 1,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ContractItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/contracts/{contract_id}/items/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() },
@@ -166,8 +201,12 @@ public async Task<EsiResponse<List<ContractItem>>> CorporationContractItems(int
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Bid>>> CorporationContractBids(int contract_id, int page = 1)
-            => await Execute<List<Bid>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/contracts/{contract_id}/bids/",
+        public async Task<EsiResponse<List<Bid>>> CorporationContractBids(int contract_id, int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Bid>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/contracts/{contract_id}/bids/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() },
diff --git a/ESI.NET/Logic/CorporationLogic.cs b/ESI.NET/Logic/CorporationLogic.cs
index ec08b91..514362a 100644
--- a/ESI.NET/Logic/CorporationLogic.cs
+++ b/ESI.NET/Logic/CorporationLogic.cs
@@ -3,6 +3,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -29,16 +30,24 @@ public CorporationLogic(HttpClient client, EsiConfig config, AuthorizedCharacter
         /// /corporations/npccorps/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> NpcCorps()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/corporations/npccorps/");
+        public async Task<EsiResponse<int[]>> NpcCorps(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/corporations/npccorps/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /corporations/{corporation_id}/
         /// </summary>
         /// <param name="corporation_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Corporation>> Information(int corporation_id)
-            => await Execute<Corporation>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/corporations/{corporation_id}/",
+        public async Task<EsiResponse<Corporation>> Information(int corporation_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Corporation>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/corporations/{corporation_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -49,8 +58,12 @@ public async Task<EsiResponse<Corporation>> Information(int corporation_id)
         /// </summary>
         /// <param name="corporation_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<AllianceHistory>>> AllianceHistory(int corporation_id)
-            => await Execute<List<AllianceHistory>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/corporations/{corporation_id}/alliancehistory/",
+        public async Task<EsiResponse<List<AllianceHistory>>> AllianceHistory(int corporation_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<AllianceHistory>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/corporations/{corporation_id}/alliancehistory/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -61,8 +74,12 @@ public async Task<EsiResponse<List<AllianceHistory>>> AllianceHistory(int corpor
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Blueprint>>> Blueprints(int page = 1)
-            => await Execute<List<Blueprint>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/blueprints/",
+        public async Task<EsiResponse<List<Blueprint>>> Blueprints(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Blueprint>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/blueprints/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -78,8 +95,12 @@ public async Task<EsiResponse<List<Blueprint>>> Blueprints(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ContainerLog>>> ContainerLogs(int page = 1)
-            => await Execute<List<ContainerLog>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/containers/logs/",
+        public async Task<EsiResponse<List<ContainerLog>>> ContainerLogs(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ContainerLog>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/containers/logs/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -94,8 +115,12 @@ public async Task<EsiResponse<List<ContainerLog>>> ContainerLogs(int page = 1)
         /// /corporations/{corporation_id}/divisions/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Divisions>> Divisions()
-            => await Execute<Divisions>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/divisions/",
+        public async Task<EsiResponse<Divisions>> Divisions(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Divisions>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/divisions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -106,8 +131,12 @@ public async Task<EsiResponse<Divisions>> Divisions()
         /// /corporations/{corporation_id}/facilities/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Facility>>> Facilities()
-            => await Execute<List<Facility>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/facilities/",
+        public async Task<EsiResponse<List<Facility>>> Facilities(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Facility>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/facilities/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -119,8 +148,12 @@ public async Task<EsiResponse<List<Facility>>> Facilities()
         /// </summary>
         /// <param name="corporationId"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Images>> Icons(int corporation_id)
-            => await Execute<Images>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/corporations/{corporation_id}/icons/",
+        public async Task<EsiResponse<Images>> Icons(int corporation_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Images>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/corporations/{corporation_id}/icons/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -131,8 +164,12 @@ public async Task<EsiResponse<Images>> Icons(int corporation_id)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Medal>>> Medals(int page = 1)
-            => await Execute<List<Medal>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/medals/",
+        public async Task<EsiResponse<List<Medal>>> Medals(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Medal>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/medals/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -147,8 +184,12 @@ public async Task<EsiResponse<List<Medal>>> Medals(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<IssuedMedal>>> MedalsIssued(int page = 1)
-            => await Execute<List<IssuedMedal>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/medals/issued/",
+        public async Task<EsiResponse<List<IssuedMedal>>> MedalsIssued(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<IssuedMedal>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/medals/issued/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -163,8 +204,12 @@ public async Task<EsiResponse<List<IssuedMedal>>> MedalsIssued(int page = 1)
         /// /corporations/{corporation_id}/members/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Members()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/members/",
+        public async Task<EsiResponse<int[]>> Members(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/members/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -175,8 +220,12 @@ public async Task<EsiResponse<int[]>> Members()
         /// /corporations/{corporation_id}/members/limit/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int>> MemberLimit()
-            => await Execute<int>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/members/limit/",
+        public async Task<EsiResponse<int>> MemberLimit(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/members/limit/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -187,8 +236,12 @@ public async Task<EsiResponse<int>> MemberLimit()
         /// /corporations/{corporation_id}/members/titles/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<MemberTitles>>> MemberTitles()
-            => await Execute<List<MemberTitles>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/members/titles/",
+        public async Task<EsiResponse<List<MemberTitles>>> MemberTitles(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<MemberTitles>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/members/titles/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -199,8 +252,12 @@ public async Task<EsiResponse<List<MemberTitles>>> MemberTitles()
         /// /corporations/{corporation_id}/membertracking/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<MemberInfo>>> MemberTracking()
-            => await Execute<List<MemberInfo>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/membertracking/",
+        public async Task<EsiResponse<List<MemberInfo>>> MemberTracking(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<MemberInfo>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/membertracking/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -211,8 +268,12 @@ public async Task<EsiResponse<List<MemberInfo>>> MemberTracking()
         /// /corporations/{corporation_id}/roles/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<CharacterRoles>>> Roles()
-            => await Execute<List<CharacterRoles>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/roles/",
+        public async Task<EsiResponse<List<CharacterRoles>>> Roles(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<CharacterRoles>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/roles/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -223,8 +284,12 @@ public async Task<EsiResponse<List<CharacterRoles>>> Roles()
         /// /corporations/{corporation_id}/roles/history/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<CharacterRolesHistory>>> RolesHistory()
-            => await Execute<List<CharacterRolesHistory>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/roles/history/",
+        public async Task<EsiResponse<List<CharacterRolesHistory>>> RolesHistory(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<CharacterRolesHistory>>(_client, _config, RequestSecurity.Authenticated,
+                HttpMethod.Get, "/corporations/{corporation_id}/roles/history/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -236,8 +301,12 @@ public async Task<EsiResponse<List<CharacterRolesHistory>>> RolesHistory()
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Shareholder>>> Shareholders(int page = 1)
-            => await Execute<List<Shareholder>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/shareholders/",
+        public async Task<EsiResponse<List<Shareholder>>> Shareholders(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Shareholder>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/shareholders/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -252,8 +321,12 @@ public async Task<EsiResponse<List<Shareholder>>> Shareholders(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Standing>> Standings(int page = 1)
-            => await Execute<Standing>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/standings/",
+        public async Task<EsiResponse<Standing>> Standings(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Standing>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/standings/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -269,8 +342,12 @@ public async Task<EsiResponse<Standing>> Standings(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Starbase>>> Starbases(int page = 1)
-            => await Execute<List<Starbase>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/starbases/",
+        public async Task<EsiResponse<List<Starbase>>> Starbases(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Starbase>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/starbases/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -287,8 +364,12 @@ public async Task<EsiResponse<List<Starbase>>> Starbases(int page = 1)
         /// <param name="starbase_id"></param>
         /// <param name="system_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<StarbaseInfo>> Starbase(long starbase_id, int system_id)
-            => await Execute<StarbaseInfo>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/starbases/{starbase_id}/",
+        public async Task<EsiResponse<StarbaseInfo>> Starbase(long starbase_id, int system_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<StarbaseInfo>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/starbases/{starbase_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() },
@@ -304,8 +385,12 @@ public async Task<EsiResponse<StarbaseInfo>> Starbase(long starbase_id, int syst
         /// /corporations/{corporation_id}/structures/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Structure>>> Structures(int page = 1)
-            => await Execute<List<Structure>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/structures/",
+        public async Task<EsiResponse<List<Structure>>> Structures(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Structure>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/structures/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -320,8 +405,12 @@ public async Task<EsiResponse<List<Structure>>> Structures(int page = 1)
         /// /corporations/{corporation_id}/titles/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Title>>> Titles()
-            => await Execute<List<Title>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/titles/",
+        public async Task<EsiResponse<List<Title>>> Titles(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Title>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/titles/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
diff --git a/ESI.NET/Logic/DogmaLogic.cs b/ESI.NET/Logic/DogmaLogic.cs
index 71f7869..27c8c66 100644
--- a/ESI.NET/Logic/DogmaLogic.cs
+++ b/ESI.NET/Logic/DogmaLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Models.Dogma;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -11,41 +12,60 @@ public class DogmaLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public DogmaLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public DogmaLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /dogma/attributes/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Attributes()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/attributes/");
+        public async Task<EsiResponse<int[]>> Attributes(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/attributes/",
+                eTag: eTag, cancellationToken: cancellationToken);
 
         /// <summary>
         /// /dogma/attributes/{attribute_id}/
         /// </summary>
         /// <param name="attribute_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Attribute>> Attribute(int attribute_id)
-            => await Execute<Attribute>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/attributes/{attribute_id}/",
+        public async Task<EsiResponse<Attribute>> Attribute(int attribute_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Attribute>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/dogma/attributes/{attribute_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
-                    { "attribute_id", attribute_id.ToString() }
+                    {
+                        "attribute_id", attribute_id.ToString()
+                    }
                 });
 
         /// <summary>
         /// /dogma/effects/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Effects()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/effects/");
+        public async Task<EsiResponse<int[]>> Effects(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/effects/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /dogma/effects/{effect_id}/
         /// </summary>
         /// <param name="effect_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Effect>> Effect(int effect_id)
-            => await Execute<Effect>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/effects/{effect_id}/",
+        public async Task<EsiResponse<Effect>> Effect(int effect_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Effect>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/dogma/effects/{effect_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "effect_id", effect_id.ToString() }
@@ -57,8 +77,12 @@ public async Task<EsiResponse<Effect>> Effect(int effect_id)
         /// <param name="type_id"></param>
         /// <param name="item_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Effect>> DynamicItem(int type_id, long item_id)
-            => await Execute<Effect>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/dogma/dynamic/items/{type_id}/{item_id}/",
+        public async Task<EsiResponse<Effect>> DynamicItem(int type_id, long item_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Effect>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/dogma/dynamic/items/{type_id}/{item_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "type_id", type_id.ToString() },
diff --git a/ESI.NET/Logic/FactionWarfareLogic.cs b/ESI.NET/Logic/FactionWarfareLogic.cs
index 8d0b15b..dec9fa6 100644
--- a/ESI.NET/Logic/FactionWarfareLogic.cs
+++ b/ESI.NET/Logic/FactionWarfareLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -31,50 +32,76 @@ public FactionWarfareLogic(HttpClient client, EsiConfig config, AuthorizedCharac
         /// /fw/wars/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<War>>> List()
-            => await Execute<List<War>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/wars/");
+        public async Task<EsiResponse<List<War>>> List(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<War>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/wars/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /fw/stats/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Stat>>> Stats()
-            => await Execute<List<Stat>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/stats/");
+        public async Task<EsiResponse<List<Stat>>> Stats(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Stat>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/stats/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /fw/systems/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<FactionWarfareSystem>>> Systems()
-            => await Execute<List<FactionWarfareSystem>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/systems/");
+        public async Task<EsiResponse<List<FactionWarfareSystem>>> Systems(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<FactionWarfareSystem>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/fw/systems/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// fw/leaderboards/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Leaderboards<FactionTotal>>> Leaderboads()
-            => await Execute<Leaderboards<FactionTotal>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/leaderboards/");
+        public async Task<EsiResponse<Leaderboards<FactionTotal>>> Leaderboads(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Leaderboards<FactionTotal>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/fw/leaderboards/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /fw/leaderboards/corporations/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Leaderboards<CorporationTotal>>> LeaderboardsForCorporations()
-            => await Execute<Leaderboards<CorporationTotal>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/leaderboards/corporations/");
+        public async Task<EsiResponse<Leaderboards<CorporationTotal>>> LeaderboardsForCorporations(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Leaderboards<CorporationTotal>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/fw/leaderboards/corporations/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /fw/leaderboards/characters/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Leaderboards<CharacterTotal>>> LeaderboardsForCharacters()
-            => await Execute<Leaderboards<CharacterTotal>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/fw/leaderboards/characters/");
+        public async Task<EsiResponse<Leaderboards<CharacterTotal>>> LeaderboardsForCharacters(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Leaderboards<CharacterTotal>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/fw/leaderboards/characters/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /corporations/{corporation_id}/fw/stats/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Stat>> StatsForCorporation()
-            => await Execute<Stat>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/fw/stats/",
+        public async Task<EsiResponse<Stat>> StatsForCorporation(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Stat>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/fw/stats/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -85,8 +112,12 @@ public async Task<EsiResponse<Stat>> StatsForCorporation()
         /// /characters/{character_id}/fw/stats/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Stat>> StatsForCharacter()
-            => await Execute<Stat>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/fw/stats/",
+        public async Task<EsiResponse<Stat>> StatsForCharacter(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Stat>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/fw/stats/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/FittingsLogic.cs b/ESI.NET/Logic/FittingsLogic.cs
index 5e8a510..f708ff1 100644
--- a/ESI.NET/Logic/FittingsLogic.cs
+++ b/ESI.NET/Logic/FittingsLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -28,8 +29,12 @@ public FittingsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDat
         /// /characters/{character_id}/fittings/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Fitting>>> List()
-            => await Execute<List<Fitting>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/fittings/",
+        public async Task<EsiResponse<List<Fitting>>> List(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Fitting>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/fittings/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -41,8 +46,10 @@ public async Task<EsiResponse<List<Fitting>>> List()
         /// </summary>
         /// <param name="fitting"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<NewFitting>> Add(object fitting)
-            => await Execute<NewFitting>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/fittings/",
+        public async Task<EsiResponse<NewFitting>> Add(object fitting, CancellationToken cancellationToken = default)
+            => await Execute<NewFitting>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/fittings/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -55,8 +62,10 @@ public async Task<EsiResponse<NewFitting>> Add(object fitting)
         /// </summary>
         /// <param name="fitting_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> Delete(int fitting_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/characters/{character_id}/fittings/{fitting_id}/",
+        public async Task<EsiResponse<string>> Delete(int fitting_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/characters/{character_id}/fittings/{fitting_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
diff --git a/ESI.NET/Logic/FleetsLogic.cs b/ESI.NET/Logic/FleetsLogic.cs
index d316265..368ec7e 100644
--- a/ESI.NET/Logic/FleetsLogic.cs
+++ b/ESI.NET/Logic/FleetsLogic.cs
@@ -3,6 +3,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -30,8 +31,12 @@ public FleetsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// </summary>
         /// <param name="fleet_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Settings>> Settings(long fleet_id)
-            => await Execute<Settings>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/fleets/{fleet_id}/",
+        public async Task<EsiResponse<Settings>> Settings(long fleet_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Settings>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/fleets/{fleet_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() }
@@ -45,8 +50,11 @@ public async Task<EsiResponse<Settings>> Settings(long fleet_id)
         /// <param name="motd"></param>
         /// <param name="is_free_move"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> UpdateSettings(long fleet_id, string motd = null, bool? is_free_move = null)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/fleets/{fleet_id}/",
+        public async Task<EsiResponse<string>> UpdateSettings(long fleet_id, string motd = null,
+            bool? is_free_move = null, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/fleets/{fleet_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() }
@@ -58,8 +66,11 @@ public async Task<EsiResponse<string>> UpdateSettings(long fleet_id, string motd
         /// /characters/{character_id}/fleet/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<FleetInfo>> FleetInfo()
-            => await Execute<FleetInfo>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/fleet/",
+        public async Task<EsiResponse<FleetInfo>> FleetInfo(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<FleetInfo>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/fleet/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -71,8 +82,11 @@ public async Task<EsiResponse<FleetInfo>> FleetInfo()
         /// </summary>
         /// <param name="fleet_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Member>>> Members(long fleet_id)
-            => await Execute<List<Member>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/fleets/{fleet_id}/members/",
+        public async Task<EsiResponse<List<Member>>> Members(long fleet_id, string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<Member>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/fleets/{fleet_id}/members/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() }
@@ -88,8 +102,11 @@ public async Task<EsiResponse<List<Member>>> Members(long fleet_id)
         /// <param name="wing_id"></param>
         /// <param name="squad_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> InviteCharacter(long fleet_id, int character_id, FleetRole role, long wing_id = 0, long squad_id = 0)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/fleets/{fleet_id}/members/",
+        public async Task<EsiResponse<string>> InviteCharacter(long fleet_id, int character_id, FleetRole role,
+            long wing_id = 0, long squad_id = 0, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/fleets/{fleet_id}/members/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() }
@@ -106,8 +123,11 @@ public async Task<EsiResponse<string>> InviteCharacter(long fleet_id, int charac
         /// <param name="wing_id"></param>
         /// <param name="squad_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> MoveCharacter(long fleet_id, int member_id, FleetRole role, long wing_id = 0, long squad_id = 0)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/fleets/{fleet_id}/members/{member_id}/",
+        public async Task<EsiResponse<string>> MoveCharacter(long fleet_id, int member_id, FleetRole role,
+            long wing_id = 0, long squad_id = 0, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/fleets/{fleet_id}/members/{member_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() },
@@ -122,8 +142,10 @@ public async Task<EsiResponse<string>> MoveCharacter(long fleet_id, int member_i
         /// <param name="fleet_id"></param>
         /// <param name="member_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> KickCharacter(long fleet_id, int member_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/fleets/{fleet_id}/members/{member_id}/",
+        public async Task<EsiResponse<string>> KickCharacter(long fleet_id, int member_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/fleets/{fleet_id}/members/{member_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() },
@@ -136,8 +158,11 @@ public async Task<EsiResponse<string>> KickCharacter(long fleet_id, int member_i
         /// </summary>
         /// <param name="fleet_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Wing>>> Wings(long fleet_id)
-            => await Execute<List<Wing>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/fleets/{fleet_id}/wings/",
+        public async Task<EsiResponse<List<Wing>>> Wings(long fleet_id, string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<Wing>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/fleets/{fleet_id}/wings/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() }
@@ -149,8 +174,10 @@ public async Task<EsiResponse<List<Wing>>> Wings(long fleet_id)
         /// </summary>
         /// <param name="fleet_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<NewWing>> CreateWing(long fleet_id)
-            => await Execute<NewWing>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/fleets/{fleet_id}/wings/",
+        public async Task<EsiResponse<NewWing>> CreateWing(long fleet_id, CancellationToken cancellationToken = default)
+            => await Execute<NewWing>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/fleets/{fleet_id}/wings/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() }
@@ -164,8 +191,10 @@ public async Task<EsiResponse<NewWing>> CreateWing(long fleet_id)
         /// <param name="wing_id"></param>
         /// <param name="name"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> RenameWing(long fleet_id, long wing_id, string name)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/fleets/{fleet_id}/wings/{wing_id}/",
+        public async Task<EsiResponse<string>> RenameWing(long fleet_id, long wing_id, string name, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/fleets/{fleet_id}/wings/{wing_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() },
@@ -183,8 +212,10 @@ public async Task<EsiResponse<string>> RenameWing(long fleet_id, long wing_id, s
         /// <param name="fleet_id"></param>
         /// <param name="wing_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> DeleteWing(long fleet_id, long wing_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/fleets/{fleet_id}/wings/{wing_id}/",
+        public async Task<EsiResponse<string>> DeleteWing(long fleet_id, long wing_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/fleets/{fleet_id}/wings/{wing_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() },
@@ -198,8 +229,10 @@ public async Task<EsiResponse<string>> DeleteWing(long fleet_id, long wing_id)
         /// <param name="fleet_id"></param>
         /// <param name="wing_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<NewSquad>> CreateSquad(long fleet_id, long wing_id)
-            => await Execute<NewSquad>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/fleets/{fleet_id}/wings/{wing_id}/squads/",
+        public async Task<EsiResponse<NewSquad>> CreateSquad(long fleet_id, long wing_id, CancellationToken cancellationToken = default)
+            => await Execute<NewSquad>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/fleets/{fleet_id}/wings/{wing_id}/squads/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "fleet_id", fleet_id.ToString() },
@@ -214,15 +247,18 @@ public async Task<EsiResponse<NewSquad>> CreateSquad(long fleet_id, long wing_id
         /// <param name="squad_id"></param>
         /// <param name="name"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> RenameSquad(long fleet_id, long squad_id, string name)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/fleets/{fleet_id}/squads/{squad_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "fleet_id", fleet_id.ToString() },
-                { "squad_id", squad_id.ToString() }
-            }, body: new
-            {
-                name
-            }, token: _data.Token);
+        public async Task<EsiResponse<string>> RenameSquad(long fleet_id, long squad_id, string name, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/fleets/{fleet_id}/squads/{squad_id}/",
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "fleet_id", fleet_id.ToString() },
+                    { "squad_id", squad_id.ToString() }
+                }, body: new
+                {
+                    name
+                }, token: _data.Token);
 
         /// <summary>
         /// /fleets/{fleet_id}/squads/{squad_id}/
@@ -230,13 +266,16 @@ public async Task<EsiResponse<string>> RenameSquad(long fleet_id, long squad_id,
         /// <param name="fleet_id"></param>
         /// <param name="squad_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> DeleteSquad(long fleet_id, long squad_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/fleets/{fleet_id}/squads/{squad_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "fleet_id", fleet_id.ToString() },
-                { "squad_id", squad_id.ToString() }
-            }, token: _data.Token);
-        
+        public async Task<EsiResponse<string>> DeleteSquad(long fleet_id, long squad_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/fleets/{fleet_id}/squads/{squad_id}/",
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "fleet_id", fleet_id.ToString() },
+                    { "squad_id", squad_id.ToString() }
+                }, token: _data.Token);
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/ESI.NET/Logic/IncursionsLogic.cs b/ESI.NET/Logic/IncursionsLogic.cs
index 29c1b23..2a15874 100644
--- a/ESI.NET/Logic/IncursionsLogic.cs
+++ b/ESI.NET/Logic/IncursionsLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Models.Incursions;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -11,13 +12,20 @@ public class IncursionsLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public IncursionsLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public IncursionsLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /incursions/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Incursion>>> All()
-            => await Execute<List<Incursion>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/incursions/");
+        public async Task<EsiResponse<List<Incursion>>> All(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Incursion>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/incursions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/ESI.NET/Logic/IndustryLogic.cs b/ESI.NET/Logic/IndustryLogic.cs
index bdc8848..d8ef313 100644
--- a/ESI.NET/Logic/IndustryLogic.cs
+++ b/ESI.NET/Logic/IndustryLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -31,23 +32,35 @@ public IndustryLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDat
         /// /industry/facilities/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Facility>>> Facilities()
-            => await Execute<List<Facility>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/industry/facilities/");
+        public async Task<EsiResponse<List<Facility>>> Facilities(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Facility>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/industry/facilities/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /industry/systems/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<SolarSystem>>> SolarSystemCostIndices()
-            => await Execute<List<SolarSystem>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/industry/systems/");
+        public async Task<EsiResponse<List<SolarSystem>>> SolarSystemCostIndices(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<SolarSystem>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/industry/systems/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /characters/{character_id}/industry/jobs/
         /// </summary>
         /// <param name="include_completed"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Job>>> JobsForCharacter(bool include_completed = false)
-            => await Execute<List<Job>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/industry/jobs/",
+        public async Task<EsiResponse<List<Job>>> JobsForCharacter(bool include_completed = false, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Job>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/industry/jobs/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -63,8 +76,12 @@ public async Task<EsiResponse<List<Job>>> JobsForCharacter(bool include_complete
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Entry>>> MiningLedger(int page = 1)
-            => await Execute<List<Entry>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/mining/",
+        public async Task<EsiResponse<List<Entry>>> MiningLedger(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Entry>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/mining/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -80,8 +97,12 @@ public async Task<EsiResponse<List<Entry>>> MiningLedger(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Observer>>> Observers(int page = 1)
-            => await Execute<List<Observer>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporation/{corporation_id}/mining/observers/",
+        public async Task<EsiResponse<List<Observer>>> Observers(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Observer>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporation/{corporation_id}/mining/observers/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -98,8 +119,13 @@ public async Task<EsiResponse<List<Observer>>> Observers(int page = 1)
         /// <param name="observer_id"></param>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ObserverInfo>>> ObservedMining(long observer_id, int page = 1)
-            => await Execute<List<ObserverInfo>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporation/{corporation_id}/mining/observers/{observer_id}/",
+        public async Task<EsiResponse<List<ObserverInfo>>> ObservedMining(long observer_id, int page = 1,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ObserverInfo>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporation/{corporation_id}/mining/observers/{observer_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() },
@@ -117,8 +143,13 @@ public async Task<EsiResponse<List<ObserverInfo>>> ObservedMining(long observer_
         /// <param name="include_completed"></param>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Job>>> JobsForCorporation(bool include_completed = false, int page = 1)
-            => await Execute<List<Job>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/industry/jobs/",
+        public async Task<EsiResponse<List<Job>>> JobsForCorporation(bool include_completed = false, int page = 1,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Job>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/industry/jobs/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -134,8 +165,12 @@ public async Task<EsiResponse<List<Job>>> JobsForCorporation(bool include_comple
         /// /corporation/{corporation_id}/mining/extractions/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Extraction>>> Extractions()
-            => await Execute<List<Extraction>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporation/{corporation_id}/mining/extractions/",
+        public async Task<EsiResponse<List<Extraction>>> Extractions(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Extraction>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporation/{corporation_id}/mining/extractions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
diff --git a/ESI.NET/Logic/InsuranceLogic.cs b/ESI.NET/Logic/InsuranceLogic.cs
index 27d6165..3dc8848 100644
--- a/ESI.NET/Logic/InsuranceLogic.cs
+++ b/ESI.NET/Logic/InsuranceLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Models.Insurance;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -11,13 +12,21 @@ public class InsuranceLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public InsuranceLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public InsuranceLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /insurance/prices/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Insurance>>> Levels()
-            => await Execute<List<Insurance>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/insurance/prices/");
+        public async Task<EsiResponse<List<Insurance>>> Levels(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Insurance>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/insurance/prices/", 
+                eTag: eTag,
+                cancellationToken: cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/ESI.NET/Logic/KillmailsLogic.cs b/ESI.NET/Logic/KillmailsLogic.cs
index 272338a..5ea3588 100644
--- a/ESI.NET/Logic/KillmailsLogic.cs
+++ b/ESI.NET/Logic/KillmailsLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -32,8 +33,12 @@ public KillmailsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDa
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Killmail>>> ForCharacter(int page = 1)
-            => await Execute<List<Killmail>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/killmails/recent/",
+        public async Task<EsiResponse<List<Killmail>>> ForCharacter(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Killmail>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/killmails/recent/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -49,8 +54,12 @@ public async Task<EsiResponse<List<Killmail>>> ForCharacter(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Killmail>>> ForCorporation(int page = 1)
-            => await Execute<List<Killmail>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/killmails/recent/",
+        public async Task<EsiResponse<List<Killmail>>> ForCorporation(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Killmail>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/killmails/recent/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -67,8 +76,13 @@ public async Task<EsiResponse<List<Killmail>>> ForCorporation(int page = 1)
         /// <param name="killmail_hash">The killmail hash for verification</param>
         /// <param name="killmail_id">The killmail ID to be queried</param>
         /// <returns></returns>
-        public async Task<EsiResponse<Information>> Information(string killmail_hash, int killmail_id)
-            => await Execute<Information>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/killmails/{killmail_id}/{killmail_hash}/",
+        public async Task<EsiResponse<Information>> Information(string killmail_hash, int killmail_id,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Information>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/killmails/{killmail_id}/{killmail_hash}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "killmail_id", killmail_id.ToString() },
diff --git a/ESI.NET/Logic/LocationLogic.cs b/ESI.NET/Logic/LocationLogic.cs
index 0583c5a..1c57942 100644
--- a/ESI.NET/Logic/LocationLogic.cs
+++ b/ESI.NET/Logic/LocationLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -28,8 +29,11 @@ public LocationLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDat
         /// /characters/{character_id}/location/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Location>> Location()
-            => await Execute<Location>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/location/",
+        public async Task<EsiResponse<Location>> Location(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<Location>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/location/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -40,8 +44,11 @@ public async Task<EsiResponse<Location>> Location()
         /// /characters/{character_id}/ship/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Ship>> Ship()
-            => await Execute<Ship>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/ship/",
+        public async Task<EsiResponse<Ship>> Ship(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<Ship>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/ship/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -52,8 +59,11 @@ public async Task<EsiResponse<Ship>> Ship()
         /// /characters/{character_id}/online/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Activity>> Online()
-            => await Execute<Activity>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/online/",
+        public async Task<EsiResponse<Activity>> Online(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<Activity>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/online/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/LoyaltyLogic.cs b/ESI.NET/Logic/LoyaltyLogic.cs
index 7c2e312..ee9ce5a 100644
--- a/ESI.NET/Logic/LoyaltyLogic.cs
+++ b/ESI.NET/Logic/LoyaltyLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -28,8 +29,12 @@ public LoyaltyLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// /loyalty/stores/{corporation_id}/offers/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Offer>>> Offers(int corporation_id)
-            => await Execute<List<Offer>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/loyalty/stores/{corporation_id}/offers/",
+        public async Task<EsiResponse<List<Offer>>> Offers(int corporation_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Offer>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/loyalty/stores/{corporation_id}/offers/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -39,8 +44,12 @@ public async Task<EsiResponse<List<Offer>>> Offers(int corporation_id)
         /// /characters/{character_id}/loyalty/points/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Points>>> Points()
-            => await Execute<List<Points>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/loyalty/points/",
+        public async Task<EsiResponse<List<Points>>> Points(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Points>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/loyalty/points/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/MailLogic.cs b/ESI.NET/Logic/MailLogic.cs
index e708dd9..b3ba0bd 100644
--- a/ESI.NET/Logic/MailLogic.cs
+++ b/ESI.NET/Logic/MailLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -28,7 +29,9 @@ public MailLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData da
         /// /characters/{character_id}/mail/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Header>>> Headers(long[] labels = null, int last_mail_id = 0)
+        public async Task<EsiResponse<List<Header>>> Headers(long[] labels = null, int last_mail_id = 0,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
         {
             var parameters = new List<string>();
 
@@ -38,7 +41,10 @@ public async Task<EsiResponse<List<Header>>> Headers(long[] labels = null, int l
             if (last_mail_id > 0)
                 parameters.Add($"last_mail_id={last_mail_id}");
 
-            var response = await Execute<List<Header>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/mail/",
+            var response = await Execute<List<Header>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/mail/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -57,8 +63,11 @@ public async Task<EsiResponse<List<Header>>> Headers(long[] labels = null, int l
         /// <param name="body"></param>
         /// <param name="approved_cost"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<int>> New(object[] recipients, string subject, string body, int approved_cost = 0)
-            => await Execute<int>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/mail/",
+        public async Task<EsiResponse<int>> New(object[] recipients, string subject, string body, int approved_cost = 0,
+            CancellationToken cancellationToken = default)
+            => await Execute<int>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/mail/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -76,8 +85,12 @@ public async Task<EsiResponse<int>> New(object[] recipients, string subject, str
         /// /characters/{character_id}/mail/labels/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<LabelCounts>> Labels()
-            => await Execute<LabelCounts>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/mail/labels/",
+        public async Task<EsiResponse<LabelCounts>> Labels(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<LabelCounts>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/mail/labels/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -90,8 +103,11 @@ public async Task<EsiResponse<LabelCounts>> Labels()
         /// <param name="name"></param>
         /// <param name="color"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<long>> NewLabel(string name, string color)
-            => await Execute<long>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/characters/{character_id}/mail/labels/",
+        public async Task<EsiResponse<long>> NewLabel(string name, string color,
+            CancellationToken cancellationToken = default)
+            => await Execute<long>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/characters/{character_id}/mail/labels/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -108,8 +124,10 @@ public async Task<EsiResponse<long>> NewLabel(string name, string color)
         /// </summary>
         /// <param name="label_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> DeleteLabel(long label_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/characters/{character_id}/mail/labels/{label_id}/",
+        public async Task<EsiResponse<string>> DeleteLabel(long label_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/characters/{character_id}/mail/labels/{label_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -121,8 +139,12 @@ public async Task<EsiResponse<string>> DeleteLabel(long label_id)
         /// /characters/{character_id}/mail/lists/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<MailingList>>> MailingLists()
-            => await Execute<List<MailingList>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/mail/lists/",
+        public async Task<EsiResponse<List<MailingList>>> MailingLists(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<MailingList>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/mail/lists/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -134,8 +156,12 @@ public async Task<EsiResponse<List<MailingList>>> MailingLists()
         /// </summary>
         /// <param name="mail_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Message>> Retrieve(int mail_id)
-            => await Execute<Message>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/mail/{mail_id}/",
+        public async Task<EsiResponse<Message>> Retrieve(int mail_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Message>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/mail/{mail_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -150,8 +176,10 @@ public async Task<EsiResponse<Message>> Retrieve(int mail_id)
         /// <param name="is_read"></param>
         /// <param name="labels"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Message>> Update(int mail_id, bool? is_read = null, int[] labels = null)
-            => await Execute<Message>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put, "/characters/{character_id}/mail/{mail_id}/",
+        public async Task<EsiResponse<Message>> Update(int mail_id, bool? is_read = null, int[] labels = null, CancellationToken cancellationToken = default)
+            => await Execute<Message>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Put,
+                "/characters/{character_id}/mail/{mail_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -159,14 +187,16 @@ public async Task<EsiResponse<Message>> Update(int mail_id, bool? is_read = null
                 },
                 body: BuildUpdateObject(is_read, labels),
                 token: _data.Token);
-        
+
         /// <summary>
         /// /characters/{character_id}/mail/{mail_id}/
         /// </summary>
         /// <param name="mail_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Message>> Delete(int mail_id)
-            => await Execute<Message>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete, "/characters/{character_id}/mail/{mail_id}/",
+        public async Task<EsiResponse<Message>> Delete(int mail_id, CancellationToken cancellationToken = default)
+            => await Execute<Message>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Delete,
+                "/characters/{character_id}/mail/{mail_id}/",
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
diff --git a/ESI.NET/Logic/MarketLogic.cs b/ESI.NET/Logic/MarketLogic.cs
index 08cea6f..d21ef82 100644
--- a/ESI.NET/Logic/MarketLogic.cs
+++ b/ESI.NET/Logic/MarketLogic.cs
@@ -3,6 +3,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -15,7 +16,8 @@ public class MarketLogic
         private readonly AuthorizedCharacterData _data;
         private readonly int character_id, corporation_id;
 
-        public MarketLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData data = null)
+        public MarketLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData data = null, string eTag = null,
+            CancellationToken cancellationToken = default)
         {
             _client = client;
             _config = config;
@@ -32,8 +34,11 @@ public MarketLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// /markets/prices/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Price>>> Prices()
-            => await Execute<List<Price>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/prices/");
+        public async Task<EsiResponse<List<Price>>> Prices(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Price>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/prices/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /markets/{region_id}/orders/
@@ -44,10 +49,12 @@ public async Task<EsiResponse<List<Price>>> Prices()
         /// <param name="type_id"></param>
         /// <returns></returns>
         public async Task<EsiResponse<List<Order>>> RegionOrders(
-            int region_id, 
-            MarketOrderType order_type = MarketOrderType.All, 
-            int page = 1, 
-            int? type_id = null)
+            int region_id,
+            MarketOrderType order_type = MarketOrderType.All,
+            int page = 1,
+            int? type_id = null,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
         {
             var parameters = new List<string>() { $"order_type={order_type.ToEsiValue()}" };
             parameters.Add($"page={page}");
@@ -55,7 +62,10 @@ public async Task<EsiResponse<List<Order>>> RegionOrders(
             if (type_id != null)
                 parameters.Add($"type_id={type_id}");
 
-            var response = await Execute<List<Order>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/{region_id}/orders/",
+            var response = await Execute<List<Order>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/markets/{region_id}/orders/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "region_id", region_id.ToString() }
@@ -71,8 +81,12 @@ public async Task<EsiResponse<List<Order>>> RegionOrders(
         /// <param name="region_id"></param>
         /// <param name="type_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Statistic>>> TypeHistoryInRegion(int region_id, int type_id)
-            => await Execute<List<Statistic>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/{region_id}/history/",
+        public async Task<EsiResponse<List<Statistic>>> TypeHistoryInRegion(int region_id, int type_id,
+            string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<Statistic>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/markets/{region_id}/history/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "region_id", region_id.ToString() }
@@ -88,8 +102,12 @@ public async Task<EsiResponse<List<Statistic>>> TypeHistoryInRegion(int region_i
         /// <param name="structure_id"></param>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Order>>> StructureOrders(long structure_id, int page = 1)
-            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/markets/structures/{structure_id}/",
+        public async Task<EsiResponse<List<Order>>> StructureOrders(long structure_id, int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/markets/structures/{structure_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "structure_id", structure_id.ToString() }
@@ -104,16 +122,22 @@ public async Task<EsiResponse<List<Order>>> StructureOrders(long structure_id, i
         /// /markets/groups/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Groups()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/groups/");
+        public async Task<EsiResponse<int[]>> Groups(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/groups/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /markets/groups/{market_group_id}/
         /// </summary>
         /// <param name="market_group_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Group>> Group(int market_group_id)
-            => await Execute<Group>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/groups/{market_group_id}/",
+        public async Task<EsiResponse<Group>> Group(int market_group_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Group>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/markets/groups/{market_group_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "market_group_id", market_group_id.ToString() }
@@ -123,8 +147,12 @@ public async Task<EsiResponse<Group>> Group(int market_group_id)
         /// /characters/{character_id}/orders/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Order>>> CharacterOrders()
-            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/orders/",
+        public async Task<EsiResponse<List<Order>>> CharacterOrders(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/orders/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -136,8 +164,12 @@ public async Task<EsiResponse<List<Order>>> CharacterOrders()
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Order>>> CharacterOrderHistory(int page = 1)
-            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/orders/history/",
+        public async Task<EsiResponse<List<Order>>> CharacterOrderHistory(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/orders/history/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -154,8 +186,12 @@ public async Task<EsiResponse<List<Order>>> CharacterOrderHistory(int page = 1)
         /// <param name="region_id"></param>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Types(int region_id, int page = 1)
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/markets/{region_id}/types/",
+        public async Task<EsiResponse<int[]>> Types(int region_id, int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/markets/{region_id}/types/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "region_id", region_id.ToString() }
@@ -170,8 +206,12 @@ public async Task<EsiResponse<int[]>> Types(int region_id, int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Order>>> CorporationOrders(int page = 1)
-            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/orders/",
+        public async Task<EsiResponse<List<Order>>> CorporationOrders(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/orders/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -187,8 +227,12 @@ public async Task<EsiResponse<List<Order>>> CorporationOrders(int page = 1)
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Order>>> CorporationOrderHistory(int page = 1)
-            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/orders/history/",
+        public async Task<EsiResponse<List<Order>>> CorporationOrderHistory(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Order>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/orders/history/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
diff --git a/ESI.NET/Logic/OpportunitiesLogic.cs b/ESI.NET/Logic/OpportunitiesLogic.cs
index 08fcc05..9af9ba8 100644
--- a/ESI.NET/Logic/OpportunitiesLogic.cs
+++ b/ESI.NET/Logic/OpportunitiesLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 using opportunities = ESI.NET.Models.Opportunities;
@@ -13,7 +14,7 @@ public class OpportunitiesLogic
         private readonly EsiConfig _config;
         private readonly AuthorizedCharacterData _data;
         private readonly int character_id;
-        
+
         public OpportunitiesLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData data = null)
         {
             _client = client;
@@ -28,16 +29,22 @@ public OpportunitiesLogic(HttpClient client, EsiConfig config, AuthorizedCharact
         /// /opportunities/groups/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Groups()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/opportunities/groups/");
+        public async Task<EsiResponse<int[]>> Groups(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/opportunities/groups/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /opportunities/groups/{group_id}/
         /// </summary>
         /// <param name="group_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<opportunities.Group>> Group(int group_id)
-            => await Execute<opportunities.Group>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/opportunities/groups/{group_id}/",
+        public async Task<EsiResponse<opportunities.Group>> Group(int group_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<opportunities.Group>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/opportunities/groups/{group_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "group_id", group_id.ToString() }
@@ -47,16 +54,23 @@ public async Task<EsiResponse<int[]>> Groups()
         /// /opportunities/tasks/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Tasks()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/opportunities/tasks/");
+        public async Task<EsiResponse<int[]>> Tasks(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/opportunities/tasks/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /opportunities/tasks/{task_id}/
         /// </summary>
         /// <param name="task_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<opportunities.Task>> Task(int task_id)
-            => await Execute<opportunities.Task>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/opportunities/tasks/{task_id}/",
+        public async Task<EsiResponse<opportunities.Task>> Task(int task_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<opportunities.Task>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/opportunities/tasks/{task_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "task_id", task_id.ToString() }
@@ -67,8 +81,12 @@ public async Task<EsiResponse<int[]>> Tasks()
         /// </summary>
         /// <param name="character_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<opportunities.CompletedTask>>> CompletedTasks()
-            => await Execute<List<opportunities.CompletedTask>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/opportunities/",
+        public async Task<EsiResponse<List<opportunities.CompletedTask>>> CompletedTasks(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<opportunities.CompletedTask>>(_client, _config, RequestSecurity.Authenticated,
+                HttpMethod.Get, "/characters/{character_id}/opportunities/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/PlanetaryInteractionLogic.cs b/ESI.NET/Logic/PlanetaryInteractionLogic.cs
index d20afed..9a692d4 100644
--- a/ESI.NET/Logic/PlanetaryInteractionLogic.cs
+++ b/ESI.NET/Logic/PlanetaryInteractionLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -31,8 +32,11 @@ public PlanetaryInteractionLogic(HttpClient client, EsiConfig config, Authorized
         /// /characters/{character_id}/planets/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Planet>>> Colonies()
-            => await Execute<List<Planet>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/planets/",
+        public async Task<EsiResponse<List<Planet>>> Colonies(string eTag = null, CancellationToken cancellationToken = default)
+            => await Execute<List<Planet>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/planets/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -44,8 +48,12 @@ public async Task<EsiResponse<List<Planet>>> Colonies()
         /// </summary>
         /// <param name="planet_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<ColonyLayout>> ColonyLayout(int planet_id)
-            => await Execute<ColonyLayout>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/planets/{planet_id}/",
+        public async Task<EsiResponse<ColonyLayout>> ColonyLayout(int planet_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<ColonyLayout>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/planets/{planet_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() },
@@ -57,8 +65,12 @@ public async Task<EsiResponse<ColonyLayout>> ColonyLayout(int planet_id)
         /// /corporations/{corporation_id}/customs_offices/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<CustomsOffice>>> CorporationCustomsOffices()
-            => await Execute<List<CustomsOffice>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/customs_offices/",
+        public async Task<EsiResponse<List<CustomsOffice>>> CorporationCustomsOffices(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<CustomsOffice>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/customs_offices/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -70,8 +82,12 @@ public async Task<EsiResponse<List<CustomsOffice>>> CorporationCustomsOffices()
         /// </summary>
         /// <param name="schematic_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Schematic>> SchematicInformation(int schematic_id)
-            => await Execute<Schematic>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/schematics/{schematic_id}/",
+        public async Task<EsiResponse<Schematic>> SchematicInformation(int schematic_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Schematic>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/schematics/{schematic_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "schematic_id", schematic_id.ToString() }
diff --git a/ESI.NET/Logic/RoutesLogic.cs b/ESI.NET/Logic/RoutesLogic.cs
index 231120b..a69667a 100644
--- a/ESI.NET/Logic/RoutesLogic.cs
+++ b/ESI.NET/Logic/RoutesLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Enumerations;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -11,7 +12,11 @@ public class RoutesLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public RoutesLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public RoutesLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /route/{origin}/{destination}/
@@ -23,11 +28,13 @@ public class RoutesLogic
         /// <param name="connections"></param>
         /// <returns></returns>
         public async Task<EsiResponse<int[]>> Map(
-            int origin, 
-            int destination, 
-            RoutesFlag flag = RoutesFlag.Shortest, 
-            int[] avoid = null, 
-            int[] connections = null)
+            int origin,
+            int destination,
+            RoutesFlag flag = RoutesFlag.Shortest,
+            int[] avoid = null,
+            int[] connections = null, 
+            string eTag = null,
+            CancellationToken cancellationToken = default)
         {
             var parameters = new List<string>() { $"flag={flag.ToEsiValue()}" };
 
@@ -37,7 +44,10 @@ public async Task<EsiResponse<int[]>> Map(
             if (connections != null)
                 parameters.Add($"&connections={string.Join(",", connections)}");
 
-            var response = await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/route/{origin}/{destination}/",
+            var response = await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/route/{origin}/{destination}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "origin", origin.ToString() },
diff --git a/ESI.NET/Logic/SearchLogic.cs b/ESI.NET/Logic/SearchLogic.cs
index 27f5f2d..083fe45 100644
--- a/ESI.NET/Logic/SearchLogic.cs
+++ b/ESI.NET/Logic/SearchLogic.cs
@@ -3,6 +3,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -33,7 +34,8 @@ public SearchLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// <param name="isStrict">Whether the search should be a strict match</param>
         /// <param name="language">Language to use in the response</param>
         /// <returns></returns>
-        public async Task<EsiResponse<SearchResults>> Query(SearchType type, string search, SearchCategory categories, bool isStrict = false, string language = "en-us")
+        public async Task<EsiResponse<SearchResults>> Query(SearchType type, string search, SearchCategory categories,
+            bool isStrict = false, string language = "en-us", string eTag = null, CancellationToken cancellationToken = default)
         {
             var categoryList = categories.ToEsiValue();
 
@@ -50,15 +52,21 @@ public async Task<EsiResponse<SearchResults>> Query(SearchType type, string sear
                 endpoint = "/characters/{character_id}/search/";
             }
 
-            var response = await Execute<SearchResults>(_client, _config, security, HttpMethod.Get, endpoint, replacements, parameters: new string[] {
-                $"search={search}",
-                $"categories={categoryList}",
-                $"strict={isStrict}",
-                $"language={language}"
-            },
-            token: _data?.Token);
+            var response = await Execute<SearchResults>(_client, _config, security, HttpMethod.Get,
+                endpoint: endpoint,
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: replacements,
+                parameters: new string[]
+                {
+                    $"search={search}",
+                    $"categories={categoryList}",
+                    $"strict={isStrict}",
+                    $"language={language}"
+                },
+                token: _data?.Token);
 
             return response;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ESI.NET/Logic/SkillsLogic.cs b/ESI.NET/Logic/SkillsLogic.cs
index 57cca3e..ed84cb7 100644
--- a/ESI.NET/Logic/SkillsLogic.cs
+++ b/ESI.NET/Logic/SkillsLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.SSO;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -28,8 +29,12 @@ public SkillsLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// /characters/{character_id}/attributes/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<Attributes>> Attributes()
-            => await Execute<Attributes>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/attributes/",
+        public async Task<EsiResponse<Attributes>> Attributes(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Attributes>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/attributes/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -40,8 +45,12 @@ public async Task<EsiResponse<Attributes>> Attributes()
         /// /characters/{character_id}/skills/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<SkillDetails>> List()
-            => await Execute<SkillDetails>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/skills/",
+        public async Task<EsiResponse<SkillDetails>> List(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<SkillDetails>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/skills/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -52,8 +61,12 @@ public async Task<EsiResponse<SkillDetails>> List()
         /// /characters/{character_id}/skillqueue/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<SkillQueueItem>>> Queue()
-            => await Execute<List<SkillQueueItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/skillqueue/",
+        public async Task<EsiResponse<List<SkillQueueItem>>> Queue(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<SkillQueueItem>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/skillqueue/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
diff --git a/ESI.NET/Logic/SovereigntyLogic.cs b/ESI.NET/Logic/SovereigntyLogic.cs
index 08e7f3d..2829200 100644
--- a/ESI.NET/Logic/SovereigntyLogic.cs
+++ b/ESI.NET/Logic/SovereigntyLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Models.Sovereignty;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -11,27 +12,43 @@ public class SovereigntyLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public SovereigntyLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public SovereigntyLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /sovereignty/campaigns/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Campaign>>> Campaigns()
-            => await Execute<List<Campaign>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/sovereignty/campaigns/");
+        public async Task<EsiResponse<List<Campaign>>> Campaigns(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Campaign>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/sovereignty/campaigns/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /sovereignty/map/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<SystemSovereignty>>> Systems()
-            => await Execute<List<SystemSovereignty>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/sovereignty/map/");
+        public async Task<EsiResponse<List<SystemSovereignty>>> Systems(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<SystemSovereignty>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/sovereignty/map/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /sovereignty/structures/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Structure>>> Structures()
-            => await Execute<List<Structure>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/sovereignty/structures/");
+        public async Task<EsiResponse<List<Structure>>> Structures(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Structure>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/sovereignty/structures/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/ESI.NET/Logic/StatusLogic.cs b/ESI.NET/Logic/StatusLogic.cs
index 282b0dd..fd04f45 100644
--- a/ESI.NET/Logic/StatusLogic.cs
+++ b/ESI.NET/Logic/StatusLogic.cs
@@ -1,5 +1,6 @@
 using ESI.NET.Models.Status;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -10,9 +11,16 @@ public class StatusLogic
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
 
-        public StatusLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+        public StatusLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
-        public async Task<EsiResponse<Status>> Retrieve()
-            => await Execute<Status>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/status/");
+        public async Task<EsiResponse<Status>> Retrieve(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Status>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/status/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/ESI.NET/Logic/UniverseLogic.cs b/ESI.NET/Logic/UniverseLogic.cs
index b4eaf33..efd9822 100644
--- a/ESI.NET/Logic/UniverseLogic.cs
+++ b/ESI.NET/Logic/UniverseLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.Universe;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -24,77 +25,109 @@ public UniverseLogic(HttpClient client, EsiConfig config, AuthorizedCharacterDat
         /// /universe/bloodlines/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Bloodline>>> Bloodlines()
-            => await Execute<List<Bloodline>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/bloodlines/");
+        public async Task<EsiResponse<List<Bloodline>>> Bloodlines(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Bloodline>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/bloodlines/",
+                eTag: eTag, cancellationToken: cancellationToken );
 
         /// <summary>
         /// /universe/categories/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Categories()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/categories/");
+        public async Task<EsiResponse<int[]>> Categories(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/categories/",
+                eTag: eTag, cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/categories/{category_id}/
         /// </summary>
         /// <param name="category_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Category>> Category(int category_id)
-            => await Execute<Category>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/categories/{category_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "category_id", category_id.ToString() }
-            });
+        public async Task<EsiResponse<Category>> Category(int category_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Category>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/categories/{category_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "category_id", category_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/constellations/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Constellations()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/constellations/");
+        public async Task<EsiResponse<int[]>> Constellations(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/constellations/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/constellations/{constellation_id}/
         /// </summary>
         /// <param name="constellation_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Constellation>> Constellation(int constellation_id)
-            => await Execute<Constellation>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/constellations/{constellation_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "constellation_id", constellation_id.ToString() }
-            });
+        public async Task<EsiResponse<Constellation>> Constellation(int constellation_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Constellation>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/constellations/{constellation_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken, replacements: new Dictionary<string, string>()
+                {
+                    { "constellation_id", constellation_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/factions/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Faction>>> Factions()
-            => await Execute<List<Faction>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/factions/");
+        public async Task<EsiResponse<List<Faction>>> Factions(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Faction>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/factions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/graphics/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Graphics()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/graphics/");
+        public async Task<EsiResponse<int[]>> Graphics(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/graphics/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/graphics/{graphic_id}/
         /// </summary>
         /// <param name="graphic_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Graphic>> Graphic(int graphic_id)
-            => await Execute<Graphic>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/graphics/{graphic_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "graphic_id", graphic_id.ToString() }
-            });
+        public async Task<EsiResponse<Graphic>> Graphic(int graphic_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Graphic>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/graphics/{graphic_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken, replacements: new Dictionary<string, string>()
+                {
+                    { "graphic_id", graphic_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/groups/
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Groups(int page = 1)
+        public async Task<EsiResponse<int[]>> Groups(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
             => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/groups/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"page={page}"
@@ -105,129 +138,185 @@ public async Task<EsiResponse<int[]>> Groups(int page = 1)
         /// </summary>
         /// <param name="group_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Group>> Group(int group_id)
-            => await Execute<Group>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/groups/{group_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "group_id", group_id.ToString() }
-            });
+        public async Task<EsiResponse<Group>> Group(int group_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Group>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/groups/{group_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken, replacements: new Dictionary<string, string>()
+                {
+                    { "group_id", group_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/moons/{moon_id}/
         /// </summary>
         /// <param name="moon_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Moon>> Moon(int moon_id)
-            => await Execute<Moon>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/moons/{moon_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "moon_id", moon_id.ToString() }
-            });
+        public async Task<EsiResponse<Moon>> Moon(int moon_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Moon>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/moons/{moon_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "moon_id", moon_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/names/
         /// </summary>
         /// <param name="any_ids">The ids to resolve; Supported IDs for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types.</param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<ResolvedInfo>>> Names(List<int> any_ids)
-            => await Execute<List<ResolvedInfo>>(_client, _config, RequestSecurity.Public, HttpMethod.Post, "/universe/names/", body: any_ids.ToArray());
+        public async Task<EsiResponse<List<ResolvedInfo>>> Names(List<int> any_ids, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<ResolvedInfo>>(_client, _config, RequestSecurity.Public, HttpMethod.Post,
+                "/universe/names/",
+                cancellationToken: cancellationToken,
+                body: any_ids.ToArray());
 
         /// <summary>
         /// /universe/ids/
         /// </summary>
         /// <param name="names">Resolve a set of names to IDs in the following categories: agents, alliances, characters, constellations, corporations factions, inventory_types, regions, stations, and systems. Only exact matches will be returned. All names searched for are cached for 12 hours.</param>
         /// <returns></returns>
-        public async Task<EsiResponse<IDLookup>> IDs(List<string> names)
-            => await Execute<IDLookup>(_client, _config, RequestSecurity.Public, HttpMethod.Post, "/universe/ids/", body: names.ToArray());
+        public async Task<EsiResponse<IDLookup>> IDs(List<string> names, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<IDLookup>(_client, _config, RequestSecurity.Public, HttpMethod.Post, "/universe/ids/",
+                cancellationToken: cancellationToken,
+                body: names.ToArray());
 
         /// <summary>
         /// /universe/planets/{planet_id}/
         /// </summary>
         /// <param name="planet_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Planet>> Planet(int planet_id)
-            => await Execute<Planet>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/planets/{planet_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "planet_id", planet_id.ToString() }
-            });
+        public async Task<EsiResponse<Planet>> Planet(int planet_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Planet>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/planets/{planet_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "planet_id", planet_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/races/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Race>>> Races()
-            => await Execute<List<Race>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/races/");
+        public async Task<EsiResponse<List<Race>>> Races(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Race>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/races/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/regions/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Regions()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/regions/");
+        public async Task<EsiResponse<int[]>> Regions(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/regions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/regions/{region_id}/
         /// </summary>
         /// <param name="region_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Region>> Region(int region_id)
-            => await Execute<Region>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/regions/{region_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "region_id", region_id.ToString() }
-            });
+        public async Task<EsiResponse<Region>> Region(int region_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Region>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/regions/{region_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "region_id", region_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/stations/{station_id}/
         /// </summary>
         /// <param name="station_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Station>> Station(int station_id)
-            => await Execute<Station>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/stations/{station_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "station_id", station_id.ToString() }
-            });
+        public async Task<EsiResponse<Station>> Station(int station_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Station>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/stations/{station_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "station_id", station_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/structures/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<long[]>> Structures()
-            => await Execute<long[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/structures/");
+        public async Task<EsiResponse<long[]>> Structures(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<long[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/structures/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/structures/{structure_id}/
         /// </summary>
         /// <param name="structure_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Structure>> Structure(long structure_id)
-            => await Execute<Structure>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/universe/structures/{structure_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "structure_id", structure_id.ToString() }
-            }, token: _data.Token);
+        public async Task<EsiResponse<Structure>> Structure(long structure_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Structure>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/universe/structures/{structure_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "structure_id", structure_id.ToString() }
+                }, token: _data.Token);
 
         /// <summary>
         /// /universe/systems/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Systems()
-            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/systems/");
+        public async Task<EsiResponse<int[]>> Systems(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/systems/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/systems/{system_id}/
         /// </summary>
         /// <param name="system_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<SolarSystem>> System(int system_id)
-            => await Execute<SolarSystem>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/systems/{system_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "system_id", system_id.ToString() }
-            });
+        public async Task<EsiResponse<SolarSystem>> System(int system_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<SolarSystem>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/systems/{system_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "system_id", system_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/types/
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> Types(int page = 1)
+        public async Task<EsiResponse<int[]>> Types(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
             => await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/types/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"page={page}"
@@ -238,63 +327,94 @@ public async Task<EsiResponse<int[]>> Types(int page = 1)
         /// </summary>
         /// <param name="type_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Type>> Type(int type_id)
-            => await Execute<Type>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/types/{type_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "type_id", type_id.ToString() }
-            });
+        public async Task<EsiResponse<Type>> Type(int type_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Type>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/types/{type_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "type_id", type_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/stargates/{stargate_id}/
         /// </summary>
         /// <param name="stargate_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Stargate>> Stargate(int stargate_id)
-            => await Execute<Stargate>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/stargates/{stargate_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "stargate_id", stargate_id.ToString() }
-            });
+        public async Task<EsiResponse<Stargate>> Stargate(int stargate_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Stargate>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/stargates/{stargate_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "stargate_id", stargate_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/system_jumps/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Jumps>>> Jumps()
-            => await Execute<List<Jumps>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/system_jumps/");
+        public async Task<EsiResponse<List<Jumps>>> Jumps(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Jumps>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/system_jumps/",
+                eTag: eTag,
+                cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/system_kills/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Kills>>> Kills()
-            => await Execute<List<Kills>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/system_kills/");
+        public async Task<EsiResponse<List<Kills>>> Kills(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Kills>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/system_kills/", eTag: eTag, cancellationToken: cancellationToken);
 
         /// <summary>
         /// /universe/stars/{star_id}/
         /// </summary>
         /// <param name="star_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<Star>> Star(int star_id)
-            => await Execute<Star>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/stars/{star_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "star_id", star_id.ToString() }
-            });
+        public async Task<EsiResponse<Star>> Star(int star_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<Star>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/stars/{star_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "star_id", star_id.ToString() }
+                });
 
         /// <summary>
         /// /universe/ancestries/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Ancestry>>> Ancestries()
-            => await Execute<List<Ancestry>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/ancestries/");
+        public async Task<EsiResponse<List<Ancestry>>> Ancestries(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Ancestry>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/ancestries/",
+                eTag: eTag,
+                cancellationToken: cancellationToken
+            );
 
         /// <summary>
         /// /universe/asteroid_belts/{asteroid_belt_id}/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<AsteroidBelt>>> AsteroidBelt(int asteroid_belt_id)
-            => await Execute<List<AsteroidBelt>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/universe/asteroid_belts/{asteroid_belt_id}/", replacements: new Dictionary<string, string>()
-            {
-                { "asteroid_belt_id", asteroid_belt_id.ToString() }
-            });
+        public async Task<EsiResponse<List<AsteroidBelt>>> AsteroidBelt(int asteroid_belt_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<AsteroidBelt>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/universe/asteroid_belts/{asteroid_belt_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
+                replacements: new Dictionary<string, string>()
+                {
+                    { "asteroid_belt_id", asteroid_belt_id.ToString() }
+                });
     }
-}
+}
\ No newline at end of file
diff --git a/ESI.NET/Logic/UserInterfaceLogic.cs b/ESI.NET/Logic/UserInterfaceLogic.cs
index d9e7ac5..2d6d4e5 100644
--- a/ESI.NET/Logic/UserInterfaceLogic.cs
+++ b/ESI.NET/Logic/UserInterfaceLogic.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using ESI.NET.Models.SSO;
 using static ESI.NET.EsiRequest;
@@ -23,8 +24,10 @@ public UserInterfaceLogic(HttpClient client, EsiConfig config, AuthorizedCharact
         /// </summary>
         /// <param name="type_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> MarketDetails(int type_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/ui/openwindow/marketdetails/",
+        public async Task<EsiResponse<string>> MarketDetails(int type_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/ui/openwindow/marketdetails/",
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"type_id={type_id}"
@@ -36,8 +39,10 @@ public async Task<EsiResponse<string>> MarketDetails(int type_id)
         /// </summary>
         /// <param name="contract_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> Contract(int contract_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/ui/openwindow/contract/",
+        public async Task<EsiResponse<string>> Contract(int contract_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/ui/openwindow/contract/",
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"contract_id={contract_id}"
@@ -49,8 +54,10 @@ public async Task<EsiResponse<string>> Contract(int contract_id)
         /// </summary>
         /// <param name="target_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> Information(int target_id)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/ui/openwindow/information/",
+        public async Task<EsiResponse<string>> Information(int target_id, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/ui/openwindow/information/",
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"target_id={target_id}"
@@ -64,8 +71,11 @@ public async Task<EsiResponse<string>> Information(int target_id)
         /// <param name="add_to_beginning"></param>
         /// <param name="clear_other_waypoints"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> Waypoint(long destination_id, bool add_to_beginning = false, bool clear_other_waypoints = false)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/ui/autopilot/waypoint/",
+        public async Task<EsiResponse<string>> Waypoint(long destination_id, bool add_to_beginning = false,
+            bool clear_other_waypoints = false, CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/ui/autopilot/waypoint/",
+                cancellationToken: cancellationToken,
                 parameters: new string[]
                 {
                     $"destination_id={destination_id}",
@@ -83,8 +93,11 @@ public async Task<EsiResponse<string>> Waypoint(long destination_id, bool add_to
         /// <param name="to_mailing_list_id"></param>
         /// <param name="to_corp_or_alliance_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<string>> NewMail(string subject, string body, int[] recipients)
-            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post, "/ui/openwindow/newmail/",
+        public async Task<EsiResponse<string>> NewMail(string subject, string body, int[] recipients,
+            CancellationToken cancellationToken = default)
+            => await Execute<string>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Post,
+                "/ui/openwindow/newmail/",
+                cancellationToken: cancellationToken,
                 body: new
                 {
                     subject,
diff --git a/ESI.NET/Logic/WalletLogic.cs b/ESI.NET/Logic/WalletLogic.cs
index 47a6a5a..2c77423 100644
--- a/ESI.NET/Logic/WalletLogic.cs
+++ b/ESI.NET/Logic/WalletLogic.cs
@@ -2,6 +2,7 @@
 using ESI.NET.Models.Wallet;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -31,19 +32,27 @@ public WalletLogic(HttpClient client, EsiConfig config, AuthorizedCharacterData
         /// /characters/{character_id}/wallet/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<decimal>> CharacterWallet()
-            => await Execute<decimal>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/wallet/", replacements: new Dictionary<string, string>()
-            {
-                { "character_id", character_id.ToString() }
-            }, token: _data.Token);
+        public async Task<EsiResponse<decimal>> CharacterWallet(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<decimal>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/wallet/",
+                eTag: eTag,
+                cancellationToken: cancellationToken, replacements: new Dictionary<string, string>()
+                {
+                    { "character_id", character_id.ToString() }
+                }, token: _data.Token);
 
         /// <summary>
         /// /characters/{character_id}/wallet/journal/
         /// </summary>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<JournalEntry>>> CharacterJournal(int page = 1)
-            => await Execute<List<JournalEntry>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/wallet/journal/",
+        public async Task<EsiResponse<List<JournalEntry>>> CharacterJournal(int page = 1, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<JournalEntry>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/wallet/journal/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -60,8 +69,12 @@ public async Task<EsiResponse<List<JournalEntry>>> CharacterJournal(int page = 1
         /// </summary>
         /// <param name="from_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Transaction>>> CharacterTransactions(long from_id)
-            => await Execute<List<Transaction>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/characters/{character_id}/wallet/transactions/",
+        public async Task<EsiResponse<List<Transaction>>> CharacterTransactions(long from_id, string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Transaction>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/characters/{character_id}/wallet/transactions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "character_id", character_id.ToString() }
@@ -76,8 +89,12 @@ public async Task<EsiResponse<List<Transaction>>> CharacterTransactions(long fro
         /// /corporations/{corporation_id}/wallets/
         /// </summary>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Wallet>>> CorporationWallets()
-            => await Execute<List<Wallet>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/wallets/",
+        public async Task<EsiResponse<List<Wallet>>> CorporationWallets(string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Wallet>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/wallets/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() }
@@ -90,8 +107,13 @@ public async Task<EsiResponse<List<Wallet>>> CorporationWallets()
         /// <param name="division"></param>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<JournalEntry>>> CorporationJournal(int division, int page = 1)
-            => await Execute<List<JournalEntry>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/wallets/{division}/journal/",
+        public async Task<EsiResponse<List<JournalEntry>>> CorporationJournal(int division, int page = 1,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<JournalEntry>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/wallets/{division}/journal/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() },
@@ -109,8 +131,13 @@ public async Task<EsiResponse<List<JournalEntry>>> CorporationJournal(int divisi
         /// <param name="division"></param>
         /// <param name="from_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Transaction>>> CorporationTransactions(int division, long from_id)
-            => await Execute<List<Transaction>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get, "/corporations/{corporation_id}/wallets/{division}/transactions/",
+        public async Task<EsiResponse<List<Transaction>>> CorporationTransactions(int division, long from_id,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Transaction>>(_client, _config, RequestSecurity.Authenticated, HttpMethod.Get,
+                "/corporations/{corporation_id}/wallets/{division}/transactions/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "corporation_id", corporation_id.ToString() },
diff --git a/ESI.NET/Logic/WarsLogic.cs b/ESI.NET/Logic/WarsLogic.cs
index a947118..00fb765 100644
--- a/ESI.NET/Logic/WarsLogic.cs
+++ b/ESI.NET/Logic/WarsLogic.cs
@@ -1,6 +1,7 @@
 using ESI.NET.Models.Wars;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using static ESI.NET.EsiRequest;
 
@@ -10,14 +11,20 @@ public class WarsLogic
     {
         private readonly HttpClient _client;
         private readonly EsiConfig _config;
-        public WarsLogic(HttpClient client, EsiConfig config) { _client = client; _config = config; }
+
+        public WarsLogic(HttpClient client, EsiConfig config)
+        {
+            _client = client;
+            _config = config;
+        }
 
         /// <summary>
         /// /wars/
         /// </summary>
         /// <param name="max_war_id">Only return wars with ID smaller than this</param>
         /// <returns></returns>
-        public async Task<EsiResponse<int[]>> All(long max_war_id = 0)
+        public async Task<EsiResponse<int[]>> All(long max_war_id = 0, string eTag = null,
+            CancellationToken cancellationToken = default)
         {
             var parameters = new List<string>();
 
@@ -25,6 +32,8 @@ public async Task<EsiResponse<int[]>> All(long max_war_id = 0)
                 parameters.Add($"max_war_id={max_war_id}");
 
             var response = await Execute<int[]>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/wars/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 parameters: parameters.ToArray());
 
             return response;
@@ -35,8 +44,11 @@ public async Task<EsiResponse<int[]>> All(long max_war_id = 0)
         /// </summary>
         /// <param name="war_id"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<War>> Information(int war_id)
+        public async Task<EsiResponse<War>> Information(int war_id, string eTag = null,
+            CancellationToken cancellationToken = default)
             => await Execute<War>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/wars/{war_id}/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "war_id", war_id.ToString() }
@@ -48,8 +60,13 @@ public async Task<EsiResponse<War>> Information(int war_id)
         /// <param name="war_id"></param>
         /// <param name="page"></param>
         /// <returns></returns>
-        public async Task<EsiResponse<List<Models.Killmails.Killmail>>> Kills(int war_id, int page = 1)
-            => await Execute<List<Models.Killmails.Killmail>>(_client, _config, RequestSecurity.Public, HttpMethod.Get, "/wars/{war_id}/killmails/",
+        public async Task<EsiResponse<List<Models.Killmails.Killmail>>> Kills(int war_id, int page = 1,
+            string eTag = null,
+            CancellationToken cancellationToken = default)
+            => await Execute<List<Models.Killmails.Killmail>>(_client, _config, RequestSecurity.Public, HttpMethod.Get,
+                "/wars/{war_id}/killmails/",
+                eTag: eTag,
+                cancellationToken: cancellationToken,
                 replacements: new Dictionary<string, string>()
                 {
                     { "war_id", war_id.ToString() }
diff --git a/ESI.NET/Logic/_SSOLogic.cs b/ESI.NET/Logic/_SSOLogic.cs
index b5b8be2..9539b7f 100644
--- a/ESI.NET/Logic/_SSOLogic.cs
+++ b/ESI.NET/Logic/_SSOLogic.cs
@@ -12,6 +12,7 @@
 using System.Net.Http.Headers;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace ESI.NET
@@ -38,6 +39,7 @@ public SsoLogic(HttpClient client, EsiConfig config)
                     _ssoUrl = "login.evepc.163.com";
                     break;
             }
+
             _clientKey = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{config.ClientId}:{config.SecretKey}"));
         }
 
@@ -49,9 +51,11 @@ public SsoLogic(HttpClient client, EsiConfig config)
         /// <param name="code_challenge">All hashing/encryption will be done automatically. Just provide the code.</param>
         /// <param name=""></param>
         /// <returns></returns>
-        public string CreateAuthenticationUrl(List<string> scope = null, string state = null, string challengeCode = null)
+        public string CreateAuthenticationUrl(List<string> scope = null, string state = null,
+            string challengeCode = null)
         {
-            var url = $"https://{_ssoUrl}/v2/oauth/authorize/?response_type=code&redirect_uri={Uri.EscapeDataString(_config.CallbackUrl)}&client_id={_config.ClientId}";
+            var url =
+                $"https://{_ssoUrl}/v2/oauth/authorize/?response_type=code&redirect_uri={Uri.EscapeDataString(_config.CallbackUrl)}&client_id={_config.ClientId}";
 
             if (scope != null)
                 url = $"{url}&scope={string.Join("+", scope.Distinct().ToList())}";
@@ -65,7 +69,8 @@ public string CreateAuthenticationUrl(List<string> scope = null, string state =
 
                 using (var sha256 = SHA256.Create())
                 {
-                    var base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(challengeCode)).TrimEnd('=').Replace('+', '-').Replace('/', '_');
+                    var base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(challengeCode)).TrimEnd('=')
+                        .Replace('+', '-').Replace('/', '_');
                     var bytes = sha256.ComputeHash(Encoding.UTF8.GetBytes(base64));
                     var code_challenge = Convert.ToBase64String(bytes).TrimEnd('=').Replace('+', '-').Replace('/', '_');
 
@@ -75,7 +80,7 @@ public string CreateAuthenticationUrl(List<string> scope = null, string state =
 
             return url;
         }
-        
+
         public string GenerateChallengeCode()
         {
             const string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@@ -89,7 +94,7 @@ public string GenerateChallengeCode()
         /// <param name="code">The authorization_code or the refresh_token</param>
         /// <param name="codeChallenge">Provide the same value that was provided for codeChallenge in CreateAuthenticationUrl(). All hashing/encryption will be done automatically. Just provide the code.</param>
         /// <returns></returns>
-        public async Task<SsoToken> GetToken(GrantType grantType, string code, string codeChallenge = null)
+        public async Task<SsoToken> GetToken(GrantType grantType, string code, string codeChallenge = null, CancellationToken cancellationToken = default)
         {
             var body = $"grant_type={grantType.ToEsiValue()}";
             if (grantType == GrantType.AuthorizationCode)
@@ -102,12 +107,12 @@ public async Task<SsoToken> GetToken(GrantType grantType, string code, string co
                     var base64 = Convert.ToBase64String(bytes).TrimEnd('=').Replace('+', '-').Replace('/', '_');
                     body += $"&code_verifier={base64}&client_id={_config.ClientId}";
                 }
-            }   
+            }
             else if (grantType == GrantType.RefreshToken)
             {
                 body += $"&refresh_token={Uri.EscapeDataString(code)}";
 
-                if(codeChallenge != null)
+                if (codeChallenge != null)
                     body += $"&client_id={_config.ClientId}";
             }
 
@@ -115,18 +120,19 @@ public async Task<SsoToken> GetToken(GrantType grantType, string code, string co
             {
                 Content = new StringContent(body, Encoding.UTF8, "application/x-www-form-urlencoded"),
             };
-            if(codeChallenge == null)
+            if (codeChallenge == null)
             {
                 request.Headers.Authorization = new AuthenticationHeaderValue("Basic", _clientKey);
                 request.Headers.Host = _ssoUrl;
             }
 
-            var response = await _client.SendAsync(request);
+            var response = await _client.SendAsync(request, cancellationToken);
             var content = await response.Content.ReadAsStringAsync();
 
             if (response.StatusCode != HttpStatusCode.OK)
             {
-                var error = JsonConvert.DeserializeAnonymousType(content, new { error_description = string.Empty }).error_description;
+                var error = JsonConvert.DeserializeAnonymousType(content, new { error_description = string.Empty })
+                    .error_description;
                 throw new ArgumentException(error);
             }
 
@@ -141,7 +147,7 @@ public async Task<SsoToken> GetToken(GrantType grantType, string code, string co
         /// </summary>
         /// <param name="code">refresh_token to revoke</param>
         /// <returns></returns>
-        public async Task RevokeToken(string code)
+        public async Task RevokeToken(string code, CancellationToken cancellationToken = default)
         {
             var body = $"token_type_hint={GrantType.RefreshToken.ToEsiValue()}";
             body += $"&token={Uri.EscapeDataString(code)}";
@@ -149,12 +155,13 @@ public async Task RevokeToken(string code)
             HttpContent postBody = new StringContent(body, Encoding.UTF8, "application/x-www-form-urlencoded");
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", _clientKey);
 
-            var response = await _client.PostAsync($"https://{_ssoUrl}/v2/oauth/revoke", postBody);
+            var response = await _client.PostAsync($"https://{_ssoUrl}/v2/oauth/revoke", postBody, cancellationToken);
             var content = await response.Content.ReadAsStringAsync();
 
             if (response.StatusCode != HttpStatusCode.OK)
             {
-                var error = JsonConvert.DeserializeAnonymousType(content, new { error_description = string.Empty }).error_description;
+                var error = JsonConvert.DeserializeAnonymousType(content, new { error_description = string.Empty })
+                    .error_description;
                 throw new ArgumentException(error);
             }
         }
@@ -167,7 +174,7 @@ public async Task RevokeToken(string code)
         /// </summary>
         /// <param name="token"></param>
         /// <returns></returns>
-        public async Task<AuthorizedCharacterData> Verify(SsoToken token)
+        public async Task<AuthorizedCharacterData> Verify(SsoToken token, CancellationToken cancellationToken = default)
         {
             AuthorizedCharacterData authorizedCharacter = new AuthorizedCharacterData();
 
@@ -200,7 +207,7 @@ public async Task<AuthorizedCharacterData> Verify(SsoToken token)
                 var subjectClaim = jwtValidatedToken.Claims.SingleOrDefault(c => c.Type == "sub").Value;
                 var nameClaim = jwtValidatedToken.Claims.SingleOrDefault(c => c.Type == "name").Value;
                 var ownerClaim = jwtValidatedToken.Claims.SingleOrDefault(c => c.Type == "owner").Value;
-                
+
                 var returnedScopes = jwtValidatedToken.Claims.Where(c => c.Type == "scp");
                 var scopesClaim = string.Join(" ", returnedScopes.Select(s => s.Value));
 
@@ -213,15 +220,18 @@ public async Task<AuthorizedCharacterData> Verify(SsoToken token)
                 authorizedCharacter.Scopes = scopesClaim;
 
                 // Get more specifc details about authorized character to be used in API calls that require this data about the character
-                var url = $"{_config.EsiUrl}latest/characters/affiliation/?datasource={_config.DataSource.ToEsiValue()}";
-                var body = new StringContent(JsonConvert.SerializeObject(new int[] { authorizedCharacter.CharacterID }), Encoding.UTF8, "application/json");
+                var url =
+                    $"{_config.EsiUrl}latest/characters/affiliation/?datasource={_config.DataSource.ToEsiValue()}";
+                var body = new StringContent(JsonConvert.SerializeObject(new int[] { authorizedCharacter.CharacterID }),
+                    Encoding.UTF8, "application/json");
 
                 var client = new HttpClient();
-                var characterResponse = await client.PostAsync(url, body).ConfigureAwait(false);
+                var characterResponse = await client.PostAsync(url, body, cancellationToken).ConfigureAwait(false);
 
                 if (characterResponse.StatusCode == HttpStatusCode.OK)
                 {
-                    EsiResponse<List<Affiliation>> affiliations = new EsiResponse<List<Affiliation>>(characterResponse, "Post|/character/affiliations/");
+                    EsiResponse<List<Affiliation>> affiliations =
+                        new EsiResponse<List<Affiliation>>(characterResponse, "Post|/character/affiliations/");
                     var characterData = affiliations.Data.First();
 
                     authorizedCharacter.AllianceID = characterData.AllianceId;
@@ -237,4 +247,4 @@ public async Task<AuthorizedCharacterData> Verify(SsoToken token)
             return authorizedCharacter;
         }
     }
-}
+}
\ No newline at end of file