From 2756173cd23f4e3a990d2a2ced9136d33d61811b Mon Sep 17 00:00:00 2001
From: Foo <34515228+fooooooooooooooo@users.noreply.github.com>
Date: Fri, 10 Sep 2021 04:23:10 -0700
Subject: [PATCH 1/4] rewrite of entire library

---
 .gitignore                                 |   4 +-
 .idea/.idea.KSoftNet/.idea/workspace.xml   | 115 ++-
 KSoftNet.Tests/HttpLoggingHandler.cs       |  86 +++
 KSoftNet.Tests/KSoftAPIUnitTest.cs         | 597 ++++++++-------
 KSoftNet.sln                               |   8 +
 KSoftNet.sln.DotSettings                   |  13 +
 KSoftNet/AssemblyInfo.cs                   |   3 +
 KSoftNet/Endpoints/IBansApi.cs             |  86 +++
 KSoftNet/Endpoints/IImagesApi.cs           |  83 +++
 KSoftNet/Endpoints/IKumoApi.cs             |  66 ++
 KSoftNet/Endpoints/IMusicApi.cs            |  68 ++
 KSoftNet/Enums/CurrencyCode.cs             | 816 +++++++++++++++++++++
 KSoftNet/Enums/IconPack.cs                 |  11 +
 KSoftNet/Enums/Language.cs                 | 216 ++++++
 KSoftNet/Enums/ReportType.cs               |  26 +
 KSoftNet/Enums/Span.cs                     |  38 +
 KSoftNet/Enums/Unit.cs                     |  31 +
 KSoftNet/KSoft/BansAPI.cs                  | 112 ---
 KSoftNet/KSoft/ImagesAPI.cs                | 116 ---
 KSoftNet/KSoft/KumoAPI.cs                  |  78 --
 KSoftNet/KSoft/MusicAPI.cs                 |  80 --
 KSoftNet/KSoftAPI.cs                       | 174 ++---
 KSoftNet/KSoftNet.csproj                   |   3 +-
 KSoftNet/Models/Bans/Ban.cs                |  14 +
 KSoftNet/Models/Bans/BanCheck.cs           |  14 +
 KSoftNet/Models/Bans/BanDeletion.cs        |  14 +
 KSoftNet/Models/Bans/BanInfo.cs            |  74 ++
 KSoftNet/Models/Bans/BanList.cs            |  57 ++
 KSoftNet/Models/Bans/BanUpdates.cs         |  57 ++
 KSoftNet/Models/Images/Image.cs            |  32 +
 KSoftNet/Models/Images/RedditPost.cs       |  86 +++
 KSoftNet/Models/Images/TagList.cs          |  44 ++
 KSoftNet/Models/Images/WikihowPost.cs      |  25 +
 KSoftNet/Models/KSoftAlbumInfo.cs          |  29 -
 KSoftNet/Models/KSoftArtistInfo.cs         |  27 -
 KSoftNet/Models/KSoftBan.cs                |  11 -
 KSoftNet/Models/KSoftBanCheck.cs           |   5 -
 KSoftNet/Models/KSoftBanDeletion.cs        |  10 -
 KSoftNet/Models/KSoftBanInfo.cs            |  24 -
 KSoftNet/Models/KSoftBanList.cs            |  34 -
 KSoftNet/Models/KSoftBanUpdates.cs         |  16 -
 KSoftNet/Models/KSoftCurrency.cs           |  11 -
 KSoftNet/Models/KSoftGeoIP.cs              |  30 -
 KSoftNet/Models/KSoftImage.cs              |  14 -
 KSoftNet/Models/KSoftLocation.cs           |  19 -
 KSoftNet/Models/KSoftLyrics.cs             |  22 -
 KSoftNet/Models/KSoftRecommendations.cs    |  42 --
 KSoftNet/Models/KSoftRedditPost.cs         |  17 -
 KSoftNet/Models/KSoftTags.cs               |  14 -
 KSoftNet/Models/KSoftTrackInfo.cs          |  53 --
 KSoftNet/Models/KSoftWeather.cs            |  55 --
 KSoftNet/Models/KSoftWikiHowPost.cs        |   8 -
 KSoftNet/Models/Kumo/Currency.cs           |  20 +
 KSoftNet/Models/Kumo/GeoIp.cs              | 126 ++++
 KSoftNet/Models/Kumo/Location.cs           |  57 ++
 KSoftNet/Models/Kumo/Weather.cs            | 207 ++++++
 KSoftNet/Models/Music/Album.cs             |  26 +
 KSoftNet/Models/Music/AlbumInfo.cs         |  35 +
 KSoftNet/Models/Music/Artist.cs            |  20 +
 KSoftNet/Models/Music/ArtistInfo.cs        |  34 +
 KSoftNet/Models/Music/Recommendations.cs   | 161 ++++
 KSoftNet/Models/Music/Track.cs             |  18 +
 KSoftNet/Models/Music/TrackInfo.cs         |  38 +
 KSoftNet/Requests/BanRequest.cs            |  50 ++
 KSoftNet/Requests/RecommendationRequest.cs |  45 ++
 KSoftNet/Utils/ParameterFormatter.cs       | 110 +++
 66 files changed, 3389 insertions(+), 1246 deletions(-)
 create mode 100644 KSoftNet.Tests/HttpLoggingHandler.cs
 create mode 100644 KSoftNet.sln.DotSettings
 create mode 100644 KSoftNet/AssemblyInfo.cs
 create mode 100644 KSoftNet/Endpoints/IBansApi.cs
 create mode 100644 KSoftNet/Endpoints/IImagesApi.cs
 create mode 100644 KSoftNet/Endpoints/IKumoApi.cs
 create mode 100644 KSoftNet/Endpoints/IMusicApi.cs
 create mode 100644 KSoftNet/Enums/CurrencyCode.cs
 create mode 100644 KSoftNet/Enums/IconPack.cs
 create mode 100644 KSoftNet/Enums/Language.cs
 create mode 100644 KSoftNet/Enums/ReportType.cs
 create mode 100644 KSoftNet/Enums/Span.cs
 create mode 100644 KSoftNet/Enums/Unit.cs
 delete mode 100644 KSoftNet/KSoft/BansAPI.cs
 delete mode 100644 KSoftNet/KSoft/ImagesAPI.cs
 delete mode 100644 KSoftNet/KSoft/KumoAPI.cs
 delete mode 100644 KSoftNet/KSoft/MusicAPI.cs
 create mode 100644 KSoftNet/Models/Bans/Ban.cs
 create mode 100644 KSoftNet/Models/Bans/BanCheck.cs
 create mode 100644 KSoftNet/Models/Bans/BanDeletion.cs
 create mode 100644 KSoftNet/Models/Bans/BanInfo.cs
 create mode 100644 KSoftNet/Models/Bans/BanList.cs
 create mode 100644 KSoftNet/Models/Bans/BanUpdates.cs
 create mode 100644 KSoftNet/Models/Images/Image.cs
 create mode 100644 KSoftNet/Models/Images/RedditPost.cs
 create mode 100644 KSoftNet/Models/Images/TagList.cs
 create mode 100644 KSoftNet/Models/Images/WikihowPost.cs
 delete mode 100644 KSoftNet/Models/KSoftAlbumInfo.cs
 delete mode 100644 KSoftNet/Models/KSoftArtistInfo.cs
 delete mode 100644 KSoftNet/Models/KSoftBan.cs
 delete mode 100644 KSoftNet/Models/KSoftBanCheck.cs
 delete mode 100644 KSoftNet/Models/KSoftBanDeletion.cs
 delete mode 100644 KSoftNet/Models/KSoftBanInfo.cs
 delete mode 100644 KSoftNet/Models/KSoftBanList.cs
 delete mode 100644 KSoftNet/Models/KSoftBanUpdates.cs
 delete mode 100644 KSoftNet/Models/KSoftCurrency.cs
 delete mode 100644 KSoftNet/Models/KSoftGeoIP.cs
 delete mode 100644 KSoftNet/Models/KSoftImage.cs
 delete mode 100644 KSoftNet/Models/KSoftLocation.cs
 delete mode 100644 KSoftNet/Models/KSoftLyrics.cs
 delete mode 100644 KSoftNet/Models/KSoftRecommendations.cs
 delete mode 100644 KSoftNet/Models/KSoftRedditPost.cs
 delete mode 100644 KSoftNet/Models/KSoftTags.cs
 delete mode 100644 KSoftNet/Models/KSoftTrackInfo.cs
 delete mode 100644 KSoftNet/Models/KSoftWeather.cs
 delete mode 100644 KSoftNet/Models/KSoftWikiHowPost.cs
 create mode 100644 KSoftNet/Models/Kumo/Currency.cs
 create mode 100644 KSoftNet/Models/Kumo/GeoIp.cs
 create mode 100644 KSoftNet/Models/Kumo/Location.cs
 create mode 100644 KSoftNet/Models/Kumo/Weather.cs
 create mode 100644 KSoftNet/Models/Music/Album.cs
 create mode 100644 KSoftNet/Models/Music/AlbumInfo.cs
 create mode 100644 KSoftNet/Models/Music/Artist.cs
 create mode 100644 KSoftNet/Models/Music/ArtistInfo.cs
 create mode 100644 KSoftNet/Models/Music/Recommendations.cs
 create mode 100644 KSoftNet/Models/Music/Track.cs
 create mode 100644 KSoftNet/Models/Music/TrackInfo.cs
 create mode 100644 KSoftNet/Requests/BanRequest.cs
 create mode 100644 KSoftNet/Requests/RecommendationRequest.cs
 create mode 100644 KSoftNet/Utils/ParameterFormatter.cs

diff --git a/.gitignore b/.gitignore
index 37d91f3..71370ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -538,4 +538,6 @@ obj/
 
 # Ionide (cross platform F# VS Code tools) working folder
 
-# End of https://www.toptal.com/developers/gitignore/api/visualstudio,csharp,dotnetcore,git
\ No newline at end of file
+# End of https://www.toptal.com/developers/gitignore/api/visualstudio,csharp,dotnetcore,git
+
+KSoftNet.Tests/config.json
\ No newline at end of file
diff --git a/.idea/.idea.KSoftNet/.idea/workspace.xml b/.idea/.idea.KSoftNet/.idea/workspace.xml
index 1a29f21..955c923 100644
--- a/.idea/.idea.KSoftNet/.idea/workspace.xml
+++ b/.idea/.idea.KSoftNet/.idea/workspace.xml
@@ -2,27 +2,71 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="dd0674aa-9d82-49ee-9c9e-8f97ae15a1f2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/indexLayout.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/projectSettingsUpdater.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.editorconfig" beforeDir="false" afterPath="$PROJECT_DIR$/.editorconfig" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet.Tests/HttpLoggingHandler.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet.sln.DotSettings" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/AssemblyInfo.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IBansApi.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IImagesApi.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IKumoApi.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IMusicApi.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/CurrencyCode.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/IconPack.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/Language.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/ReportType.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/Span.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/Unit.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/Ban.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanCheck.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanDeletion.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanInfo.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanList.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanUpdates.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/Image.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/RedditPost.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/TagList.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/WikihowPost.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/Currency.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/GeoIp.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/Location.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/Weather.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Album.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/AlbumInfo.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Artist.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/ArtistInfo.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Recommendations.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Track.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/TrackInfo.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Requests/BanRequest.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Requests/RecommendationRequest.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet/Utils/ParameterFormatter.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/KSoftNet.Tests/KSoftAPIUnitTest.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet.Tests/KSoftAPIUnitTest.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet.Tests/KSoftNet.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet.Tests/KSoftNet.Tests.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/BansAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoft/BansAPI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/ImagesAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoft/ImagesAPI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/KumoAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoft/KumoAPI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/MusicAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoft/MusicAPI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoftAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoftAPI.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet.sln" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet.sln" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/BansAPI.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/ImagesAPI.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/KumoAPI.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/MusicAPI.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoftAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoftApi.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/KSoftNet/KSoftNet.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoftNet.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftAlbumInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftAlbumInfo.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftCurrency.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftCurrency.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftImage.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftImage.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftRedditPost.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftRedditPost.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftTags.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftTags.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftTrackInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftTrackInfo.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftWeather.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftWeather.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftWikiHowPost.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/Models/KSoftWikiHowPost.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftAlbumInfo.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftArtistInfo.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBan.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanCheck.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanDeletion.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanInfo.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanList.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanUpdates.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftCurrency.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftGeoIP.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftImage.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftLocation.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftLyrics.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftRecommendations.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftRedditPost.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftTags.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftTrackInfo.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftWeather.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftWikiHowPost.cs" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,21 +76,40 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/8e4ffc2d570f4dcc8010b8f942b6229f21a68/1F/RestService.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/23179fa051e04dfc8d03e8cf341a8083114570/39/HttpClientHandler.Core.cs" root0="SKIP_HIGHLIGHTING" />
+  </component>
   <component name="IdeDocumentHistory">
     <changedPaths>
       <option value="$PROJECT_DIR$/.editorconfig" />
       <option value="$PROJECT_DIR$/KSoftNet/KSoftAPI.cs" />
       <option value="$PROJECT_DIR$/KSoftNet/KSoft/MusicAPI.cs" />
       <option value="$PROJECT_DIR$/KSoftNet/Models/KSoftCurrency.cs" />
+      <option value="$PROJECT_DIR$/KSoftNet/Models/KSoftImage.cs" />
     </changedPaths>
   </component>
   <component name="ProjectId" id="1pseNAQgpHSTDoPQ7oLMjzb8RIA" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="autoscrollFromSource" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
+    <property name="DebuggerViewTab_PTCS_FirstProportionKey" value="0.3501355" />
+    <property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.0" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
@@ -54,9 +117,15 @@
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C#" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="settings.editor.selected.configurable" value="RiderCSharpLiveTemplatesSettingsId" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
+  <component name="RunAnythingCache">
+    <option name="myCommands">
+      <command value="Console.WriteLine(&quot;pog&quot;)" />
+    </option>
+  </component>
   <component name="RunManager" selected="Publish to folder.Build NuGet Package">
     <configuration name="Build NuGet Package" type="DotNetFolderPublish" factoryName="Publish to folder">
       <riderPublish configuration="Release" platform="Any CPU" runtime="Portable" target_folder="$PROJECT_DIR$/KSoftNet/bin/Release/netcoreapp2.1/publish" target_framework="netcoreapp2.1" uuid_high="-4150296797865556607" uuid_low="-4799663196355406114" />
@@ -75,7 +144,9 @@
       <option name="presentableId" value="Default" />
       <updated>1615976183439</updated>
       <workItem from="1615976186230" duration="618000" />
-      <workItem from="1615976820709" duration="2631000" />
+      <workItem from="1615976820709" duration="3328000" />
+      <workItem from="1631191289148" duration="25345000" />
+      <workItem from="1631263325061" duration="9405000" />
     </task>
     <servers />
   </component>
@@ -108,6 +179,7 @@
       <select />
     </coverage-tree-state>
   </component>
+  <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
   <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
   <component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
   <component name="Vcs.Log.Tabs.Properties">
@@ -123,6 +195,7 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/KSoftNet.Tests/HttpLoggingHandler.cs b/KSoftNet.Tests/HttpLoggingHandler.cs
new file mode 100644
index 0000000..187f76d
--- /dev/null
+++ b/KSoftNet.Tests/HttpLoggingHandler.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KSoftNet.Tests {
+  public class HttpLoggingHandler : DelegatingHandler {
+    public HttpLoggingHandler(HttpMessageHandler innerHandler = null)
+      : base(innerHandler ?? new HttpClientHandler()) { }
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) {
+      var id = Guid.NewGuid().ToString();
+      var msg = $"[{id} -   Request]";
+
+      Console.WriteLine($"{msg}========Start==========");
+      Console.WriteLine($"{msg} {request.Method} {request.RequestUri.PathAndQuery} {request.RequestUri.Scheme}/{request.Version}");
+      Console.WriteLine($"{msg} Host: {request.RequestUri.Scheme}://{request.RequestUri.Host}");
+
+      foreach (var (key, value) in request.Headers)
+        Console.WriteLine($"{msg} {key}: {string.Join(", ", value)}");
+
+      if (request.Content != null) {
+        foreach (var (key, value) in request.Content.Headers)
+          Console.WriteLine($"{msg} {key}: {string.Join(", ", value)}");
+
+        if (request.Content is StringContent || IsTextBasedContentType(request.Headers) || request.Content is JsonContent || IsTextBasedContentType(request.Content.Headers)) {
+          var result = await request.Content.ReadAsStringAsync();
+
+          Console.WriteLine($"{msg} Content:");
+          Console.WriteLine($"{msg} {string.Join("", result.Take(8192))}...");
+
+        }
+      }
+
+      var start = DateTime.Now;
+
+      var response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+      var end = DateTime.Now;
+
+      Console.WriteLine($"{msg} Duration: {end - start}");
+      Console.WriteLine($"{msg}==========End==========");
+
+      msg = $"[{id} - Response]";
+      Console.WriteLine($"{msg}=========Start=========");
+
+      Console.WriteLine($"{msg} {request.RequestUri.Scheme.ToUpper()}/{response.Version} {(int)response.StatusCode} {response.ReasonPhrase}");
+
+      foreach (var (key, value) in response.Headers)
+        Console.WriteLine($"{msg} {key}: {string.Join(", ", value)}");
+
+      if (response.Content != null) {
+        foreach (var (key, value) in response.Content.Headers)
+          Console.WriteLine($"{msg} {key}: {string.Join(", ", value)}");
+
+        if (response.Content is StringContent || IsTextBasedContentType(response.Headers) || IsTextBasedContentType(response.Content.Headers)) {
+          start = DateTime.Now;
+          var result = await response.Content.ReadAsStringAsync();
+          end = DateTime.Now;
+
+          Console.WriteLine($"{msg} Content:");
+          Console.WriteLine($"{msg} {string.Join("", result.Take(8192))}...");
+          Console.WriteLine($"{msg} Duration: {end - start}");
+        }
+      }
+
+      Console.WriteLine($"{msg}==========End==========");
+
+      return response;
+    }
+
+    private readonly string[] _types = { "html", "text", "xml", "json", "txt", "x-www-form-urlencoded" };
+
+    private bool IsTextBasedContentType(HttpHeaders headers) {
+
+      if (!headers.TryGetValues("Content-Type", out var values))
+        return false;
+      var header = string.Join(" ", values).ToLowerInvariant();
+
+      return _types.Any(t => header.Contains(t));
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/KSoftNet.Tests/KSoftAPIUnitTest.cs b/KSoftNet.Tests/KSoftAPIUnitTest.cs
index cd8ef0b..7877b5e 100644
--- a/KSoftNet.Tests/KSoftAPIUnitTest.cs
+++ b/KSoftNet.Tests/KSoftAPIUnitTest.cs
@@ -1,336 +1,371 @@
 using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using KSoftNet.Enums;
+using KSoftNet.Utils;
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 
 namespace KSoftNet.Tests {
-    [TestClass]
-    public class KSoftAPIUnitTest {
 
-
-        private readonly JsonSerializerSettings _jsonSettings = new JsonSerializerSettings {
-            ContractResolver = new DefaultContractResolver {
-                NamingStrategy = new SnakeCaseNamingStrategy()
-            }
-        };
-
-        private readonly KSoftAPI _kSoftAPI;
-
-        public KSoftAPIUnitTest() {
-            var configuration = new ConfigurationBuilder().AddJsonFile("config.json").Build();
-            var token = configuration["token"];
-
-            _kSoftAPI = new KSoftAPI(token);
-        }
-
-        private void LogObject(object obj) {
-            Console.WriteLine(JsonConvert.SerializeObject(obj, _jsonSettings));
-        }
-
-        // I know that these are not really unit tests and that they're bad tests in general
-        // but they are just so I can click a button and know that I didn't horribly break
-        // something :)
-
-        [TestMethod]
-        public void TestCreation() {
-            Assert.IsNotNull(_kSoftAPI.imagesAPI);
-            Assert.IsNotNull(_kSoftAPI.kumoAPI);
-            Assert.IsNotNull(_kSoftAPI.musicAPI);
-            Assert.IsNotNull(_kSoftAPI.imagesAPI);
-            Assert.IsNotNull(KSoftAPI.BaseUrl);
-        }
-
-        [TestMethod]
-        public async Task TestRandomImage() {
-            var image = await _kSoftAPI.imagesAPI.RandomImage("pepe");
-
-            LogObject(image);
-
-            Assert.AreNotEqual(404, image.Code);
-            Assert.IsFalse(image.Nsfw);
-            Assert.IsNotNull(image.Url);
-            Assert.IsNotNull(image.Snowflake);
-            Assert.IsNotNull(image.Tag);
-        }
-
-        [TestMethod]
-        public async Task TestTags() {
-            var tags = await _kSoftAPI.imagesAPI.Tags();
-
-            LogObject(tags);
-
-            Assert.IsNotNull(tags.Models);
-            Assert.IsNotNull(tags.NsfwTags);
-            Assert.IsNotNull(tags.Tags);
+  /// <summary>
+  /// Not real unit tests
+  /// </summary>
+  [TestClass]
+  public class KSoftApiUnitTest {
+    private readonly KSoftApi _kSoftApi;
+    public KSoftApiUnitTest() {
+      var configuration = new ConfigurationBuilder().AddJsonFile("config.json").Build();
+      var token = configuration["token"];
+      // _kSoftApi = new KSoftApi(token);
+      var httpClient = new HttpClient(new HttpLoggingHandler()) {
+        BaseAddress = new Uri("https://api.ksoft.si"),
+        DefaultRequestHeaders = {
+          Authorization = new AuthenticationHeaderValue("Bearer", token)
         }
+      };
+      _kSoftApi = new KSoftApi(httpClient);
+    }
 
-        [TestMethod]
-        public async Task TestTagSearch() {
-            var tags = await _kSoftAPI.imagesAPI.TagSearch("birb");
-
-            LogObject(tags);
+    [TestMethod]
+    public void TestUrlFormatter() {
+      var formatter = new ParameterFormatter();
+
+      Assert.AreEqual("auto", formatter.Format(Unit.Auto, null, typeof(Unit)));
+      Assert.AreEqual("uk2", formatter.Format(Unit.Uk2, null, typeof(Unit)));
+      Assert.AreEqual("us", formatter.Format(Unit.Us, null, typeof(Unit)));
+      Assert.AreEqual("AUD", formatter.Format(CurrencyCode.Aud, null, typeof(CurrencyCode)));
+      Assert.AreEqual("ar", formatter.Format(Language.Ar, null, typeof(Language)));
+      Assert.AreEqual("x-pig-latin", formatter.Format(Language.XPigLatin, null, typeof(Language)));
+      Assert.AreEqual("zh-tw", formatter.Format(Language.ZhTw, null, typeof(Language)));
+      Assert.AreEqual("original", formatter.Format(IconPack.Original, null, typeof(IconPack)));
+      Assert.AreEqual("currently", formatter.Format(ReportType.Currently, null, typeof(ReportType)));
+      Assert.AreEqual("hourly", formatter.Format(ReportType.Hourly, null, typeof(ReportType)));
+      Assert.AreEqual("all", formatter.Format(Span.All, null, typeof(Span)));
+      Assert.AreEqual("month", formatter.Format(Span.Month, null, typeof(Span)));
+      Assert.AreEqual("year", formatter.Format(Span.Year, null, typeof(Span)));
+    }
 
-            Assert.IsNotNull(tags.Models);
-            Assert.IsNotNull(tags.Tags);
-        }
+    [TestMethod]
+    public void TestKebabFormatter() {
+      const string test1 = "TestCase";
+      const string test2 = "testcase";
+      const string test3 = "testCase";
+      const string test4 = "Test1Case";
+      const string test5 = "TestCase1";
+      const string test6 = "Test-Case1";
+
+      Assert.AreEqual("test-case", test1.PascalToKebabCase());
+      Assert.AreEqual("testcase", test2.PascalToKebabCase());
+      Assert.AreEqual("test-case", test3.PascalToKebabCase());
+      Assert.AreEqual("test-1-case", test4.PascalToKebabCase());
+      Assert.AreEqual("test-case-1", test5.PascalToKebabCase());
+      Assert.AreEqual("test-case-1", test6.PascalToKebabCase());
+    }
 
-        [TestMethod]
-        public async Task TestImageFromSnowflake() {
-            var image = await _kSoftAPI.imagesAPI.ImageFromSnowflake("i-7n36tlpw-30");
+    [TestMethod]
+    public void TestCreation() {
+      Assert.IsNotNull(_kSoftApi.ImagesApi);
+      Assert.IsNotNull(_kSoftApi.KumoApi);
+      Assert.IsNotNull(_kSoftApi.MusicApi);
+      Assert.IsNotNull(_kSoftApi.ImagesApi);
+    }
 
-            LogObject(image);
+    [TestMethod]
+    public async Task TestRandomImage() {
+      var image = await _kSoftApi.ImagesApi.GetRandomImage("pepe");
 
-            Assert.IsNotNull(image.Tag);
-            Assert.AreEqual("i-7n36tlpw-30", image.Snowflake);
-            Assert.IsNotNull(image.Nsfw);
-            Assert.IsNotNull(image.Url);
-        }
+      LogObject(image);
 
-        [TestMethod]
-        public async Task TestRandomMeme() {
-            var meme = await _kSoftAPI.imagesAPI.RandomMeme();
-
-            LogObject(meme);
-
-            Assert.IsNotNull(meme.ImageUrl);
-            Assert.IsNotNull(meme.Source);
-            Assert.IsNotNull(meme.Subreddit);
-            Assert.IsNotNull(meme.Nsfw);
-            Assert.IsNotNull(meme.Title);
-            Assert.IsNotNull(meme.Upvotes);
-            Assert.IsNotNull(meme.Downvotes);
-            Assert.IsNotNull(meme.Awards);
-            Assert.IsNotNull(meme.CreatedAt);
-            Assert.IsNotNull(meme.Comments);
-            Assert.IsNotNull(meme.Author);
-            Assert.IsNotNull(meme.MetaCached);
-            Assert.IsNotNull(meme.MetaProcessed);
-        }
+      Assert.IsFalse(image.Nsfw);
+      Assert.IsNotNull(image.Url);
+      Assert.IsNotNull(image.Snowflake);
+      Assert.IsNotNull(image.Tag);
+    }
 
-        [TestMethod]
-        public async Task TestRandomWikiHow() {
-            var wh = await _kSoftAPI.imagesAPI.RandomWikiHow();
+    [TestMethod]
+    public async Task TestTags() {
+      var tags = await _kSoftApi.ImagesApi.GetAllTags();
 
-            LogObject(wh);
+      LogObject(tags);
 
-            Assert.IsNotNull(wh.Url);
-            Assert.IsNotNull(wh.ArticleUrl);
-            Assert.IsFalse(wh.Nsfw);
-            Assert.IsNotNull(wh.Title);
-        }
+      Assert.IsNotNull(tags.Models);
+      Assert.IsNotNull(tags.NsfwTags);
+      Assert.IsNotNull(tags.Tags);
+    }
 
-        [TestMethod]
-        public async Task TestRandomAww() {
-            var aww = await _kSoftAPI.imagesAPI.RandomAww();
-
-            LogObject(aww);
-
-            Assert.IsNotNull(aww.ImageUrl);
-            Assert.IsNotNull(aww.Source);
-            Assert.IsNotNull(aww.Subreddit);
-            Assert.IsNotNull(aww.Nsfw);
-            Assert.IsNotNull(aww.Title);
-            Assert.IsNotNull(aww.Upvotes);
-            Assert.IsNotNull(aww.Downvotes);
-            Assert.IsNotNull(aww.Awards);
-            Assert.IsNotNull(aww.CreatedAt);
-            Assert.IsNotNull(aww.Comments);
-            Assert.IsNotNull(aww.Author);
-            Assert.IsNotNull(aww.MetaCached);
-            Assert.IsNotNull(aww.MetaProcessed);
-        }
+    [TestMethod]
+    public async Task TestTagSearch() {
+      var tags = await _kSoftApi.ImagesApi.SearchTags("birb");
 
-        [TestMethod]
-        public async Task TestRandomNsfw() {
-            var nsfw = await _kSoftAPI.imagesAPI.RandomNsfw(false);
-
-            LogObject(nsfw);
-
-            Assert.IsNotNull(nsfw.ImageUrl);
-            Assert.IsNotNull(nsfw.Source);
-            Assert.IsNotNull(nsfw.Subreddit);
-            Assert.IsTrue(nsfw.Nsfw);
-            Assert.IsNotNull(nsfw.Title);
-            Assert.IsNotNull(nsfw.Upvotes);
-            Assert.IsNotNull(nsfw.Downvotes);
-            Assert.IsNotNull(nsfw.Awards);
-            Assert.IsNotNull(nsfw.CreatedAt);
-            Assert.IsNotNull(nsfw.Comments);
-            Assert.IsNotNull(nsfw.Author);
-            Assert.IsNotNull(nsfw.MetaCached);
-            Assert.IsNotNull(nsfw.MetaProcessed);
-        }
+      LogObject(tags);
 
-        [TestMethod]
-        public async Task TestRandomReddit() {
-            var aww = await _kSoftAPI.imagesAPI.RandomReddit("pics", true, "day");
-
-            LogObject(aww);
-
-            Assert.IsNotNull(aww.ImageUrl);
-            Assert.IsNotNull(aww.Source);
-            Assert.IsNotNull(aww.Subreddit);
-            Assert.IsFalse(aww.Nsfw);
-            Assert.IsNotNull(aww.Title);
-            Assert.IsNotNull(aww.Upvotes);
-            Assert.IsNotNull(aww.Downvotes);
-            Assert.IsNotNull(aww.Awards);
-            Assert.IsNotNull(aww.CreatedAt);
-            Assert.IsNotNull(aww.Comments);
-            Assert.IsNotNull(aww.Author);
-            Assert.IsNotNull(aww.MetaCached);
-            Assert.IsNotNull(aww.MetaProcessed);
-        }
+      Assert.IsNotNull(tags.Models);
+      Assert.IsNotNull(tags.Tags);
+    }
 
-        [TestMethod]
-        public async Task TestGeoIP() {
-            var geoip = await _kSoftAPI.kumoAPI.GeoIP("8.8.8.8");
+    [TestMethod]
+    public async Task TestImageFromSnowflake() {
+      var image = await _kSoftApi.ImagesApi.GetImageFromId("i-7n36tlpw-30");
 
-            LogObject(geoip);
+      LogObject(image);
 
-            Assert.IsFalse(geoip.Error);
-            Assert.IsNotNull(geoip.Data);
-            Assert.AreEqual(200, geoip.Code);
-        }
+      Assert.IsNotNull(image.Tag);
+      Assert.AreEqual("i-7n36tlpw-30", image.Snowflake);
+      Assert.IsNotNull(image.Nsfw);
+      Assert.IsNotNull(image.Url);
+    }
 
-        [TestMethod]
-        public async Task TestCurrencyConversion() {
-            var currency = await _kSoftAPI.kumoAPI.CurrencyConversion("USD", "CAD", 100);
+    [TestMethod]
+    public async Task TestRandomMeme() {
+      var meme = await _kSoftApi.ImagesApi.GetRandomMeme();
+
+      LogObject(meme);
+
+      Assert.IsNotNull(meme.ImageUrl);
+      Assert.IsNotNull(meme.Source);
+      Assert.IsNotNull(meme.Subreddit);
+      Assert.IsNotNull(meme.Nsfw);
+      Assert.IsNotNull(meme.Title);
+      Assert.IsNotNull(meme.Upvotes);
+      Assert.IsNotNull(meme.Downvotes);
+      Assert.IsNotNull(meme.Awards);
+      Assert.IsNotNull(meme.CreatedAt);
+      Assert.IsNotNull(meme.Comments);
+      Assert.IsNotNull(meme.Author);
+      Assert.IsNotNull(meme.MetaCached);
+      Assert.IsNotNull(meme.MetaProcessed);
+    }
 
-            LogObject(currency);
+    [TestMethod]
+    public async Task TestRandomWikiHow() {
+      var wh = await _kSoftApi.ImagesApi.GetRandomWikihow();
 
-            Assert.IsFalse(currency.Error);
-            Assert.AreEqual(124.6437, currency.Value);
-            Assert.AreEqual("124.64 CAD", currency.Pretty);
-        }
+      LogObject(wh);
 
+      Assert.IsNotNull(wh.ImageUrl);
+      Assert.IsNotNull(wh.ArticleUrl);
+      Assert.IsFalse(wh.Nsfw);
+      Assert.IsNotNull(wh.Title);
+    }
 
-        [TestMethod]
-        public async Task TestSearchLyrics() {
-            var lyrics = await _kSoftAPI.musicAPI.SearchLyrics("Is this the real life? Is this just fantasy?", true, 1);
+    [TestMethod]
+    public async Task TestRandomAww() {
+      var aww = await _kSoftApi.ImagesApi.GetRandomAww();
+
+      LogObject(aww);
+
+      Assert.IsNotNull(aww.ImageUrl);
+      Assert.IsNotNull(aww.Source);
+      Assert.IsNotNull(aww.Subreddit);
+      Assert.IsNotNull(aww.Nsfw);
+      Assert.IsNotNull(aww.Title);
+      Assert.IsNotNull(aww.Upvotes);
+      Assert.IsNotNull(aww.Downvotes);
+      Assert.IsNotNull(aww.Awards);
+      Assert.IsNotNull(aww.CreatedAt);
+      Assert.IsNotNull(aww.Comments);
+      Assert.IsNotNull(aww.Author);
+      Assert.IsNotNull(aww.MetaCached);
+      Assert.IsNotNull(aww.MetaProcessed);
+    }
 
-            LogObject(lyrics);
+    [TestMethod]
+    public async Task TestRandomNsfw() {
+      var nsfw = await _kSoftApi.ImagesApi.GetRandomNsfw(false);
+
+      LogObject(nsfw);
+
+      Assert.IsNotNull(nsfw.ImageUrl);
+      Assert.IsNotNull(nsfw.Source);
+      Assert.IsNotNull(nsfw.Subreddit);
+      Assert.IsTrue(nsfw.Nsfw);
+      Assert.IsNotNull(nsfw.Title);
+      Assert.IsNotNull(nsfw.Upvotes);
+      Assert.IsNotNull(nsfw.Downvotes);
+      Assert.IsNotNull(nsfw.Awards);
+      Assert.IsNotNull(nsfw.CreatedAt);
+      Assert.IsNotNull(nsfw.Comments);
+      Assert.IsNotNull(nsfw.Author);
+      Assert.IsNotNull(nsfw.MetaCached);
+      Assert.IsNotNull(nsfw.MetaProcessed);
+    }
 
-            Assert.IsNotNull(lyrics.Total);
-            Assert.IsNotNull(lyrics.Data);
-            Assert.IsNotNull(lyrics.Took);
-        }
+    [TestMethod]
+    public async Task TestRandomReddit() {
+      var aww = await _kSoftApi.ImagesApi.GetRandomReddit("all", Span.Day, true);
+
+      LogObject(aww);
+
+      Assert.IsNotNull(aww.ImageUrl);
+      Assert.IsNotNull(aww.Source);
+      Assert.IsNotNull(aww.Subreddit);
+      Assert.IsFalse(aww.Nsfw);
+      Assert.IsNotNull(aww.Title);
+      Assert.IsNotNull(aww.Upvotes);
+      Assert.IsNotNull(aww.Downvotes);
+      Assert.IsNotNull(aww.Awards);
+      Assert.IsNotNull(aww.CreatedAt);
+      Assert.IsNotNull(aww.Comments);
+      Assert.IsNotNull(aww.Author);
+      Assert.IsNotNull(aww.MetaCached);
+      Assert.IsNotNull(aww.MetaProcessed);
+    }
 
-        [TestMethod]
-        public async Task TestArtistByID() {
-            var artist = await _kSoftAPI.musicAPI.ArtistByID(28333);
+    [TestMethod]
+    public async Task TestGeoIp() {
+      var geoip = await _kSoftApi.KumoApi.GeoIp("8.8.8.8");
 
-            LogObject(artist);
+      LogObject(geoip);
 
-            Assert.IsFalse(artist.Error);
-            Assert.AreEqual(28333, artist.Id);
-            Assert.IsNotNull(artist.Name);
-            Assert.IsNotNull(artist.Tracks);
-            Assert.IsNotNull(artist.Albums);
-            Assert.IsNotNull(artist.Uri);
-        }
+      Assert.IsFalse(geoip.Error);
+      Assert.IsNotNull(geoip.Data);
+      Assert.IsNotNull(geoip.Data.Apis);
+      Assert.IsNotNull(geoip.Data.Apis.Gis);
+      Assert.AreEqual(200, geoip.Code);
+    }
 
-        [TestMethod]
-        public async Task TestAlbumByID() {
-            var album = await _kSoftAPI.musicAPI.AlbumByID(88287);
+    [TestMethod]
+    public async Task TestCurrencyConversion() {
+      var currency = await _kSoftApi.KumoApi.ConvertCurrency(CurrencyCode.Usd, CurrencyCode.Cad, 1239.554);
 
-            LogObject(album);
+      LogObject(currency);
 
-            Assert.IsFalse(album.Error);
-            Assert.AreEqual(28333, album.Id);
-            Assert.IsNotNull(album.Name);
-            Assert.IsNotNull(album.Tracks);
-            Assert.IsNotNull(album.Artist);
-            Assert.IsNotNull(album.Uri);
-            Assert.IsNotNull(album.Year);
-        }
+      Assert.IsNotNull(currency.Value);
+      Assert.IsNotNull(currency.Pretty);
+    }
 
-        [TestMethod]
-        public async Task TestTrackByID() {
-            var track = await _kSoftAPI.musicAPI.TrackByID(628942);
-
-            LogObject(track);
-
-            Assert.AreEqual(628942, track.Id);
-            Assert.IsNotNull(track.Name);
-            Assert.IsNotNull(track.Artist);
-            Assert.IsNotNull(track.Albums);
-            Assert.IsNotNull(track.Lyrics);
-            Assert.IsNotNull(track.Singalong);
-            Assert.IsNotNull(track.Meta);
-            Assert.IsNotNull(track.Url);
-            Assert.IsNotNull(track.Uri);
-            Assert.IsNotNull(track.Popularity);
-        }
 
+    // [TestMethod]
+    // public async Task TestSearchLyrics() {
+    //   var lyrics = await _kSoftApi.MusicApi.lyrics :( ("Is this the real life? Is this just fantasy?", true, 1);
+    //
+    //   LogObject(lyrics);
+    //
+    //   Assert.IsNotNull(lyrics.Total);
+    //   Assert.IsNotNull(lyrics.Data);
+    //   Assert.IsNotNull(lyrics.Took);
+    // }
+
+    // [TestMethod]
+    // public async Task TestArtistById() {
+    //   var artist = await _kSoftApi.MusicApi.GetArtistById("28333");
+    //
+    //   LogObject(artist);
+    //
+    //   Assert.AreEqual(28333, artist.Id);
+    //   Assert.IsNotNull(artist.Name);
+    //   Assert.IsNotNull(artist.Tracks);
+    //   Assert.IsNotNull(artist.Albums);
+    // }
+
+    // [TestMethod]
+    // public async Task TestAlbumById() {
+    //   var album = await _kSoftApi.MusicApi.GetAlbumById(88287);
+    //
+    //   LogObject(album);
+    //
+    //   Assert.AreEqual(28333, album.Id);
+    //   Assert.IsNotNull(album.Name);
+    //   Assert.IsNotNull(album.Tracks);
+    //   Assert.IsNotNull(album.Artist);
+    //   Assert.IsNotNull(album.Year);
+    // }
+
+    // [TestMethod]
+    // public async Task TestTrackById() {
+    //   var track = await _kSoftApi.MusicApi.GetTrackById(628942);
+    //
+    //   LogObject(track);
+    //
+    //   Assert.AreEqual(628942, track.Id);
+    //   Assert.IsNotNull(track.Name);
+    //   Assert.IsNotNull(track.Artist);
+    //   Assert.IsNotNull(track.Albums);
+    //   Assert.IsNotNull(track.Lyrics);
+    //   // Assert.IsNotNull(track.Singalong);
+    //   // Assert.IsNotNull(track.Meta);
+    //   // Assert.IsNotNull(track.Url);
+    //   // Assert.IsNotNull(track.Uri);
+    //   // Assert.IsNotNull(track.Popularity);
+    // }
+
+
+    [TestMethod]
+    public async Task TestBanInfo() {
+      var banInfo = await _kSoftApi.BansApi.GetBanInfo(766186017979760681);
+
+      LogObject(banInfo);
+
+      Assert.AreEqual("766186017979760681", banInfo.Id);
+      Assert.AreEqual("Conquestor", banInfo.Name);
+      Assert.AreEqual("4578", banInfo.Discriminator);
+      Assert.AreEqual("267831837240328192", banInfo.ModeratorId);
+      Assert.AreEqual("DM ads", banInfo.Reason);
+      Assert.AreEqual("https://i.imgur.com/2cwSjPy.png", banInfo.Proof);
+      Assert.IsTrue(banInfo.IsBanActive);
+      Assert.IsTrue(banInfo.CanBeAppealed);
+      Assert.AreEqual("", banInfo.AppealReason);
+      Assert.IsTrue(banInfo.Exists);
+      Assert.AreEqual("267831837240328192", banInfo.RequestedBy);
+      Assert.IsNotNull(banInfo.Timestamp);
+    }
 
-        [TestMethod]
-        public async Task TestBanInfo() {
-            var banInfo = await _kSoftAPI.bansAPI.BanInfo("766186017979760681");
-
-            LogObject(banInfo);
-
-            Assert.IsFalse(banInfo.Error);
-            Assert.AreEqual("766186017979760681", banInfo.Id);
-            Assert.AreEqual("Conquestor", banInfo.Name);
-            Assert.AreEqual("4578", banInfo.Discriminator);
-            Assert.AreEqual("267831837240328192", banInfo.ModeratorId);
-            Assert.AreEqual("DM ads", banInfo.Reason);
-            Assert.AreEqual("https://i.imgur.com/2cwSjPy.png", banInfo.Proof);
-            Assert.IsTrue(banInfo.IsBanActive);
-            Assert.IsTrue(banInfo.CanBeAppealed);
-            Assert.AreEqual("", banInfo.AppealReason);
-            Assert.IsTrue(banInfo.Exists);
-            Assert.AreEqual("267831837240328192", banInfo.RequestedBy);
-            Assert.IsNotNull(banInfo.Timestamp);
-        }
+    [TestMethod]
+    public async Task TestBanCheck() {
+      var banCheck = await _kSoftApi.BansApi.CheckBan("69");
 
-        [TestMethod]
-        public async Task TestBanCheck() {
-            var banCheck = await _kSoftAPI.bansAPI.BanCheck("69");
+      LogObject(banCheck);
 
-            LogObject(banCheck);
+      Assert.IsFalse(banCheck.IsBanned);
+    }
 
-            Assert.IsFalse(banCheck.IsBanned);
-        }
+    [TestMethod]
+    public async Task TestBanCheck2() {
+      var banCheck = await _kSoftApi.BansApi.CheckBan("766186017979760681");
 
-        [TestMethod]
-        public async Task TestBanCheck2() {
-            var banCheck = await _kSoftAPI.bansAPI.BanCheck("766186017979760681");
+      LogObject(banCheck);
 
-            LogObject(banCheck);
+      Assert.IsTrue(banCheck.IsBanned);
+    }
 
-            Assert.IsTrue(banCheck.IsBanned);
-        }
+    [TestMethod]
+    public async Task TestBanList() {
+      var banList = await _kSoftApi.BansApi.ListBans(1, 2);
 
-        [TestMethod]
-        public async Task TestBanList() {
-            var banList = await _kSoftAPI.bansAPI.BanList(1, 2);
+      LogObject(banList);
 
-            LogObject(banList);
+      Assert.AreEqual(1, banList.Page);
+      Assert.AreEqual(2, banList.PerPage);
+      Assert.IsNull(banList.PreviousPage);
+      Assert.IsNotNull(banList.BanCount);
+      Assert.IsNotNull(banList.PageCount);
+      Assert.AreEqual(2, banList.OnPage);
+      Assert.IsNotNull(banList.Bans);
+    }
 
-            Assert.IsFalse(banList.Error);
-            Assert.AreEqual(1, banList.Page);
-            Assert.AreEqual(2, banList.PerPage);
-            Assert.IsNull(banList.PreviousPage);
-            Assert.IsNotNull(banList.BanCount);
-            Assert.IsNotNull(banList.PageCount);
-            Assert.AreEqual(2, banList.OnPage);
-            Assert.IsNotNull(banList.Data);
-        }
+    [TestMethod]
+    public async Task TestBanUpdates() {
+      var timestamp = (long)DateTimeOffset.Now.ToUnixTimeSeconds() - (long)TimeSpan.FromDays(29).TotalSeconds;
 
-        [TestMethod]
-        public async Task TestBanUpdates() {
+      var banUpdates = await _kSoftApi.BansApi.GetBanUpdates(timestamp);
+      LogObject(timestamp);
+      LogObject(banUpdates);
 
-            var time = DateTime.Now - TimeSpan.FromDays(10);
-            var banUpdates = await _kSoftAPI.bansAPI.BanUpdates(time);
+      Assert.IsNotNull(banUpdates.CurrentTimestamp);
+      Assert.IsNotNull(banUpdates.Bans);
+    }
 
-            LogObject(banUpdates);
+    private static void LogObject(object obj) {
+      Console.WriteLine(obj.ToJson());
+    }
+  }
 
-            Assert.IsNotNull(banUpdates.CurrentTimestamp);
-            Assert.IsNotNull(banUpdates.Data);
-        }
+  public static class CumExtensions {
+    public static string ToJson(this object obj) {
+      return JsonConvert.SerializeObject(obj);
     }
+  }
 }
\ No newline at end of file
diff --git a/KSoftNet.sln b/KSoftNet.sln
index ec359ed..827a078 100644
--- a/KSoftNet.sln
+++ b/KSoftNet.sln
@@ -12,6 +12,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KSoftNet.Tests", "KSoftNet.Tests\KSoftNet.Tests.csproj", "{EB16AA43-EFC8-468F-B112-33EB944B0D08}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C65E521-1787-4517-9F02-F31D11CAC2AF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0756D0A2-518C-4B70-A096-F64B8847B0DC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,4 +38,8 @@ Global
 		BuildVersion_StartDate = 2000/1/1
 		SolutionGuid = {69C845EF-3DC5-49C2-991C-BB451F3DC907}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C6672F0D-32C8-4581-BD64-2BC0ABB856DE} = {5C65E521-1787-4517-9F02-F31D11CAC2AF}
+		{EB16AA43-EFC8-468F-B112-33EB944B0D08} = {0756D0A2-518C-4B70-A096-F64B8847B0DC}
+	EndGlobalSection
 EndGlobal
diff --git a/KSoftNet.sln.DotSettings b/KSoftNet.sln.DotSettings
new file mode 100644
index 0000000..4b5d0be
--- /dev/null
+++ b/KSoftNet.sln.DotSettings
@@ -0,0 +1,13 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=birb/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Conquestor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Denullify/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=downvote/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=downvotes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=geoip/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=googlemaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=kumo/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=precip/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tetum/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=upvotes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=wikihow/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/KSoftNet/AssemblyInfo.cs b/KSoftNet/AssemblyInfo.cs
new file mode 100644
index 0000000..85cddb7
--- /dev/null
+++ b/KSoftNet/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("KSoftNet.Tests")]
\ No newline at end of file
diff --git a/KSoftNet/Endpoints/IBansApi.cs b/KSoftNet/Endpoints/IBansApi.cs
new file mode 100644
index 0000000..44c42cb
--- /dev/null
+++ b/KSoftNet/Endpoints/IBansApi.cs
@@ -0,0 +1,86 @@
+using System.Threading.Tasks;
+using KSoftNet.Models.Bans;
+using KSoftNet.Requests;
+using Refit;
+
+namespace KSoftNet.Endpoints {
+  /// <summary>
+  /// Advanced and powerful global ban list API
+  /// </summary>
+  public interface IBansApi {
+    /// <summary>
+    /// This endpoint allows you to add bans to the list. If you don't have <c>BAN_MANAGER</c> permission your ban will be automatically converted to a ban report and we will take a look and act accordingly.
+    /// </summary>
+    /// <param name="banRequest">Ban information</param>
+    /// <returns>Ban status</returns>
+    [Post("/bans/add")]
+    Task<Ban> AddBan([Body] BanRequest banRequest);
+
+    /// <summary>
+    /// Get more information about a ban
+    /// </summary>
+    /// <param name="user">User ID to check</param>
+    /// <returns>Ban Info</returns>
+    [Get("/bans/info")]
+    Task<BanInfo> GetBanInfo(ulong user);
+
+    /// <summary>
+    /// Get more information about a ban
+    /// </summary>
+    /// <param name="user">User ID to check</param>
+    /// <returns>Ban Info</returns>
+    [Get("/bans/info")]
+    Task<BanInfo> GetBanInfo(string user);
+
+    /// <summary>
+    /// Simple way to check if the user is banned
+    /// </summary>
+    /// <param name="user">User ID to check</param>
+    /// <returns>Ban status</returns>
+    [Get("/bans/check")]
+    Task<BanCheck> CheckBan(ulong user);
+
+    /// <summary>
+    /// Simple way to check if the user is banned
+    /// </summary>
+    /// <param name="user">User ID to check</param>
+    /// <returns>Ban status</returns>
+    [Get("/bans/check")]
+    Task<BanCheck> CheckBan(string user);
+
+    /// <summary>
+    /// Delete a ban, only users with <c>BAN_MANAGER</c> permission can use this.
+    /// </summary>
+    /// <param name="user">Users Discord ID</param>
+    /// <param name="force">Default: false, if true it deletes the entry from the database instead of deactivating</param>
+    /// <returns>Ban deletion status</returns>
+    [Delete("/bans/delete")]
+    Task<BanDeletion> DeleteBan(ulong user, bool force = false);
+
+    /// <summary>
+    /// Delete a ban, only users with <c>BAN_MANAGER</c> permission can use this.
+    /// </summary>
+    /// <param name="user">Users Discord ID</param>
+    /// <param name="force">Default: false, if true it deletes the entry from the database instead of deactivating</param>
+    /// <returns>Ban deletion status</returns>
+    [Delete("/bans/delete")]
+    Task<BanDeletion> DeleteBan(string user, bool force = false);
+
+    /// <summary>
+    /// Pagination of bans, you can request up to 1000 records per page, default is 20.
+    /// </summary>
+    /// <param name="page">Page number (default: 1)</param>
+    /// <param name="perPage">Number of bans per page (default: 20)</param>
+    /// <returns>Paginated ban list</returns>
+    [Get("/bans/list")]
+    Task<BanList> ListBans(int page = 1, [AliasAs("per_page")] int perPage = 20);
+
+    /// <summary>
+    /// Gets bans since timestamp
+    /// </summary>
+    /// <param name="timestamp">Timestamp in seconds from epoch</param>
+    /// <returns>Ban list</returns>
+    [Get("/bans/updates")]
+    Task<BanUpdates> GetBanUpdates(long timestamp);
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Endpoints/IImagesApi.cs b/KSoftNet/Endpoints/IImagesApi.cs
new file mode 100644
index 0000000..43d9c58
--- /dev/null
+++ b/KSoftNet/Endpoints/IImagesApi.cs
@@ -0,0 +1,83 @@
+using System.Threading.Tasks;
+using KSoftNet.Enums;
+using KSoftNet.Models.Images;
+using Refit;
+
+namespace KSoftNet.Endpoints {
+  /// <summary>
+  /// Random hand-picked images, random memes from Reddit and other Reddit parsers.
+  /// </summary>
+  public interface IImagesApi {
+    /// <summary>
+    /// Gets random image from the specified tag.
+    /// </summary>
+    /// <param name="tag">Name of the tag</param>
+    /// <param name="nsfw">Default: false, if to show nsfw content</param>
+    /// <returns>Image</returns>
+    [Get("/images/random-image")]
+    Task<Image> GetRandomImage(string tag, bool nsfw = false);
+
+    /// <summary>
+    /// Retrieve the list of all available tags.
+    /// </summary>
+    /// <returns>Tag list</returns>
+    [Get("/images/tags")]
+    Task<TagList> GetAllTags();
+
+    /// <summary>
+    /// Search for tags.
+    /// </summary>
+    /// <param name="search">Search query</param>
+    /// <returns>Tag list</returns>
+    [Get("/images/tags/{search}")]
+    Task<TagList> SearchTags(string search);
+
+    /// <summary>
+    /// Retrieve image data.
+    /// </summary>
+    /// <param name="snowflake">Image snowflake (unique ID)</param>
+    /// <returns>Image</returns>
+    [Get("/images/image/{snowflake}")]
+    Task<Image> GetImageFromId(string snowflake);
+
+    /// <summary>
+    /// Retrieves a random meme from the cache. Source: reddit
+    /// </summary>
+    /// <returns>Reddit post</returns>
+    [Get("/images/random-meme")]
+    Task<RedditPost> GetRandomMeme();
+
+    /// <summary>
+    /// Retrieves weird images from WikiHow
+    /// </summary>
+    /// <param name="nsfw">Default: false, if to display nsfw content.</param>
+    /// <returns>WikiHow post</returns>
+    [Get("/images/random-wikihow")]
+    Task<WikihowPost> GetRandomWikihow(bool nsfw = false);
+
+    /// <summary>
+    /// Get random cute pictures, mostly animals.
+    /// </summary>
+    /// <returns>Reddit post</returns>
+    [Get("/images/random-aww")]
+    Task<RedditPost> GetRandomAww();
+
+    /// <summary>
+    /// Retrieves random NSFW pics. (real life stuff)
+    /// </summary>
+    /// <param name="gifs">Default: false, if to retrieve gifs instead of images</param>
+    /// <returns>Reddit post</returns>
+    [Get("/images/random-nsfw")]
+    Task<RedditPost> GetRandomNsfw(bool gifs = false);
+
+    /// <summary>
+    /// Retrieve images from the specified subreddit.
+    /// </summary>
+    /// <param name="subreddit">Specified subreddit</param>
+    /// <param name="span">Default: "day", select range from which to get the images. Can be one of the following: "hour", "day", "week", "month", "year", "all"</param>
+    /// <param name="removeNsfw">Default: false, if set to true, endpoint will filter out nsfw posts.</param>
+    /// <returns>Reddit post</returns>
+    [Get("/images/rand-reddit/{subreddit}")]
+    Task<RedditPost> GetRandomReddit(string subreddit, Span span = Span.Day, [AliasAs("remove_nsfw")] bool removeNsfw = false);
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Endpoints/IKumoApi.cs b/KSoftNet/Endpoints/IKumoApi.cs
new file mode 100644
index 0000000..a8fa027
--- /dev/null
+++ b/KSoftNet/Endpoints/IKumoApi.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Threading.Tasks;
+using KSoftNet.Enums;
+using KSoftNet.Models.Kumo;
+using Refit;
+
+namespace KSoftNet.Endpoints {
+  /// <summary>
+  /// This is advanced real-time information API for geo-spatial, weather and information gathering data
+  /// </summary>
+  public interface IKumoApi {
+    /// <summary>
+    /// You can get coordinates and more information about the searched location, if needed image of the area is generated.
+    /// </summary>
+    /// <param name="q">Your location query</param>
+    /// <param name="fast">Default: fast, return location data faster, but with less information</param>
+    /// <param name="more">Default: false, return more than one location</param>
+    /// <param name="mapZoom">Default: 12, set your own zoom level, if fast is not set or false, then this setting will be ignored because map zoom is calculated</param>
+    /// <param name="includeMap">Default: false, if to include an image of the area</param>
+    /// <returns>Location</returns>
+    [Get("/kumo/gis")]
+    Task<Location> LocationSearch(string q, bool fast = true, bool more = false, int mapZoom = 12, bool includeMap = false);
+
+    /// <summary>
+    /// Gets weather by coordinates, this endpoint is faster than weather - easy, because it doesn't need to lookup the location.
+    /// </summary>
+    /// <param name="latitude">Latitude coordinate</param>
+    /// <param name="longitude">Longitude coordinate</param>
+    /// <param name="reportType">Select weather type. Can be one of: "currently", "minutely", "hourly", "daily"</param>
+    /// <param name="units">Default: auto, select units, you can choose from: "si", "us", "uk2", "ca", "auto"</param>
+    /// <param name="lang">Default: en, select language, all available languages: 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'el', 'en', 'es', 'et', 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'is', 'it', 'ja', 'ka', 'ko', 'kw', 'nb', 'nl', 'no', 'pl', 'pt', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'tet', 'tr', 'uk', 'x-pig-latin', 'zh', 'zh-tw'</param>
+    /// <param name="icons">Default: original, select icon pack</param>
+    /// <returns>Weather</returns>
+    [Obsolete("Weather endpoints are deprecated and no longer supported.")]
+    [Get("/kumo/weather/{latitude},{longitude}/{report_type}")]
+    Task<Weather> Weather(float latitude, float longitude, [AliasAs("report_type")] ReportType reportType, Unit units = Unit.Auto, Language lang = Language.En, IconPack icons = IconPack.Original);
+
+    /// <summary>
+    /// Gets location data from the IP address.
+    /// </summary>
+    /// <param name="ip">IP address</param>
+    /// <returns>GeoIp response</returns>
+    [Get("/kumo/geoip")]
+    Task<GeoIp> GeoIp(string ip);
+
+    /// <summary>
+    /// Currency conversion
+    /// </summary>
+    /// <param name="from">Source currency</param>
+    /// <param name="to">Destination currency</param>
+    /// <param name="value">Value you want to convert</param>
+    /// <returns>Currency response</returns>
+    [Get("/kumo/currency")]
+    Task<Currency> ConvertCurrency(CurrencyCode from, CurrencyCode to, float value);
+
+    /// <summary>
+    /// Currency conversion
+    /// </summary>
+    /// <param name="from">Source currency</param>
+    /// <param name="to">Destination currency</param>
+    /// <param name="value">Value you want to convert</param>
+    /// <returns>Currency response</returns>
+    [Get("/kumo/currency")]
+    Task<Currency> ConvertCurrency(CurrencyCode from, CurrencyCode to, double value);
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Endpoints/IMusicApi.cs b/KSoftNet/Endpoints/IMusicApi.cs
new file mode 100644
index 0000000..0e527ba
--- /dev/null
+++ b/KSoftNet/Endpoints/IMusicApi.cs
@@ -0,0 +1,68 @@
+using System.Threading.Tasks;
+using KSoftNet.Models.Music;
+using KSoftNet.Requests;
+using Refit;
+
+namespace KSoftNet.Endpoints {
+  /// <summary>
+  /// This API provides deep and powerful tools for searching lyrics, artists or albums.
+  /// Unlike other APIs, it can also search by lyrics and does not need a separate artist and song name entries.
+  /// </summary>
+  public interface IMusicApi {
+    /// <summary>
+    /// Retrieves all albums and songs by that artist.
+    /// </summary>
+    /// <param name="id">Artist ID, you can get it from the lyrics search</param>
+    /// <returns>Artist info</returns>
+    [Get("/lyrics/artist/{id}")]
+    Task<ArtistInfo> GetArtistById(string id);
+
+    /// <summary>
+    /// Retrieves all albums and songs by that artist.
+    /// </summary>
+    /// <param name="id">Artist ID, you can get it from the lyrics search</param>
+    /// <returns>Artist info</returns>
+    [Get("/lyrics/artist/{id}")]
+    Task<ArtistInfo> GetArtistById(int id);
+
+    /// <summary>
+    /// Retrieves artist name and all tracks in the album.
+    /// </summary>
+    /// <param name="id">Album ID, you can get it from the lyrics search</param>
+    /// <returns>Album info</returns>
+    [Get("/lyrics/album/{id}")]
+    Task<AlbumInfo> GetAlbumById(string id);
+
+    /// <summary>
+    /// Retrieves artist name and all tracks in the album.
+    /// </summary>
+    /// <param name="id">Album ID, you can get it from the lyrics search</param>
+    /// <returns>Album info</returns>
+    [Get("/lyrics/album/{id}")]
+    Task<AlbumInfo> GetAlbumById(int id);
+
+    /// <summary>
+    /// Get info about a song.
+    /// </summary>
+    /// <param name="id">Track ID, you can get it from artist by id, album by id or lyrics search endpoints</param>
+    /// <returns>Track info</returns>
+    [Get("/lyrics/track/{id}")]
+    Task<TrackInfo> GetTrackById(string id);
+
+    /// <summary>
+    /// Get info about a song.
+    /// </summary>
+    /// <param name="id">Track ID, you can get it from artist by id, album by id or lyrics search endpoints</param>
+    /// <returns>Track info</returns>
+    [Get("/lyrics/track/{id}")]
+    Task<TrackInfo> GetTrackById(int id);
+
+    /// <summary>
+    /// Retrieves music recommendations based on tracks user inputs.
+    /// </summary>
+    /// <param name="request">Recommendation request</param>
+    /// <returns>Recommendations</returns>
+    [Get("/music/recommendations")]
+    Task<Recommendations> MusicRecommendations(RecommendationRequest request);
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Enums/CurrencyCode.cs b/KSoftNet/Enums/CurrencyCode.cs
new file mode 100644
index 0000000..4d9b555
--- /dev/null
+++ b/KSoftNet/Enums/CurrencyCode.cs
@@ -0,0 +1,816 @@
+namespace KSoftNet.Enums {
+  /// <summary>
+  /// ISO 4217 Currency codes
+  /// </summary>
+  public enum CurrencyCode {
+    /// <summary>
+    /// United Arab Emirates Dirham
+    /// </summary>
+    Aed,
+
+    /// <summary>
+    /// Afghanistan Afghani
+    /// </summary>
+    Afn,
+
+    /// <summary>
+    /// Albania Lek
+    /// </summary>
+    All,
+
+    /// <summary>
+    /// Armenia Dram
+    /// </summary>
+    Amd,
+
+    /// <summary>
+    /// Netherlands Antilles Guilder
+    /// </summary>
+    Ang,
+
+    /// <summary>
+    /// Angola Kwanza
+    /// </summary>
+    Aoa,
+
+    /// <summary>
+    /// Argentina Peso
+    /// </summary>
+    Ars,
+
+    /// <summary>
+    /// Australia Dollar
+    /// </summary>
+    Aud,
+
+    /// <summary>
+    /// Aruba Guilder
+    /// </summary>
+    Awg,
+
+    /// <summary>
+    /// Azerbaijan New Manat
+    /// </summary>
+    Azn,
+
+    /// <summary>
+    /// Bosnia and Herzegovina Convertible Marka
+    /// </summary>
+    Bam,
+
+    /// <summary>
+    /// Barbados Dollar
+    /// </summary>
+    Bbd,
+
+    /// <summary>
+    /// Bangladesh Taka
+    /// </summary>
+    Bdt,
+
+    /// <summary>
+    /// Bulgaria Lev
+    /// </summary>
+    Bgn,
+
+    /// <summary>
+    /// Bahrain Dinar
+    /// </summary>
+    Bhd,
+
+    /// <summary>
+    /// Burundi Franc
+    /// </summary>
+    Bif,
+
+    /// <summary>
+    /// Bermuda Dollar
+    /// </summary>
+    Bmd,
+
+    /// <summary>
+    /// Brunei Darussalam Dollar
+    /// </summary>
+    Bnd,
+
+    /// <summary>
+    /// Bolivia Bolíviano
+    /// </summary>
+    Bob,
+
+    /// <summary>
+    /// Brazil Real
+    /// </summary>
+    Brl,
+
+    /// <summary>
+    /// Bahamas Dollar
+    /// </summary>
+    Bsd,
+
+    /// <summary>
+    /// Bhutan Ngultrum
+    /// </summary>
+    Btn,
+
+    /// <summary>
+    /// Botswana Pula
+    /// </summary>
+    Bwp,
+
+    /// <summary>
+    /// Belarus Ruble
+    /// </summary>
+    Byr,
+
+    /// <summary>
+    /// Belize Dollar
+    /// </summary>
+    Bzd,
+
+    /// <summary>
+    /// Canada Dollar
+    /// </summary>
+    Cad,
+
+    /// <summary>
+    /// Congo/Kinshasa Franc
+    /// </summary>
+    Cdf,
+
+    /// <summary>
+    /// Switzerland Franc
+    /// </summary>
+    Chf,
+
+    /// <summary>
+    /// Chile Peso
+    /// </summary>
+    Clp,
+
+    /// <summary>
+    /// China Yuan Renminbi
+    /// </summary>
+    Cny,
+
+    /// <summary>
+    /// Colombia Peso
+    /// </summary>
+    Cop,
+
+    /// <summary>
+    /// Costa Rica Colon
+    /// </summary>
+    Crc,
+
+    /// <summary>
+    /// Cuba Convertible Peso
+    /// </summary>
+    Cuc,
+
+    /// <summary>
+    /// Cuba Peso
+    /// </summary>
+    Cup,
+
+    /// <summary>
+    /// Cape Verde Escudo
+    /// </summary>
+    Cve,
+
+    /// <summary>
+    /// Czech Republic Koruna
+    /// </summary>
+    Czk,
+
+    /// <summary>
+    /// Djibouti Franc
+    /// </summary>
+    Djf,
+
+    /// <summary>
+    /// Denmark Krone
+    /// </summary>
+    Dkk,
+
+    /// <summary>
+    /// Dominican Republic Peso
+    /// </summary>
+    Dop,
+
+    /// <summary>
+    /// Algeria Dinar
+    /// </summary>
+    Dzd,
+
+    /// <summary>
+    /// Egypt Pound
+    /// </summary>
+    Egp,
+
+    /// <summary>
+    /// Eritrea Nakfa
+    /// </summary>
+    Ern,
+
+    /// <summary>
+    /// Ethiopia Birr
+    /// </summary>
+    Etb,
+
+    /// <summary>
+    /// Euro Member Countries
+    /// </summary>
+    Eur,
+
+    /// <summary>
+    /// Fiji Dollar
+    /// </summary>
+    Fjd,
+
+    /// <summary>
+    /// Falkland Islands (Malvinas) Pound
+    /// </summary>
+    Fkp,
+
+    /// <summary>
+    /// United Kingdom Pound
+    /// </summary>
+    Gbp,
+
+    /// <summary>
+    /// Georgia Lari
+    /// </summary>
+    Gel,
+
+    /// <summary>
+    /// Guernsey Pound
+    /// </summary>
+    Ggp,
+
+    /// <summary>
+    /// Ghana Cedi
+    /// </summary>
+    Ghs,
+
+    /// <summary>
+    /// Gibraltar Pound
+    /// </summary>
+    Gip,
+
+    /// <summary>
+    /// Gambia Dalasi
+    /// </summary>
+    Gmd,
+
+    /// <summary>
+    /// Guinea Franc
+    /// </summary>
+    Gnf,
+
+    /// <summary>
+    /// Guatemala Quetzal
+    /// </summary>
+    Gtq,
+
+    /// <summary>
+    /// Guyana Dollar
+    /// </summary>
+    Gyd,
+
+    /// <summary>
+    /// Hong Kong Dollar
+    /// </summary>
+    Hkd,
+
+    /// <summary>
+    /// Honduras Lempira
+    /// </summary>
+    Hnl,
+
+    /// <summary>
+    /// Croatia Kuna
+    /// </summary>
+    Hrk,
+
+    /// <summary>
+    /// Haiti Gourde
+    /// </summary>
+    Htg,
+
+    /// <summary>
+    /// Hungary Forint
+    /// </summary>
+    Huf,
+
+    /// <summary>
+    /// Indonesia Rupiah
+    /// </summary>
+    Idr,
+
+    /// <summary>
+    /// Israel Shekel
+    /// </summary>
+    Ils,
+
+    /// <summary>
+    /// Isle of Man Pound
+    /// </summary>
+    Imp,
+
+    /// <summary>
+    /// India Rupee
+    /// </summary>
+    Inr,
+
+    /// <summary>
+    /// Iraq Dinar
+    /// </summary>
+    Iqd,
+
+    /// <summary>
+    /// Iran Rial
+    /// </summary>
+    Irr,
+
+    /// <summary>
+    /// Iceland Krona
+    /// </summary>
+    Isk,
+
+    /// <summary>
+    /// Jersey Pound
+    /// </summary>
+    Jep,
+
+    /// <summary>
+    /// Jamaica Dollar
+    /// </summary>
+    Jmd,
+
+    /// <summary>
+    /// Jordan Dinar
+    /// </summary>
+    Jod,
+
+    /// <summary>
+    /// Japan Yen
+    /// </summary>
+    Jpy,
+
+    /// <summary>
+    /// Kenya Shilling
+    /// </summary>
+    Kes,
+
+    /// <summary>
+    /// Kyrgyzstan Som
+    /// </summary>
+    Kgs,
+
+    /// <summary>
+    /// Cambodia Riel
+    /// </summary>
+    Khr,
+
+    /// <summary>
+    /// Comoros Franc
+    /// </summary>
+    Kmf,
+
+    /// <summary>
+    /// Korea (North) Won
+    /// </summary>
+    Kpw,
+
+    /// <summary>
+    /// Korea (South) Won
+    /// </summary>
+    Krw,
+
+    /// <summary>
+    /// Kuwait Dinar
+    /// </summary>
+    Kwd,
+
+    /// <summary>
+    /// Cayman Islands Dollar
+    /// </summary>
+    Kyd,
+
+    /// <summary>
+    /// Kazakhstan Tenge
+    /// </summary>
+    Kzt,
+
+    /// <summary>
+    /// Laos Kip
+    /// </summary>
+    Lak,
+
+    /// <summary>
+    /// Lebanon Pound
+    /// </summary>
+    Lbp,
+
+    /// <summary>
+    /// Sri Lanka Rupee
+    /// </summary>
+    Lkr,
+
+    /// <summary>
+    /// Liberia Dollar
+    /// </summary>
+    Lrd,
+
+    /// <summary>
+    /// Lesotho Loti
+    /// </summary>
+    Lsl,
+
+    /// <summary>
+    /// Libya Dinar
+    /// </summary>
+    Lyd,
+
+    /// <summary>
+    /// Morocco Dirham
+    /// </summary>
+    Mad,
+
+    /// <summary>
+    /// Moldova Leu
+    /// </summary>
+    Mdl,
+
+    /// <summary>
+    /// Madagascar Ariary
+    /// </summary>
+    Mga,
+
+    /// <summary>
+    /// Macedonia Denar
+    /// </summary>
+    Mkd,
+
+    /// <summary>
+    /// Myanmar (Burma) Kyat
+    /// </summary>
+    Mmk,
+
+    /// <summary>
+    /// Mongolia Tughrik
+    /// </summary>
+    Mnt,
+
+    /// <summary>
+    /// Macau Pataca
+    /// </summary>
+    Mop,
+
+    /// <summary>
+    /// Mauritania Ouguiya
+    /// </summary>
+    Mro,
+
+    /// <summary>
+    /// Mauritius Rupee
+    /// </summary>
+    Mur,
+
+    /// <summary>
+    /// Maldives (Maldive Islands) Rufiyaa
+    /// </summary>
+    Mvr,
+
+    /// <summary>
+    /// Malawi Kwacha
+    /// </summary>
+    Mwk,
+
+    /// <summary>
+    /// Mexico Peso
+    /// </summary>
+    Mxn,
+
+    /// <summary>
+    /// Malaysia Ringgit
+    /// </summary>
+    Myr,
+
+    /// <summary>
+    /// Mozambique Metical
+    /// </summary>
+    Mzn,
+
+    /// <summary>
+    /// Namibia Dollar
+    /// </summary>
+    Nad,
+
+    /// <summary>
+    /// Nigeria Naira
+    /// </summary>
+    Ngn,
+
+    /// <summary>
+    /// Nicaragua Cordoba
+    /// </summary>
+    Nio,
+
+    /// <summary>
+    /// Norway Krone
+    /// </summary>
+    Nok,
+
+    /// <summary>
+    /// Nepal Rupee
+    /// </summary>
+    Npr,
+
+    /// <summary>
+    /// New Zealand Dollar
+    /// </summary>
+    Nzd,
+
+    /// <summary>
+    /// Oman Rial
+    /// </summary>
+    Omr,
+
+    /// <summary>
+    /// Panama Balboa
+    /// </summary>
+    Pab,
+
+    /// <summary>
+    /// Peru Sol
+    /// </summary>
+    Pen,
+
+    /// <summary>
+    /// Papua New Guinea Kina
+    /// </summary>
+    Pgk,
+
+    /// <summary>
+    /// Philippines Peso
+    /// </summary>
+    Php,
+
+    /// <summary>
+    /// Pakistan Rupee
+    /// </summary>
+    Pkr,
+
+    /// <summary>
+    /// Poland Zloty
+    /// </summary>
+    Pln,
+
+    /// <summary>
+    /// Paraguay Guarani
+    /// </summary>
+    Pyg,
+
+    /// <summary>
+    /// Qatar Riyal
+    /// </summary>
+    Qar,
+
+    /// <summary>
+    /// Romania New Leu
+    /// </summary>
+    Ron,
+
+    /// <summary>
+    /// Serbia Dinar
+    /// </summary>
+    Rsd,
+
+    /// <summary>
+    /// Russia Ruble
+    /// </summary>
+    Rub,
+
+    /// <summary>
+    /// Rwanda Franc
+    /// </summary>
+    Rwf,
+
+    /// <summary>
+    /// Saudi Arabia Riyal
+    /// </summary>
+    Sar,
+
+    /// <summary>
+    /// Solomon Islands Dollar
+    /// </summary>
+    Sbd,
+
+    /// <summary>
+    /// Seychelles Rupee
+    /// </summary>
+    Scr,
+
+    /// <summary>
+    /// Sudan Pound
+    /// </summary>
+    Sdg,
+
+    /// <summary>
+    /// Sweden Krona
+    /// </summary>
+    Sek,
+
+    /// <summary>
+    /// Singapore Dollar
+    /// </summary>
+    Sgd,
+
+    /// <summary>
+    /// Saint Helena Pound
+    /// </summary>
+    Shp,
+
+    /// <summary>
+    /// Sierra Leone Leone
+    /// </summary>
+    Sll,
+
+    /// <summary>
+    /// Somalia Shilling
+    /// </summary>
+    Sos,
+
+    /// <summary>
+    /// Seborga Luigino
+    /// </summary>
+    Spl,
+
+    /// <summary>
+    /// Suriname Dollar
+    /// </summary>
+    Srd,
+
+    /// <summary>
+    /// São Tomé and Príncipe Dobra
+    /// </summary>
+    Std,
+
+    /// <summary>
+    /// El Salvador Colon
+    /// </summary>
+    Svc,
+
+    /// <summary>
+    /// Syria Pound
+    /// </summary>
+    Syp,
+
+    /// <summary>
+    /// Swaziland Lilangeni
+    /// </summary>
+    Szl,
+
+    /// <summary>
+    /// Thailand Baht
+    /// </summary>
+    Thb,
+
+    /// <summary>
+    /// Tajikistan Somoni
+    /// </summary>
+    Tjs,
+
+    /// <summary>
+    /// Turkmenistan Manat
+    /// </summary>
+    Tmt,
+
+    /// <summary>
+    /// Tunisia Dinar
+    /// </summary>
+    Tnd,
+
+    /// <summary>
+    /// Tonga Pa'anga
+    /// </summary>
+    Top,
+
+    /// <summary>
+    /// Turkey Lira
+    /// </summary>
+    Try,
+
+    /// <summary>
+    /// Trinidad and Tobago Dollar
+    /// </summary>
+    Ttd,
+
+    /// <summary>
+    /// Tuvalu Dollar
+    /// </summary>
+    Tvd,
+
+    /// <summary>
+    /// Taiwan New Dollar
+    /// </summary>
+    Twd,
+
+    /// <summary>
+    /// Tanzania Shilling
+    /// </summary>
+    Tzs,
+
+    /// <summary>
+    /// Ukraine Hryvnia
+    /// </summary>
+    Uah,
+
+    /// <summary>
+    /// Uganda Shilling
+    /// </summary>
+    Ugx,
+
+    /// <summary>
+    /// United States Dollar
+    /// </summary>
+    Usd,
+
+    /// <summary>
+    /// Uruguay Peso
+    /// </summary>
+    Uyu,
+
+    /// <summary>
+    /// Uzbekistan Som
+    /// </summary>
+    Uzs,
+
+    /// <summary>
+    /// Venezuela Bolivar
+    /// </summary>
+    Vef,
+
+    /// <summary>
+    /// Viet Nam Dong
+    /// </summary>
+    Vnd,
+
+    /// <summary>
+    /// Vanuatu Vatu
+    /// </summary>
+    Vuv,
+
+    /// <summary>
+    /// Samoa Tala
+    /// </summary>
+    Wst,
+
+    /// <summary>
+    /// Communauté Financière Africaine (BEAC) CFA Franc BEAC
+    /// </summary>
+    Xaf,
+
+    /// <summary>
+    /// East Caribbean Dollar
+    /// </summary>
+    Xcd,
+
+    /// <summary>
+    /// International Monetary Fund (IMF) Special Drawing Rights
+    /// </summary>
+    Xdr,
+
+    /// <summary>
+    /// Communauté Financière Africaine (BCEAO) Franc
+    /// </summary>
+    Xof,
+
+    /// <summary>
+    /// Comptoirs Français du Pacifique (CFP) Franc
+    /// </summary>
+    Xpf,
+
+    /// <summary>
+    /// Yemen Rial
+    /// </summary>
+    Yer,
+
+    /// <summary>
+    /// South Africa Rand
+    /// </summary>
+    Zar,
+
+    /// <summary>
+    /// Zambia Kwacha
+    /// </summary>
+    Zmw,
+
+    /// <summary>
+    /// Zimbabwe Dollar
+    /// </summary>
+    Zwd
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Enums/IconPack.cs b/KSoftNet/Enums/IconPack.cs
new file mode 100644
index 0000000..dcde99a
--- /dev/null
+++ b/KSoftNet/Enums/IconPack.cs
@@ -0,0 +1,11 @@
+namespace KSoftNet.Enums {
+  /// <summary>
+  /// Icon packs
+  /// </summary>
+  public enum IconPack {
+    /// <summary>
+    /// Original icons
+    /// </summary>
+    Original
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Enums/Language.cs b/KSoftNet/Enums/Language.cs
new file mode 100644
index 0000000..856f5f2
--- /dev/null
+++ b/KSoftNet/Enums/Language.cs
@@ -0,0 +1,216 @@
+namespace KSoftNet.Enums {
+  /// <summary>
+  /// Language
+  /// </summary>
+  public enum Language {
+    /// <summary>
+    /// Arabic
+    /// </summary>
+    Ar,
+
+    /// <summary>
+    /// Azerbaijani
+    /// </summary>
+    Az,
+
+    /// <summary>
+    /// Belarusian
+    /// </summary>
+    Be,
+
+    /// <summary>
+    /// Bulgarian
+    /// </summary>
+    Bg,
+
+    /// <summary>
+    /// Bosnian
+    /// </summary>
+    Bs,
+
+    /// <summary>
+    /// Catalan
+    /// </summary>
+    Ca,
+
+    /// <summary>
+    /// Czech
+    /// </summary>
+    Cs,
+
+    /// <summary>
+    /// Danish
+    /// </summary>
+    Da,
+
+    /// <summary>
+    /// German
+    /// </summary>
+    De,
+
+    /// <summary>
+    /// Greek
+    /// </summary>
+    El,
+
+    /// <summary>
+    /// English
+    /// </summary>
+    En,
+
+    /// <summary>
+    /// Spanish
+    /// </summary>
+    Es,
+
+    /// <summary>
+    /// Estonian
+    /// </summary>
+    Et,
+
+    /// <summary>
+    /// Finnish
+    /// </summary>
+    Fi,
+
+    /// <summary>
+    /// French
+    /// </summary>
+    Fr,
+
+    /// <summary>
+    /// Hebrew
+    /// </summary>
+    He,
+
+    /// <summary>
+    /// Croatian
+    /// </summary>
+    Hr,
+
+    /// <summary>
+    /// Hungarian
+    /// </summary>
+    Hu,
+
+    /// <summary>
+    /// Indonesian
+    /// </summary>
+    Id,
+
+    /// <summary>
+    /// Icelandic
+    /// </summary>
+    Is,
+
+    /// <summary>
+    /// Italian
+    /// </summary>
+    It,
+
+    /// <summary>
+    /// Japanese
+    /// </summary>
+    Ja,
+
+    /// <summary>
+    /// Georgian
+    /// </summary>
+    Ka,
+
+    /// <summary>
+    /// Korean
+    /// </summary>
+    Ko,
+
+    /// <summary>
+    /// Cornish
+    /// </summary>
+    Kw,
+
+    /// <summary>
+    /// Norwegian
+    /// </summary>
+    Nb,
+
+    /// <summary>
+    /// Dutch
+    /// </summary>
+    Nl,
+
+    /// <summary>
+    /// Norwegian
+    /// </summary>
+    No,
+
+    /// <summary>
+    /// Polish
+    /// </summary>
+    Pl,
+
+    /// <summary>
+    /// Portuguese
+    /// </summary>
+    Pt,
+
+    /// <summary>
+    /// Moldovan
+    /// </summary>
+    Ro,
+
+    /// <summary>
+    /// Russian
+    /// </summary>
+    Ru,
+
+    /// <summary>
+    /// Slovak
+    /// </summary>
+    Sk,
+
+    /// <summary>
+    /// Slovenian
+    /// </summary>
+    Sl,
+
+    /// <summary>
+    /// Serbian
+    /// </summary>
+    Sr,
+
+    /// <summary>
+    /// Swedish
+    /// </summary>
+    Sv,
+
+    /// <summary>
+    /// Tetum
+    /// </summary>
+    Tet,
+
+    /// <summary>
+    /// Turkish
+    /// </summary>
+    Tr,
+
+    /// <summary>
+    /// Ukrainian
+    /// </summary>
+    Uk,
+
+    /// <summary>
+    /// Pig Latin
+    /// </summary>
+    XPigLatin,
+
+    /// <summary>
+    /// Chinese
+    /// </summary>
+    Zh,
+
+    /// <summary>
+    /// Taiwanese Mandarin
+    /// </summary>
+    ZhTw
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Enums/ReportType.cs b/KSoftNet/Enums/ReportType.cs
new file mode 100644
index 0000000..52849cd
--- /dev/null
+++ b/KSoftNet/Enums/ReportType.cs
@@ -0,0 +1,26 @@
+namespace KSoftNet.Enums {
+  /// <summary>
+  /// Weather report type
+  /// </summary>
+  public enum ReportType {
+    /// <summary>
+    /// Current weather
+    /// </summary>
+    Currently,
+
+    /// <summary>
+    /// Weather this minute
+    /// </summary>
+    Minutely,
+
+    /// <summary>
+    /// Weather this hour
+    /// </summary>
+    Hourly,
+
+    /// <summary>
+    /// Weather this day
+    /// </summary>
+    Daily
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Enums/Span.cs b/KSoftNet/Enums/Span.cs
new file mode 100644
index 0000000..ee488eb
--- /dev/null
+++ b/KSoftNet/Enums/Span.cs
@@ -0,0 +1,38 @@
+using System.ComponentModel;
+
+namespace KSoftNet.Enums {
+  /// <summary>
+  /// Reddit search span
+  /// </summary>
+  public enum Span {
+    /// <summary>
+    /// Posts within hour
+    /// </summary>
+    Hour,
+
+    /// <summary>
+    /// Posts within day
+    /// </summary>
+    Day,
+
+    /// <summary>
+    /// Posts within week
+    /// </summary>
+    Week,
+
+    /// <summary>
+    /// Posts within month
+    /// </summary>
+    Month,
+
+    /// <summary>
+    /// Posts within year
+    /// </summary>
+    Year,
+
+    /// <summary>
+    /// Posts from all time
+    /// </summary>
+    All
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Enums/Unit.cs b/KSoftNet/Enums/Unit.cs
new file mode 100644
index 0000000..5f6dd80
--- /dev/null
+++ b/KSoftNet/Enums/Unit.cs
@@ -0,0 +1,31 @@
+namespace KSoftNet.Enums {
+  /// <summary>
+  /// Measurement units
+  /// </summary>
+  public enum Unit {
+    /// <summary>
+    /// Metric
+    /// </summary>
+    Si,
+
+    /// <summary>
+    /// Imperial
+    /// </summary>
+    Us,
+
+    /// <summary>
+    /// UK imperial (?)
+    /// </summary>
+    Uk2,
+
+    /// <summary>
+    /// ???
+    /// </summary>
+    Ca,
+
+    /// <summary>
+    /// Select unit from location
+    /// </summary>
+    Auto
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/KSoft/BansAPI.cs b/KSoftNet/KSoft/BansAPI.cs
deleted file mode 100644
index 236728a..0000000
--- a/KSoftNet/KSoft/BansAPI.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.Net.Http;
-using System.Threading.Tasks;
-using KSoftNet.Models;
-
-namespace KSoftNet.KSoft {
-    /// <summary>
-    ///     Advanced and powerful global ban list API
-    /// </summary>
-    public class BansAPI {
-
-        private readonly KSoftAPI _kSoftAPI;
-        /// <summary>
-        ///     Advanced and powerful global ban list API
-        /// </summary>
-        /// <param name="kSoftAPI">Base KSoftAPI class</param>
-        public BansAPI(KSoftAPI kSoftAPI) {
-            _kSoftAPI = kSoftAPI;
-        }
-
-        #region Bans API
-
-        /// <summary>
-        ///     This endpoint allows you to add bans to the list. If you don't have BAN_MANAGER permission your ban will be
-        ///     automatically converted to a ban report and we will take a look and act accordingly.
-        /// </summary>
-        /// <param name="userID">Users Discord ID that you are banning/reporting</param>
-        /// <param name="reason">Reason why user should be globally banned</param>
-        /// <param name="proof">URL of the image showing the act</param>
-        /// <param name="mod">Users Discord ID who posted/reported the ban</param>
-        /// <param name="userName">Users Discord username</param>
-        /// <param name="userDiscriminator">Users Discord discriminator</param>
-        /// <param name="appealPossible">If appeal should be disabled for that user.</param>
-        /// <returns>KSoftBan</returns>
-        public async Task<KSoftBan> AddBan(string userID, string reason, string proof, long mod = 0, string userName = "0", string userDiscriminator = "0", bool appealPossible = false) {
-
-            var queries = new NameValueCollection {
-                {"user", userID},
-                {"reason", reason},
-                {"proof", proof},
-                {"mod", mod.ToString()},
-                {"user_name", userName},
-                {"user_discriminator", userDiscriminator},
-                {"appeal_possible", appealPossible.ToString()}
-            };
-
-
-            return await _kSoftAPI.ExecuteAsync<KSoftBan>(HttpMethod.Get, "bans/add", queries);
-        }
-
-        /// <summary>
-        ///     Get more information about a ban
-        /// </summary>
-        /// <param name="userID">Users Discord ID who's ban you'd like to check</param>
-        /// <returns>KSoftBanInfo</returns>
-        public async Task<KSoftBanInfo> BanInfo(string userID) {
-            var queries = new NameValueCollection {{"user", userID}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftBanInfo>(HttpMethod.Get, "bans/info", queries);
-        }
-
-        /// <summary>
-        ///     Simple way to check if the user is banned
-        /// </summary>
-        /// <param name="userID">Users Discord ID that you'd like to check</param>
-        /// <returns>KSoftBanCheck</returns>
-        public async Task<KSoftBanCheck> BanCheck(string userID) {
-            var queries = new NameValueCollection {{"user", userID}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftBanCheck>(HttpMethod.Get, "bans/check", queries);
-        }
-
-        /// <summary>
-        ///     Delete a ban, only users with BAN_MANAGER permission can use this.
-        /// </summary>
-        /// <param name="userID">Users Discord ID</param>
-        /// <param name="force">Default: false, if true it deletes the entry from the database instead of deactivating</param>
-        /// <returns>KSoftBanDeletion</returns>
-        public async Task<KSoftBanDeletion> DeleteBan(string userID, bool force = false) {
-            var queries = new NameValueCollection {{"user", userID}, {"force", force.ToString()}};
-
-
-            return await _kSoftAPI.ExecuteAsync<KSoftBanDeletion>(HttpMethod.Delete, "bans/delete", queries);
-        }
-
-        /// <summary>
-        ///     Pagination of bans, you can request up to 1000 records per page, default is 20.
-        /// </summary>
-        /// <param name="page">Page number (default: 1)</param>
-        /// <param name="perPage">Number of bans per page (default: 20)</param>
-        /// <returns>KSoftBanList</returns>
-        public async Task<KSoftBanList> BanList(int page, int perPage) {
-            var queries = new NameValueCollection {{"page", page.ToString()}, {"per_page", perPage.ToString()}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftBanList>(HttpMethod.Get, "bans/list", queries);
-        }
-
-        /// <summary>
-        ///     Gets updates from the previous update
-        /// </summary>
-        /// <param name="timestamp">Timestamp in seconds from 1.1.1970 (epoch time)</param>
-        /// <returns>KSoftBanUpdates</returns>
-        public async Task<KSoftBanUpdates> BanUpdates(DateTime timestamp) {
-            var queries = new NameValueCollection {{"timestamp", ((DateTimeOffset)timestamp).ToUnixTimeSeconds().ToString()}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftBanUpdates>(HttpMethod.Get, "bans/updates", queries);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/KSoft/ImagesAPI.cs b/KSoftNet/KSoft/ImagesAPI.cs
deleted file mode 100644
index 29efbd1..0000000
--- a/KSoftNet/KSoft/ImagesAPI.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System.Collections.Specialized;
-using System.Net.Http;
-using System.Threading.Tasks;
-using KSoftNet.Models;
-
-namespace KSoftNet.KSoft {
-    /// <summary>
-    ///     Random hand-picked images, random memes from Reddit and other Reddit parsers.
-    /// </summary>
-    public class ImagesAPI {
-
-        private readonly KSoftAPI _kSoftAPI;
-        /// <summary>
-        ///     Random hand-picked images, random memes from Reddit and other Reddit parsers.
-        /// </summary>
-        /// <param name="kSoftAPI"></param>
-        public ImagesAPI(KSoftAPI kSoftAPI) {
-            _kSoftAPI = kSoftAPI;
-        }
-        #region Images API
-
-        /// <summary>
-        ///     Gets random image from the specified tag.
-        /// </summary>
-        /// <param name="tag">Default: false, if to show nsfw content</param>
-        /// <param name="nsfw">Name of the tag</param>
-        /// <returns>KSoftImage</returns>
-        public async Task<KSoftImage> RandomImage(string tag, bool nsfw = false) {
-            var queries = new NameValueCollection {{"tag", tag}, {"nsfw", nsfw.ToString()}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftImage>(HttpMethod.Get, "images/random-image", queries);
-        }
-
-        /// <summary>
-        ///     Retrieve the list of all available tags.
-        /// </summary>
-        /// <returns>KSoftTags</returns>
-        public async Task<KSoftTags> Tags() {
-            return await _kSoftAPI.ExecuteAsync<KSoftTags>(HttpMethod.Get, "images/tags");
-        }
-
-        /// <summary>
-        ///     Search for tags.
-        /// </summary>
-        /// <param name="query">Search query</param>
-        /// <returns>KSoftTags</returns>
-        public async Task<KSoftTags> TagSearch(string query) {
-            return await _kSoftAPI.ExecuteAsync<KSoftTags>(HttpMethod.Get, $"images/tags/{query}");
-        }
-
-        /// <summary>
-        ///     Retrieve image data.
-        /// </summary>
-        /// <param name="snowflake">Image snowflake (unique ID)</param>
-        /// <returns>KSoftImage</returns>
-        public async Task<KSoftImage> ImageFromSnowflake(string snowflake) {
-            return await _kSoftAPI.ExecuteAsync<KSoftImage>(HttpMethod.Get, $"images/image/{snowflake}");
-        }
-
-        /// <summary>
-        ///     Retrieves a random meme from the cache. Source: reddit
-        /// </summary>
-        /// <returns>KSoftRedditPost</returns>
-        public async Task<KSoftRedditPost> RandomMeme() {
-            return await _kSoftAPI.ExecuteAsync<KSoftRedditPost>(HttpMethod.Get, "images/random-meme");
-        }
-
-        /// <summary>
-        ///     Retrieves weird images from WikiHow
-        /// </summary>
-        /// <param name="nsfw">Default: false, if to display nsfw content.</param>
-        /// <returns>KSoftWikiHowPost</returns>
-        public async Task<KSoftWikiHowPost> RandomWikiHow(bool nsfw = false) {
-            var queries = new NameValueCollection {{"nsfw", nsfw.ToString()}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftWikiHowPost>(HttpMethod.Get, "images/random-wikihow", queries);
-        }
-
-        /// <summary>
-        ///     Get random cute pictures, mostly animals.
-        /// </summary>
-        /// <returns>KSoftRedditPost</returns>
-        public async Task<KSoftRedditPost> RandomAww() {
-            return await _kSoftAPI.ExecuteAsync<KSoftRedditPost>(HttpMethod.Get, "images/random-meme");
-        }
-
-        /// <summary>
-        ///     Retrieves random NSFW pics. (real life stuff)
-        /// </summary>
-        /// <param name="gifs">Default: false, if to retrieve gifs instead of images</param>
-        /// <returns>KSoftRedditPost</returns>
-        public async Task<KSoftRedditPost> RandomNsfw(bool gifs) {
-            var queries = new NameValueCollection {{"gifs", gifs.ToString()}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftRedditPost>(HttpMethod.Get, "images/random-nsfw", queries);
-        }
-
-        /// <summary>
-        ///     Retrieve images from the specified subreddit.
-        /// </summary>
-        /// <param name="subreddit">Specified subreddit</param>
-        /// <param name="removeNsfw">Default: false, if set to true, endpoint will filter out nsfw posts.</param>
-        /// <param name="span">
-        ///     Default: "day", value: select range from which to get the images. Can be one of the following:
-        ///     "hour", value: "day", value: "week", value: "month", value: "year", value: "all"
-        /// </param>
-        /// <returns>KSoftRedditPost</returns>
-        public async Task<KSoftRedditPost> RandomReddit(string subreddit, bool removeNsfw, string span) {
-            var queries = new NameValueCollection {{"remove-nsfw", removeNsfw.ToString()}, {"span", span}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftRedditPost>(HttpMethod.Get, $"images/rand-reddit/{subreddit}", queries);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/KSoft/KumoAPI.cs b/KSoftNet/KSoft/KumoAPI.cs
deleted file mode 100644
index e97bb3d..0000000
--- a/KSoftNet/KSoft/KumoAPI.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Net.Http;
-using System.Threading.Tasks;
-using KSoftNet.Models;
-
-namespace KSoftNet.KSoft {
-    /// <summary>
-    ///     This is advanced real-time information API for geo-spatial, weather and information gathering data
-    /// </summary>
-    public class KumoAPI {
-
-        private readonly KSoftAPI _kSoftAPI;
-
-        /// <summary>
-        ///     This is advanced real-time information API for geo-spatial, weather and information gathering data
-        /// </summary>
-        /// <param name="kSoftAPI">Base KSoftAPI class</param>
-        public KumoAPI(KSoftAPI kSoftAPI) {
-            _kSoftAPI = kSoftAPI;
-        }
-
-        #region Kumo API
-
-        /// <summary>
-        ///     Gets weather by location.
-        /// </summary>
-        /// <param name="reportType">
-        ///     Select weather report type. Can be one of: "currently", value: "minutely", value: "hourly",
-        ///     value: "daily"
-        /// </param>
-        /// <param name="query">Location query</param>
-        /// <param name="units">
-        ///     Default: auto, select units, you can choose from: "si", value: "us", value: "uk2", value: "ca",
-        ///     value: "auto"
-        /// </param>
-        /// <param name="language">
-        ///     Default: en, select language, all available languages: 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs',
-        ///     'da', 'de', 'el', 'en', 'es', 'et', 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'is', 'it', 'ja', 'ka', 'ko', 'kw', 'nb',
-        ///     'nl', 'no', 'pl', 'pt', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'tet', 'tr', 'uk', 'x-pig-latin', 'zh', 'zh-tw'
-        /// </param>
-        /// <param name="icons">Default: original, select icon pack</param>
-        /// <returns>KSoftWeather</returns>
-        [Obsolete("Kumo weather endpoints are deprecated and not supported.")]
-        public async Task<KSoftWeather> BasicWeather(string reportType, string query, string units = "auto", string language = "en", string icons = "original") {
-            var queries = new NameValueCollection {{"q", query}, {"units", units}, {"lang", language}, {"icons", icons}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftWeather>(HttpMethod.Get, $"kumo/weather/{reportType}", queries);
-        }
-
-        /// <summary>
-        ///     Gets location data from the IP address.
-        /// </summary>
-        /// <param name="ip">IP address</param>
-        /// <returns>KSoftGeoIP</returns>
-        public async Task<KSoftGeoIP> GeoIP(string ip) {
-            var queries = new NameValueCollection {{"ip", ip}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftGeoIP>(HttpMethod.Get, "kumo/geoip", queries);
-        }
-
-        /// <summary>
-        ///     Currency conversion.
-        /// </summary>
-        /// <param name="from">ISO Standard for 3 letter currency naming: https://en.wikipedia.org/wiki/ISO_4217#Active_codes</param>
-        /// <param name="to">ISO Standard for 3 letter currency naming: https://en.wikipedia.org/wiki/ISO_4217#Active_codes</param>
-        /// <param name="value">Float or Integer you want to convert</param>
-        /// <returns>KSoftCurrency</returns>
-        public async Task<KSoftCurrency> CurrencyConversion(string from, string to, float value) {
-            var queries = new NameValueCollection {{"from", from}, {"to", to}, {"value", value.ToString(CultureInfo.InvariantCulture)}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftCurrency>(HttpMethod.Get, "kumo/currency", queries);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/KSoft/MusicAPI.cs b/KSoftNet/KSoft/MusicAPI.cs
deleted file mode 100644
index fbd8095..0000000
--- a/KSoftNet/KSoft/MusicAPI.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Collections.Specialized;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using KSoftNet.Models;
-using Newtonsoft.Json;
-
-namespace KSoftNet.KSoft {
-    /// <summary>
-    ///     This API provides deep and powerful tools for searching lyrics, artists or albums. Unlike other APIs, it can also
-    ///     search by lyrics and does not need a separate artist and song name entries.
-    /// </summary>
-    public class MusicAPI {
-
-        private readonly KSoftAPI _kSoftAPI;
-        /// <summary>
-        ///     This API provides deep and powerful tools for searching lyrics, artists or albums. Unlike other APIs, it can also
-        ///     search by lyrics and does not need a separate artist and song name entries.
-        /// </summary>
-        /// <param name="kSoftAPI">Base KSoftAPI class</param>
-        public MusicAPI(KSoftAPI kSoftAPI) {
-            _kSoftAPI = kSoftAPI;
-        }
-        #region Music API
-
-        /// <summary>
-        ///     Searches for lyrics and returns a list of results.
-        /// </summary>
-        /// <param name="query">Search query.</param>
-        /// <param name="textOnly">Default: false, if set to 'true' then it only searches inside the lyrics.</param>
-        /// <param name="limit">Default: 10, how many results should the endpoint return.</param>
-        /// <returns>KSoftLyrics</returns>
-        public async Task<KSoftLyrics> SearchLyrics(string query, bool textOnly, int limit) {
-            var queries = new NameValueCollection {{"q", query}, {"text_only", textOnly.ToString()}, {"limit", limit.ToString()}};
-
-            return await _kSoftAPI.ExecuteAsync<KSoftLyrics>(HttpMethod.Get, "lyrics/search", queries);
-        }
-
-        /// <summary>
-        ///     Retrieves music recommendations based on tracks user inputs.
-        /// </summary>
-        /// <param name="tracks">List of tracks.</param>
-        /// <param name="provider">Format in which you'll provide tracks. Can be: youtube, youtube_ids, spotify</param>
-        /// <returns>KSoftRecommendations</returns>
-        public async Task<KSoftRecommendations> MusicRecommendations(string[] tracks, string provider) {
-            var json = new StringContent(JsonConvert.SerializeObject(new {tracks, provider}), Encoding.UTF8, "application/json");
-
-            return await _kSoftAPI.ExecuteAsync<KSoftRecommendations>(HttpMethod.Post, "music/recommendations", json);
-        }
-
-        /// <summary>
-        ///     Retrieves all albums and songs by that artist.
-        /// </summary>
-        /// <param name="id">Artist ID, you can get it from the lyrics search</param>
-        /// <returns>KSoftArtistInfo</returns>
-        public async Task<KSoftArtistInfo> ArtistByID(int id) {
-            return await _kSoftAPI.ExecuteAsync<KSoftArtistInfo>(HttpMethod.Get, $"lyrics/artist/{id}");
-        }
-
-        /// <summary>
-        ///     Retrieves artist name and all tracks in the album.
-        /// </summary>
-        /// <param name="id">Album ID, you can get it from the lyrics search</param>
-        /// <returns>KSoftAlbumInfo</returns>
-        public async Task<KSoftAlbumInfo> AlbumByID(int id) {
-            return await _kSoftAPI.ExecuteAsync<KSoftAlbumInfo>(HttpMethod.Get, $"lyrics/album/{id}");
-        }
-
-        /// <summary>
-        ///     Get info about a song.
-        /// </summary>
-        /// <param name="id">Track ID, you can get it from artist by id, album by id or lyrics search endpoints</param>
-        /// <returns>KSoftTrackInfo</returns>
-        public async Task<KSoftTrackInfo> TrackByID(int id) {
-            return await _kSoftAPI.ExecuteAsync<KSoftTrackInfo>(HttpMethod.Get, $"lyrics/track/{id}");
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/KSoftAPI.cs b/KSoftNet/KSoftAPI.cs
index 35ba0b1..5bb9f0f 100644
--- a/KSoftNet/KSoftAPI.cs
+++ b/KSoftNet/KSoftAPI.cs
@@ -1,135 +1,79 @@
 using System;
-using System.Collections.Specialized;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using System.Web;
-using KSoftNet.KSoft;
+using KSoftNet.Endpoints;
+using KSoftNet.Utils;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
+using Refit;
 
 namespace KSoftNet {
-    /// <summary>
-    ///     KSoftAPI class
-    /// </summary>
-    public class KSoftAPI {
-        /// <summary>
-        ///     Base KSoft API url. Don't change unless you know what you're doing
-        /// </summary>
-        public const string BaseUrl = "https://api.ksoft.si/";
-
-        private readonly HttpClient _httpClient;
-
-        /// <summary>
-        ///     Advanced and powerful global ban list API
-        /// </summary>
-        public readonly BansAPI bansAPI;
-
-        /// <summary>
-        ///     Random hand-picked images, random memes from Reddit and other Reddit parsers.
-        /// </summary>
-        public readonly ImagesAPI imagesAPI;
-
-        /// <summary>
-        ///     This is advanced real-time information API for geo-spatial, weather and information gathering data
-        /// </summary>
-        public readonly KumoAPI kumoAPI;
-
-        /// <summary>
-        ///     This API provides deep and powerful tools for searching lyrics, artists or albums. Unlike other APIs, it can also
-        ///     search by lyrics and does not need a separate artist and song name entries.
-        /// </summary>
-        public readonly MusicAPI musicAPI;
-
-        /// <summary>
-        ///     KSoftAPI class
-        /// </summary>
-        /// <param name="accountToken">KSoft api token located on your dashboard</param>
-        public KSoftAPI(string accountToken) {
-            _httpClient = new HttpClient();
-            _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accountToken);
 
-            imagesAPI = new ImagesAPI(this);
-            kumoAPI = new KumoAPI(this);
-            bansAPI = new BansAPI(this);
-            musicAPI = new MusicAPI(this);
-        }
-
-        private async Task<T> DoShitAsync<T>(HttpMethod method, string endpoint, NameValueCollection queries = null,
-            HttpContent jsonContent = null) where T : new() {
-            var builder = new UriBuilder(BaseUrl) {Port = -1, Path = endpoint};
-
-            var query = HttpUtility.ParseQueryString(builder.Query);
+  public static class CumExtensions {
+    public static string ToJson(this object obj) {
+      return JsonConvert.SerializeObject(obj);
+    }
+  }
 
-            if (queries != null) query.Add(queries);
+  /// <summary>
+  ///   KSoftApi class
+  /// </summary>
+  public class KSoftApi {
+    /// <summary>
+    /// Random hand-picked images, random memes from Reddit and other Reddit parsers.
+    /// </summary>
+    public IImagesApi ImagesApi { get; private set; }
 
-            builder.Query = query.ToString();
-            var url = builder.ToString();
+    /// <summary>
+    /// This is advanced real-time information API for geo-spatial, weather and information gathering data
+    /// </summary>
+    public IKumoApi KumoApi { get; private set; }
 
-            HttpResponseMessage response;
+    /// <summary>
+    /// Advanced and powerful global ban list API
+    /// </summary>
+    public IBansApi BansApi { get; private set; }
 
-            if (jsonContent != null)
-                response = await _httpClient.PostAsync(url, jsonContent);
-            else
-                response = await _httpClient.SendAsync(new HttpRequestMessage(method, url));
+    /// <summary>
+    /// This API provides deep and powerful tools for searching lyrics, artists or albums. Unlike other APIs, it can also search by lyrics and does not need a separate artist and song name entries.
+    /// </summary>
+    public IMusicApi MusicApi { get; private set; }
 
-            if (!response.IsSuccessStatusCode) throw new HttpRequestException("401: Unauthorized. Is your token valid?");
+    private const string BaseUrl = ("https://api.ksoft.si");
+    // private const string BaseUrl = ("https://postman-echo.com");
 
-            return JsonConvert.DeserializeObject<T>(await response.Content.ReadAsStringAsync(),
-                new JsonSerializerSettings {
-                    ContractResolver = new DefaultContractResolver {NamingStrategy = new SnakeCaseNamingStrategy()}
-                });
+    /// <summary>
+    /// Constructor with token only
+    /// </summary>
+    /// <param name="token">KSoft api v1 token</param>
+    public KSoftApi(string token) {
+      var httpClient = new HttpClient() {
+        BaseAddress = new Uri(BaseUrl),
+        DefaultRequestHeaders = {
+          Authorization = new AuthenticationHeaderValue("Bearer", token)
         }
+      };
 
-        /// <summary>
-        ///     Get response from the specified KSoft endpoint
-        /// </summary>
-        /// <typeparam name="T">JSON deserialization response model</typeparam>
-        /// <param name="method">HTTP Method</param>
-        /// <param name="endpoint">Endpoint URL</param>
-        /// <param name="queries">Name Value Collection of query names and values</param>
-        /// <param name="jsonContent">JSON body</param>
-        /// <returns>Deserialized JSON model</returns>
-        public async Task<T> ExecuteAsync<T>(HttpMethod method, string endpoint, NameValueCollection queries,
-            StringContent jsonContent) where T : new() {
-            return await DoShitAsync<T>(method, endpoint, queries, jsonContent);
-        }
+      Initialize(httpClient);
+    }
 
-        /// <summary>
-        ///     Get response from the specified KSoft endpoint
-        /// </summary>
-        /// <typeparam name="T">JSON deserialization response model</typeparam>
-        /// <param name="method">HTTP Method</param>
-        /// <param name="endpoint">Endpoint URL</param>
-        /// <param name="queries">Name Value Collection of query names and values</param>
-        /// <returns>Deserialized JSON model</returns>
-        public async Task<T> ExecuteAsync<T>(HttpMethod method, string endpoint, NameValueCollection queries)
-            where T : new() {
-            return await DoShitAsync<T>(method, endpoint, queries);
-        }
+    /// <summary>
+    /// Constructor with custom HttpClient, must set BaseAddress and Authorization header manually
+    /// </summary>
+    /// <param name="httpClient">HttpClient instance</param>
+    public KSoftApi(HttpClient httpClient) {
+      Initialize(httpClient);
+    }
 
-        /// <summary>
-        ///     Get response from the specified KSoft endpoint
-        /// </summary>
-        /// <typeparam name="T">JSON deserialization response model</typeparam>
-        /// <param name="method">HTTP Method</param>
-        /// <param name="endpoint">Endpoint URL</param>
-        /// <param name="jsonContent">JSON body</param>
-        /// <returns>Deserialized JSON model</returns>
-        public async Task<T> ExecuteAsync<T>(HttpMethod method, string endpoint, StringContent jsonContent)
-            where T : new() {
-            return await DoShitAsync<T>(method, endpoint, null, jsonContent);
-        }
+    private void Initialize(HttpClient httpClient) {
+      var refitSettings = new RefitSettings {
+        UrlParameterFormatter = new ParameterFormatter()
+      };
 
-        /// <summary>
-        ///     Get response from the specified KSoft endpoint
-        /// </summary>
-        /// <typeparam name="T">JSON deserialization response model</typeparam>
-        /// <param name="method">HTTP Method</param>
-        /// <param name="endpoint">Endpoint URL</param>
-        /// <returns>Deserialized JSON model</returns>
-        public async Task<T> ExecuteAsync<T>(HttpMethod method, string endpoint) where T : new() {
-            return await DoShitAsync<T>(method, endpoint);
-        }
+      ImagesApi = RestService.For<IImagesApi>(httpClient, refitSettings);
+      BansApi = RestService.For<IBansApi>(httpClient, refitSettings);
+      KumoApi = RestService.For<IKumoApi>(httpClient, refitSettings);
+      MusicApi = RestService.For<IMusicApi>(httpClient, refitSettings);
     }
+  }
+
 }
\ No newline at end of file
diff --git a/KSoftNet/KSoftNet.csproj b/KSoftNet/KSoftNet.csproj
index f453ea7..c2b3bd0 100644
--- a/KSoftNet/KSoftNet.csproj
+++ b/KSoftNet/KSoftNet.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
     <Version>3.0.0</Version>
     <Authors>fooooooooooooooo</Authors>
     <Company>KSoft.si</Company>
@@ -16,6 +15,7 @@
     <RepositoryUrl>https://github.com/KSoft-Si/KSoft.Net</RepositoryUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageVersion>3.0.1</PackageVersion>
+    <TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Refit" Version="6.0.94" />
   </ItemGroup>
 
 </Project>
diff --git a/KSoftNet/Models/Bans/Ban.cs b/KSoftNet/Models/Bans/Ban.cs
new file mode 100644
index 0000000..1ed0015
--- /dev/null
+++ b/KSoftNet/Models/Bans/Ban.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Bans {
+  /// <summary>
+  /// Ban creation status
+  /// </summary>
+  public class Ban {
+    /// <summary>
+    /// Ban was successfully recorded.
+    /// </summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Bans/BanCheck.cs b/KSoftNet/Models/Bans/BanCheck.cs
new file mode 100644
index 0000000..4feabc0
--- /dev/null
+++ b/KSoftNet/Models/Bans/BanCheck.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Bans {
+  /// <summary>
+  /// Ban check status
+  /// </summary>
+  public class BanCheck {
+    /// <summary>
+    /// If user is banned
+    /// </summary>
+    [JsonPropertyName("is_banned")]
+    public bool IsBanned { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Bans/BanDeletion.cs b/KSoftNet/Models/Bans/BanDeletion.cs
new file mode 100644
index 0000000..8d7d3c8
--- /dev/null
+++ b/KSoftNet/Models/Bans/BanDeletion.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Bans {
+  /// <summary>
+  /// Ban deletion status
+  /// </summary>
+  public class BanDeletion {
+    /// <summary>
+    /// If successful
+    /// </summary>
+    [JsonPropertyName("done")]
+    public bool Done { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Bans/BanInfo.cs b/KSoftNet/Models/Bans/BanInfo.cs
new file mode 100644
index 0000000..7866deb
--- /dev/null
+++ b/KSoftNet/Models/Bans/BanInfo.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Bans {
+  /// <summary>
+  /// Ban information
+  /// </summary>
+  public class BanInfo {
+    /// <summary>
+    /// Banned user ID
+    /// </summary>
+    [JsonPropertyName("id")] public string Id { get; set; }
+
+    /// <summary>
+    /// Banned user username
+    /// </summary>
+    [JsonPropertyName("name")] public string Name { get; set; }
+
+    /// <summary>
+    /// Banned user discriminator
+    /// </summary>
+    [JsonPropertyName("discriminator")] public string Discriminator { get; set; }
+
+    /// <summary>
+    /// Discord ID of moderator who banned
+    /// </summary>
+    [JsonPropertyName("moderator_id")] public string ModeratorId { get; set; }
+
+    /// <summary>
+    /// Ban reason
+    /// </summary>
+    [JsonPropertyName("reason")] public string Reason { get; set; }
+
+    /// <summary>
+    /// Ban proof
+    /// </summary>
+    [JsonPropertyName("proof")] public string Proof { get; set; }
+
+    /// <summary>
+    /// If ban is active
+    /// </summary>
+    [JsonPropertyName("is_ban_active")] public bool IsBanActive { get; set; }
+
+    /// <summary>
+    /// If ban can be appealed
+    /// </summary>
+    [JsonPropertyName("can_be_appealed")] public bool CanBeAppealed { get; set; }
+
+    /// <summary>
+    /// Time of ban
+    /// </summary>
+    [JsonPropertyName("timestamp")] public DateTime Timestamp { get; set; }
+
+    /// <summary>
+    /// Appeal reason, if any
+    /// </summary>
+    [JsonPropertyName("appeal_reason")] public object AppealReason { get; set; }
+
+    /// <summary>
+    /// Appeal date
+    /// </summary>
+    [JsonPropertyName("appeal_date")] public object AppealDate { get; set; }
+
+    /// <summary>
+    /// Ban requester
+    /// </summary>
+    [JsonPropertyName("requested_by")] public string RequestedBy { get; set; }
+
+    /// <summary>
+    /// If ban exists
+    /// </summary>
+    [JsonPropertyName("exists")] public bool Exists { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Bans/BanList.cs b/KSoftNet/Models/Bans/BanList.cs
new file mode 100644
index 0000000..2dc3181
--- /dev/null
+++ b/KSoftNet/Models/Bans/BanList.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Bans {
+  /// <summary>
+  /// Paginated list of bans
+  /// </summary>
+  public class BanList {
+    /// <summary>
+    /// Total ban count
+    /// </summary>
+    [JsonPropertyName("ban_count")]
+    public int BanCount { get; set; }
+
+    /// <summary>
+    /// Total page count
+    /// </summary>
+    [JsonPropertyName("page_count")]
+    public int PageCount { get; set; }
+
+    /// <summary>
+    /// Bans displayed per page
+    /// </summary>
+    [JsonPropertyName("per_page")]
+    public int PerPage { get; set; }
+
+    /// <summary>
+    /// Current page
+    /// </summary>
+    [JsonPropertyName("page")]
+    public int Page { get; set; }
+
+    /// <summary>
+    /// Count of bans displayed
+    /// </summary>
+    [JsonPropertyName("on_page")]
+    public int OnPage { get; set; }
+
+    /// <summary>
+    /// Next page number
+    /// </summary>
+    [JsonPropertyName("next_page")]
+    public int NextPage { get; set; }
+
+    /// <summary>
+    /// Previous page number
+    /// </summary>
+    [JsonPropertyName("previous_page")]
+    public object PreviousPage { get; set; }
+
+    /// <summary>
+    /// Ban data
+    /// </summary>
+    [JsonPropertyName("data")]
+    public List<BanInfo> Bans { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Bans/BanUpdates.cs b/KSoftNet/Models/Bans/BanUpdates.cs
new file mode 100644
index 0000000..5e0b982
--- /dev/null
+++ b/KSoftNet/Models/Bans/BanUpdates.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Bans {
+  /// <summary>
+  /// Minimal ban info
+  /// </summary>
+  public class SmallBanInfo {
+    /// <summary>
+    /// Banned user ID
+    /// </summary>
+    [JsonPropertyName("id")]
+    public object Id { get; set; }
+
+    /// <summary>
+    /// Ban reason
+    /// </summary>
+    [JsonPropertyName("reason")]
+    public string Reason { get; set; }
+
+    /// <summary>
+    /// Ban Proof
+    /// </summary>
+    [JsonPropertyName("proof")]
+    public string Proof { get; set; }
+
+    /// <summary>
+    /// Mod who banned
+    /// </summary>
+    [JsonPropertyName("moderator_id")]
+    public object ModeratorId { get; set; }
+
+    /// <summary>
+    /// If ban is active
+    /// </summary>
+    [JsonPropertyName("active")]
+    public bool Active { get; set; }
+  }
+
+  /// <summary>
+  /// Bans since last update
+  /// </summary>
+  public class BanUpdates {
+    /// <summary>
+    /// List of bans
+    /// </summary>
+    [JsonPropertyName("data")]
+    public List<SmallBanInfo> Bans { get; set; }
+
+    /// <summary>
+    /// Timestamp of request
+    /// </summary>
+    [JsonPropertyName("current_timestamp")]
+    public int CurrentTimestamp { get; set; }
+  }
+
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Images/Image.cs b/KSoftNet/Models/Images/Image.cs
new file mode 100644
index 0000000..1c05f01
--- /dev/null
+++ b/KSoftNet/Models/Images/Image.cs
@@ -0,0 +1,32 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Images {
+  /// <summary>
+  /// Image
+  /// </summary>
+  public class Image {
+    /// <summary>
+    /// Image URL
+    /// </summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; }
+
+    /// <summary>
+    /// Image ID
+    /// </summary>
+    [JsonPropertyName("snowflake")]
+    public string Snowflake { get; set; }
+
+    /// <summary>
+    /// If image is NSFW
+    /// </summary>
+    [JsonPropertyName("nsfw")]
+    public bool Nsfw { get; set; }
+
+    /// <summary>
+    /// Image tag
+    /// </summary>
+    [JsonPropertyName("tag")]
+    public string Tag { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Images/RedditPost.cs b/KSoftNet/Models/Images/RedditPost.cs
new file mode 100644
index 0000000..7c4fcb7
--- /dev/null
+++ b/KSoftNet/Models/Images/RedditPost.cs
@@ -0,0 +1,86 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Images {
+  /// <summary>
+  /// Reddit post
+  /// </summary>
+  public class RedditPost {
+    /// <summary>
+    /// Post title
+    /// </summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Post image URL
+    /// </summary>
+    [JsonPropertyName("image_url")]
+    public string ImageUrl { get; set; }
+
+    /// <summary>
+    /// Post source URL
+    /// </summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; }
+
+    /// <summary>
+    /// Post source subreddit
+    /// </summary>
+    [JsonPropertyName("subreddit")]
+    public string Subreddit { get; set; }
+
+    /// <summary>
+    /// Post upvote count
+    /// </summary>
+    [JsonPropertyName("upvotes")]
+    public int Upvotes { get; set; }
+
+    /// <summary>
+    /// Post downvote count
+    /// </summary>
+    [JsonPropertyName("downvotes")]
+    public int Downvotes { get; set; }
+
+    /// <summary>
+    /// Post comment count
+    /// </summary>
+    [JsonPropertyName("comments")]
+    public int Comments { get; set; }
+
+    /// <summary>
+    /// Created at timestamp
+    /// </summary>
+    [JsonPropertyName("created_at")]
+    public double CreatedAt { get; set; }
+
+    /// <summary>
+    /// If post is NSFW
+    /// </summary>
+    [JsonPropertyName("nsfw")]
+    public bool Nsfw { get; set; }
+
+    /// <summary>
+    /// Post author username
+    /// </summary>
+    [JsonPropertyName("author")]
+    public string Author { get; set; }
+
+    /// <summary>
+    /// Post awards
+    /// </summary>
+    [JsonPropertyName("awards")]
+    public int Awards { get; set; }
+
+    /// <summary>
+    /// If post is cached
+    /// </summary>
+    [JsonPropertyName("meta__cached")]
+    public bool MetaCached { get; set; }
+
+    /// <summary>
+    /// If post is processed
+    /// </summary>
+    [JsonPropertyName("meta__processed")]
+    public bool MetaProcessed { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Images/TagList.cs b/KSoftNet/Models/Images/TagList.cs
new file mode 100644
index 0000000..4cd0bc4
--- /dev/null
+++ b/KSoftNet/Models/Images/TagList.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Images {
+  /// <summary>
+  /// Tag info
+  /// </summary>
+  public class TagInfo {
+    /// <summary>
+    /// Tag name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Is NSFW
+    /// </summary>
+    [JsonPropertyName("nsfw")]
+    public bool Nsfw { get; set; }
+  }
+
+  /// <summary>
+  /// List of tags
+  /// </summary>
+  public class TagList {
+    /// <summary>
+    /// Tag info
+    /// </summary>
+    [JsonPropertyName("models")]
+    public List<TagInfo> Models { get; set; }
+
+    /// <summary>
+    /// All tags
+    /// </summary>
+    [JsonPropertyName("tags")]
+    public List<string> Tags { get; set; }
+
+    /// <summary>
+    /// All NSFW tags
+    /// </summary>
+    [JsonPropertyName("nsfw_tags")]
+    public List<string> NsfwTags { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Images/WikihowPost.cs b/KSoftNet/Models/Images/WikihowPost.cs
new file mode 100644
index 0000000..49b486f
--- /dev/null
+++ b/KSoftNet/Models/Images/WikihowPost.cs
@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Images {
+  public class WikihowPost {
+    /// <summary>
+    /// Post image URL
+    /// </summary>
+    [JsonPropertyName("url")] public string ImageUrl { get; set; }
+
+    /// <summary>
+    /// Post title
+    /// </summary>
+    [JsonPropertyName("title")] public string Title { get; set; }
+
+    /// <summary>
+    /// If post is NSFW
+    /// </summary>
+    [JsonPropertyName("nsfw")] public bool Nsfw { get; set; }
+
+    /// <summary>
+    /// Post source URL
+    /// </summary>
+    [JsonPropertyName("article_url")] public string ArticleUrl { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftAlbumInfo.cs b/KSoftNet/Models/KSoftAlbumInfo.cs
deleted file mode 100644
index 78a3ac5..0000000
--- a/KSoftNet/Models/KSoftAlbumInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftAlbumInfoArtist {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Uri { get; set; }
-    }
-
-    public class KSoftAlbumInfoTrack {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Uri { get; set; }
-    }
-
-    public class KSoftAlbumInfo {
-        public int Id { get; set; }
-        public string Uri { get; set; }
-        public string Name { get; set; }
-        public int Year { get; set; }
-        public KSoftAlbumInfoArtist Artist { get; set; }
-        public IList<KSoftAlbumInfoTrack> Tracks { get; set; }
-
-        // Error
-        public int Code { get; set; }
-        public bool Error { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftArtistInfo.cs b/KSoftNet/Models/KSoftArtistInfo.cs
deleted file mode 100644
index 82fe77e..0000000
--- a/KSoftNet/Models/KSoftArtistInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftArtistInfoAlbum {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public int Year { get; set; }
-    }
-
-    public class KSoftArtistInfoTrack {
-        public int Id { get; set; }
-        public string Name { get; set; }
-    }
-
-    public class KSoftArtistInfo {
-        public int Id { get; set; }
-        public string Uri { get; set; }
-        public string Name { get; set; }
-        public IList<KSoftArtistInfoAlbum> Albums { get; set; }
-        public IList<KSoftArtistInfoTrack> Tracks { get; set; }
-
-        // Error
-        public int Code { get; set; }
-        public bool Error { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftBan.cs b/KSoftNet/Models/KSoftBan.cs
deleted file mode 100644
index 4a7cbee..0000000
--- a/KSoftNet/Models/KSoftBan.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftBan {
-        public bool Success { get; set; }
-        public bool Exists { get; set; }
-
-        // Error
-        public int Code { get; set; }
-        public bool Error { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftBanCheck.cs b/KSoftNet/Models/KSoftBanCheck.cs
deleted file mode 100644
index 7df1b11..0000000
--- a/KSoftNet/Models/KSoftBanCheck.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftBanCheck {
-        public bool IsBanned { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftBanDeletion.cs b/KSoftNet/Models/KSoftBanDeletion.cs
deleted file mode 100644
index fd0062c..0000000
--- a/KSoftNet/Models/KSoftBanDeletion.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftBanDeletion {
-        public string Done { get; set; }
-
-        // Error
-        public int Code { get; set; }
-        public string Error { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftBanInfo.cs b/KSoftNet/Models/KSoftBanInfo.cs
deleted file mode 100644
index 30ca217..0000000
--- a/KSoftNet/Models/KSoftBanInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace KSoftNet.Models {
-    public class KSoftBanInfo {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string Discriminator { get; set; }
-        public string ModeratorId { get; set; }
-        public string Reason { get; set; }
-        public string Proof { get; set; }
-        public bool IsBanActive { get; set; }
-        public bool CanBeAppealed { get; set; }
-        public DateTime Timestamp { get; set; }
-        public string AppealReason { get; set; }
-        public object AppealDate { get; set; }
-        public string RequestedBy { get; set; }
-        public bool Exists { get; set; }
-
-        // Error
-        public int Code { get; set; }
-        public bool Error { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftBanList.cs b/KSoftNet/Models/KSoftBanList.cs
deleted file mode 100644
index 3fb518c..0000000
--- a/KSoftNet/Models/KSoftBanList.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftBanListDatum {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string Discriminator { get; set; }
-        public string ModeratorId { get; set; }
-        public string Reason { get; set; }
-        public string Proof { get; set; }
-        public bool IsBanActive { get; set; }
-        public bool CanBeAppealed { get; set; }
-        public DateTime Timestamp { get; set; }
-        public string AppealReason { get; set; }
-        public object AppealDate { get; set; }
-    }
-
-    public class KSoftBanList {
-        public int BanCount { get; set; }
-        public int PageCount { get; set; }
-        public int PerPage { get; set; }
-        public int Page { get; set; }
-        public int OnPage { get; set; }
-        public int NextPage { get; set; }
-        public object PreviousPage { get; set; }
-        public IList<KSoftBanListDatum> Data { get; set; }
-
-        // Error
-        public bool Error { get; set; }
-        public int Code { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftBanUpdates.cs b/KSoftNet/Models/KSoftBanUpdates.cs
deleted file mode 100644
index af1530c..0000000
--- a/KSoftNet/Models/KSoftBanUpdates.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftBanUpdatesDatum {
-        public object Id { get; set; }
-        public string Reason { get; set; }
-        public string Proof { get; set; }
-        public object ModeratorId { get; set; }
-        public bool Active { get; set; }
-    }
-
-    public class KSoftBanUpdates {
-        public IList<KSoftBanUpdatesDatum> Data { get; set; }
-        public int CurrentTimestamp { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftCurrency.cs b/KSoftNet/Models/KSoftCurrency.cs
deleted file mode 100644
index 1d50e6b..0000000
--- a/KSoftNet/Models/KSoftCurrency.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftCurrency {
-        public double Value { get; set; }
-        public string Pretty { get; set; }
-
-        // Error
-        public bool Error { get; set; }
-        public int Code { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftGeoIP.cs b/KSoftNet/Models/KSoftGeoIP.cs
deleted file mode 100644
index 76c3e84..0000000
--- a/KSoftNet/Models/KSoftGeoIP.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftGeoIPAPIs {
-        public string Weather { get; set; }
-        public string Gis { get; set; }
-        public string Openstreetmap { get; set; }
-        public string Googlemaps { get; set; }
-    }
-
-    public class KSoftGeoIPData {
-        public string City { get; set; }
-        public string ContinentCode { get; set; }
-        public string ContinentName { get; set; }
-        public string CountryCode { get; set; }
-        public string CountryName { get; set; }
-        public object DmaCode { get; set; }
-        public double Latitude { get; set; }
-        public double Longitude { get; set; }
-        public string PostalCode { get; set; }
-        public string Region { get; set; }
-        public string TimeZone { get; set; }
-        public KSoftGeoIPAPIs APIs { get; set; }
-    }
-
-    public class KSoftGeoIP {
-        public bool Error { get; set; }
-        public int Code { get; set; }
-        public string Message { get; set; }
-        public KSoftGeoIPData Data { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftImage.cs b/KSoftNet/Models/KSoftImage.cs
deleted file mode 100644
index 26aa0db..0000000
--- a/KSoftNet/Models/KSoftImage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftImage {
-        public string Url { get; set; }
-        public string Snowflake { get; set; }
-        public bool Nsfw { get; set; }
-        public string Tag { get; set; }
-
-        // Error
-
-        public int Code { get; set; }
-        public string Message { get; set; }
-        public bool Cache { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftLocation.cs b/KSoftNet/Models/KSoftLocation.cs
deleted file mode 100644
index f7e7b32..0000000
--- a/KSoftNet/Models/KSoftLocation.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftLocationData {
-        public string Address { get; set; }
-        public double Lat { get; set; }
-        public double Lon { get; set; }
-        public IList<string> BoundingBox { get; set; }
-        public IList<string> Type { get; set; }
-        public string Map { get; set; }
-    }
-
-    public class KSoftLocation {
-        public bool Error { get; set; }
-        public int Code { get; set; }
-        public KSoftLocationData Data { get; set; }
-        public string Message { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftLyrics.cs b/KSoftNet/Models/KSoftLyrics.cs
deleted file mode 100644
index 86ac6a4..0000000
--- a/KSoftNet/Models/KSoftLyrics.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftLyricsData {
-        public string Artist { get; set; }
-        public int ArtistId { get; set; }
-        public string Album { get; set; }
-        public string AlbumIds { get; set; }
-        public string AlbumYear { get; set; }
-        public string Name { get; set; }
-        public string Lyrics { get; set; }
-        public string SearchStr { get; set; }
-        public string Id { get; set; }
-        public double SearchScore { get; set; }
-    }
-
-    public class KSoftLyrics {
-        public int Total { get; set; }
-        public int Took { get; set; }
-        public IList<KSoftLyricsData> Data { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftRecommendations.cs b/KSoftNet/Models/KSoftRecommendations.cs
deleted file mode 100644
index e1f41da..0000000
--- a/KSoftNet/Models/KSoftRecommendations.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftRecommendationsYoutube {
-        public string Id { get; set; }
-        public string Link { get; set; }
-        public string Title { get; set; }
-        public string Thumbnail { get; set; }
-        public string Description { get; set; }
-    }
-
-    public class KSoftRecommendationsAlbum {
-        public string Name { get; set; }
-        public string AlbumArt { get; set; }
-        public string Link { get; set; }
-    }
-
-    public class KSoftRecommendationsArtist {
-        public string Name { get; set; }
-        public string Link { get; set; }
-    }
-
-    public class KSoftRecommendationsSpotify {
-        public string Id { get; set; }
-        public KSoftRecommendationsAlbum Album { get; set; }
-        public IList<KSoftRecommendationsArtist> Artists { get; set; }
-        public string Name { get; set; }
-        public string Link { get; set; }
-    }
-
-    public class KSoftRecommendationsTrack {
-        public KSoftRecommendationsYoutube Youtube { get; set; }
-        public KSoftRecommendationsSpotify Spotify { get; set; }
-        public string Name { get; set; }
-    }
-
-    public class KSoftRecommendations {
-        public string Provider { get; set; }
-        public int Total { get; set; }
-        public IList<KSoftRecommendationsTrack> Tracks { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftRedditPost.cs b/KSoftNet/Models/KSoftRedditPost.cs
deleted file mode 100644
index 290b90a..0000000
--- a/KSoftNet/Models/KSoftRedditPost.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftRedditPost {
-        public string Title { get; set; }
-        public string ImageUrl { get; set; }
-        public string Source { get; set; }
-        public string Subreddit { get; set; }
-        public int Upvotes { get; set; }
-        public int Downvotes { get; set; }
-        public int Comments { get; set; }
-        public double CreatedAt { get; set; }
-        public bool Nsfw { get; set; }
-        public string Author { get; set; }
-        public int Awards { get; set; }
-        public bool MetaCached { get; set; }
-        public bool MetaProcessed { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftTags.cs b/KSoftNet/Models/KSoftTags.cs
deleted file mode 100644
index 7870e43..0000000
--- a/KSoftNet/Models/KSoftTags.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class Model {
-        public string Name { get; set; }
-        public bool Nsfw { get; set; }
-    }
-
-    public class KSoftTags {
-        public IList<Model> Models { get; set; }
-        public IList<string> Tags { get; set; }
-        public IList<string> NsfwTags { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftTrackInfo.cs b/KSoftNet/Models/KSoftTrackInfo.cs
deleted file mode 100644
index 6af9ea2..0000000
--- a/KSoftNet/Models/KSoftTrackInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-    public class KSoftTrackInfoArtist {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Uri { get; set; }
-    }
-
-    public class KSoftTrackInfoAlbum {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public int Year { get; set; }
-        public string Uri { get; set; }
-    }
-
-    public class KSoftTrackInfoOther {
-        public int Bpm { get; set; }
-        public int Gain { get; set; }
-    }
-
-    public class KSoftTrackInfoDeezer {
-        public object Album { get; set; }
-        public object Track { get; set; }
-        public IList<KSoftTrackInfoArtist> Artists { get; set; }
-    }
-
-    public class KSoftTrackInfoSpotify {
-        public object Album { get; set; }
-        public object Track { get; set; }
-        public IList<KSoftTrackInfoArtist> Artists { get; set; }
-    }
-
-    public class KSoftTrackInfoMeta {
-        public KSoftTrackInfoOther Other { get; set; }
-        public KSoftTrackInfoDeezer Deezer { get; set; }
-        public IList<KSoftTrackInfoArtist> Artists { get; set; }
-        public KSoftTrackInfoSpotify Spotify { get; set; }
-    }
-
-    public class KSoftTrackInfo {
-        public int Id { get; set; }
-        public string Uri { get; set; }
-        public string Name { get; set; }
-        public KSoftTrackInfoArtist Artist { get; set; }
-        public IList<KSoftTrackInfoAlbum> Albums { get; set; }
-        public string Lyrics { get; set; }
-        public IList<string> Singalong { get; set; }
-        public KSoftTrackInfoMeta Meta { get; set; }
-        public string Url { get; set; }
-        public int Popularity { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftWeather.cs b/KSoftNet/Models/KSoftWeather.cs
deleted file mode 100644
index a7a5a20..0000000
--- a/KSoftNet/Models/KSoftWeather.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace KSoftNet.Models {
-
-
-    public class KSoftWeatherAlert {
-        public string Title { get; set; }
-        public IList<string> Regions { get; set; }
-        public string Severity { get; set; }
-        public int Time { get; set; }
-        public int Expires { get; set; }
-        public string Description { get; set; }
-        public string Uri { get; set; }
-    }
-
-    public class KSoftWeatherLocation {
-        public double Lat { get; set; }
-        public double Lon { get; set; }
-        public string Address { get; set; }
-    }
-
-    public class KSoftWeatherData {
-        public DateTime Time { get; set; }
-        public string Summary { get; set; }
-        public string Icon { get; set; }
-        public int PrecipIntensity { get; set; }
-        public int PrecipProbability { get; set; }
-        public double Temperature { get; set; }
-        public double ApparentTemperature { get; set; }
-        public double DewPoint { get; set; }
-        public double Humidity { get; set; }
-        public double Pressure { get; set; }
-        public double WindSpeed { get; set; }
-        public double WindGust { get; set; }
-        public int WindBearing { get; set; }
-        public double CloudCover { get; set; }
-        public int UvIndex { get; set; }
-        public double Visibility { get; set; }
-        public double Ozone { get; set; }
-        public object SunriseTime { get; set; }
-        public object SunsetTime { get; set; }
-        public string IconUrl { get; set; }
-        public IList<KSoftWeatherAlert> Alerts { get; set; }
-        public string Units { get; set; }
-        public KSoftWeatherLocation Location { get; set; }
-    }
-
-    public class KSoftWeather {
-        public bool Error { get; set; }
-        public int Status { get; set; }
-        public string Message { get; set; }
-        public KSoftWeatherData Data { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/KSoftWikiHowPost.cs b/KSoftNet/Models/KSoftWikiHowPost.cs
deleted file mode 100644
index bfb9b32..0000000
--- a/KSoftNet/Models/KSoftWikiHowPost.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace KSoftNet.Models {
-    public class KSoftWikiHowPost {
-        public string Url { get; set; }
-        public string Title { get; set; }
-        public bool Nsfw { get; set; }
-        public string ArticleUrl { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/KSoftNet/Models/Kumo/Currency.cs b/KSoftNet/Models/Kumo/Currency.cs
new file mode 100644
index 0000000..424dcae
--- /dev/null
+++ b/KSoftNet/Models/Kumo/Currency.cs
@@ -0,0 +1,20 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Kumo {
+  /// <summary>
+  /// Currency
+  /// </summary>
+  public class Currency {
+    /// <summary>
+    /// Value
+    /// </summary>
+    [JsonPropertyName("value")]
+    public double Value { get; set; }
+
+    /// <summary>
+    /// String with currency code, eg <c>475.84 CNY</c>
+    /// </summary>
+    [JsonPropertyName("pretty")]
+    public string Pretty { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Kumo/GeoIp.cs b/KSoftNet/Models/Kumo/GeoIp.cs
new file mode 100644
index 0000000..3db3e0b
--- /dev/null
+++ b/KSoftNet/Models/Kumo/GeoIp.cs
@@ -0,0 +1,126 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Kumo {
+  /// <summary>
+  /// GeoIP API links
+  /// </summary>
+  public class GeoIpApis {
+    /// <summary>
+    /// Kumo weather URL
+    /// </summary>
+    [JsonPropertyName("weather")]
+    public string Weather { get; set; }
+
+    /// <summary>
+    /// Kumo gis URL
+    /// </summary>
+    [JsonPropertyName("gis")]
+    public string Gis { get; set; }
+
+    /// <summary>
+    /// openstreetmap.org URL
+    /// </summary>
+    [JsonPropertyName("openstreetmap")]
+    public string OpenStreetMap { get; set; }
+
+    /// <summary>
+    /// Google maps URL
+    /// </summary>
+    [JsonPropertyName("googlemaps")]
+    public string GoogleMaps { get; set; }
+  }
+
+  /// <summary>
+  /// GeoIP data
+  /// </summary>
+  public class GeoIpData {
+    /// <summary>
+    /// City
+    /// </summary>
+    [JsonPropertyName("city")] public string City { get; set; }
+
+    /// <summary>
+    /// Continent code (eg. NA)
+    /// </summary>
+    [JsonPropertyName("continent_code")] public string ContinentCode { get; set; }
+
+    /// <summary>
+    /// Continent name
+    /// </summary>
+    [JsonPropertyName("continent_name")] public string ContinentName { get; set; }
+
+    /// <summary>
+    /// Country code
+    /// </summary>
+    [JsonPropertyName("country_code")] public string CountryCode { get; set; }
+
+    /// <summary>
+    /// Country name
+    /// </summary>
+    [JsonPropertyName("country_name")] public string CountryName { get; set; }
+
+    /// <summary>
+    /// Designated Market Area code
+    /// </summary>
+    [JsonPropertyName("dma_code")] public int? DmaCode { get; set; }
+
+    /// <summary>
+    /// yeah
+    /// </summary>
+    [JsonPropertyName("is_in_european_union")] public bool IsInEuropeanUnion { get; set; }
+
+    /// <summary>
+    /// Latitude
+    /// </summary>
+    [JsonPropertyName("latitude")] public double Latitude { get; set; }
+
+    /// <summary>
+    /// Longitude
+    /// </summary>
+    [JsonPropertyName("longitude")] public double Longitude { get; set; }
+
+    /// <summary>
+    /// Postal code
+    /// </summary>
+    [JsonPropertyName("postal_code")] public string PostalCode { get; set; }
+
+    /// <summary>
+    /// Region
+    /// </summary>
+    [JsonPropertyName("region")] public string Region { get; set; }
+
+    /// <summary>
+    /// Timezone
+    /// </summary>
+    [JsonPropertyName("time_zone")] public string TimeZone { get; set; }
+
+    /// <summary>
+    /// API URLs
+    /// </summary>
+    [JsonPropertyName("apis")]
+    public GeoIpApis Apis { get; set; }
+  }
+
+  /// <summary>
+  /// GeoIP
+  /// </summary>
+  public class GeoIp {
+    /// <summary>
+    /// If errored
+    /// </summary>
+    [JsonPropertyName("error")]
+    public bool Error { get; set; }
+
+    /// <summary>
+    /// Error code
+    /// </summary>
+    [JsonPropertyName("code")]
+    public int Code { get; set; }
+
+    /// <summary>
+    /// GeoIP data
+    /// </summary>
+    [JsonPropertyName("data")]
+    public GeoIpData Data { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Kumo/Location.cs b/KSoftNet/Models/Kumo/Location.cs
new file mode 100644
index 0000000..6acabd8
--- /dev/null
+++ b/KSoftNet/Models/Kumo/Location.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Kumo {
+  /// <summary>
+  /// Location data
+  /// </summary>
+  public class LocationData {
+    /// <summary>
+    /// Address
+    /// </summary>
+    [JsonPropertyName("address")] public string Address { get; set; }
+
+    /// <summary>
+    /// Latitude
+    /// </summary>
+    [JsonPropertyName("lat")] public double Latitude { get; set; }
+
+    /// <summary>
+    /// Longitude
+    /// </summary>
+    [JsonPropertyName("lon")] public double Longitude { get; set; }
+
+    /// <summary>
+    /// Bounding box coordinates
+    /// </summary>
+    [JsonPropertyName("bounding_box")] public List<string> BoundingBox { get; set; }
+
+    /// <summary>
+    /// Types
+    /// </summary>
+    [JsonPropertyName("type")] public List<string> Type { get; set; }
+  }
+
+  /// <summary>
+  /// Location
+  /// </summary>
+  public class Location {
+    /// <summary>
+    /// If errored
+    /// </summary>
+    [JsonPropertyName("error")]
+    public bool Error { get; set; }
+
+    /// <summary>
+    /// Error code
+    /// </summary>
+    [JsonPropertyName("code")]
+    public int Code { get; set; }
+
+    /// <summary>
+    /// Location data
+    /// </summary>
+    [JsonPropertyName("data")]
+    public LocationData Data { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Kumo/Weather.cs b/KSoftNet/Models/Kumo/Weather.cs
new file mode 100644
index 0000000..fe0b47d
--- /dev/null
+++ b/KSoftNet/Models/Kumo/Weather.cs
@@ -0,0 +1,207 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Kumo {
+
+  /// <summary>
+  /// Location
+  /// </summary>
+  public class WeatherLocation {
+    /// <summary>
+    /// Latitude
+    /// </summary>
+    [JsonPropertyName("lat")]
+    public double Latitude { get; set; }
+
+    /// <summary>
+    /// Longitude
+    /// </summary>
+    [JsonPropertyName("lon")]
+    public double Longitude { get; set; }
+
+    /// <summary>
+    /// Address
+    /// </summary>
+    [JsonPropertyName("address")]
+    public object Address { get; set; }
+  }
+
+  /// <summary>
+  /// Weather data
+  /// </summary>
+  public class WeatherData {
+    /// <summary>
+    /// Time of data
+    /// </summary>
+    [JsonPropertyName("time")]
+    public DateTime Time { get; set; }
+
+    /// <summary>
+    /// Summary
+    /// </summary>
+    [JsonPropertyName("summary")]
+    public string Summary { get; set; }
+
+    /// <summary>
+    /// Icon
+    /// </summary>
+    [JsonPropertyName("icon")]
+    public string Icon { get; set; }
+
+    /// <summary>
+    /// Distance to nearest storm
+    /// </summary>
+    [JsonPropertyName("nearestStormDistance")]
+    public int NearestStormDistance { get; set; }
+
+    /// <summary>
+    /// Bearing of nearest storm
+    /// </summary>
+    [JsonPropertyName("nearestStormBearing")]
+    public int NearestStormBearing { get; set; }
+
+    /// <summary>
+    /// Precipitation intensity
+    /// </summary>
+    [JsonPropertyName("precipIntensity")]
+    public int PrecipitationIntensity { get; set; }
+
+    /// <summary>
+    /// Probability of precipitation
+    /// </summary>
+    [JsonPropertyName("precipProbability")]
+    public int PrecipitationProbability { get; set; }
+
+    /// <summary>
+    /// Temperature
+    /// </summary>
+    [JsonPropertyName("temperature")]
+    public double Temperature { get; set; }
+
+    /// <summary>
+    /// Apparent temperature
+    /// </summary>
+    [JsonPropertyName("apparentTemperature")]
+    public double ApparentTemperature { get; set; }
+
+    /// <summary>
+    /// Dew point
+    /// </summary>
+    [JsonPropertyName("dewPoint")]
+    public double DewPoint { get; set; }
+
+    /// <summary>
+    /// Humidity
+    /// </summary>
+    [JsonPropertyName("humidity")]
+    public double Humidity { get; set; }
+
+    /// <summary>
+    /// Pressure
+    /// </summary>
+    [JsonPropertyName("pressure")]
+    public double Pressure { get; set; }
+
+    /// <summary>
+    /// Wind speed
+    /// </summary>
+    [JsonPropertyName("windSpeed")]
+    public double WindSpeed { get; set; }
+
+    /// <summary>
+    /// Wind gust
+    /// </summary>
+    [JsonPropertyName("windGust")]
+    public double WindGust { get; set; }
+
+    /// <summary>
+    /// Wind bearing
+    /// </summary>
+    [JsonPropertyName("windBearing")]
+    public int WindBearing { get; set; }
+
+    /// <summary>
+    /// Cloud cover percentage
+    /// </summary>
+    [JsonPropertyName("cloudCover")]
+    public double CloudCover { get; set; }
+
+    /// <summary>
+    /// UV index
+    /// </summary>
+    [JsonPropertyName("uvIndex")]
+    public int UvIndex { get; set; }
+
+    /// <summary>
+    /// Visibility
+    /// </summary>
+    [JsonPropertyName("visibility")]
+    public int Visibility { get; set; }
+
+    /// <summary>
+    /// Ozone
+    /// </summary>
+    [JsonPropertyName("ozone")]
+    public double Ozone { get; set; }
+
+    /// <summary>
+    /// Sunrise time
+    /// </summary>
+    [JsonPropertyName("sunriseTime")]
+    public object SunriseTime { get; set; }
+
+    /// <summary>
+    /// Sunset time
+    /// </summary>
+    [JsonPropertyName("sunsetTime")]
+    public object SunsetTime { get; set; }
+
+    /// <summary>
+    /// Icon URL
+    /// </summary>
+    [JsonPropertyName("icon_url")]
+    public string IconUrl { get; set; }
+
+    /// <summary>
+    /// Alerts
+    /// </summary>
+    [JsonPropertyName("alerts")]
+    public List<object> Alerts { get; set; }
+
+    /// <summary>
+    /// Units
+    /// </summary>
+    [JsonPropertyName("units")]
+    public string Units { get; set; }
+
+    /// <summary>
+    /// Location
+    /// </summary>
+    [JsonPropertyName("location")]
+    public WeatherLocation Location { get; set; }
+  }
+
+  /// <summary>
+  /// Weather response
+  /// </summary>
+  public class Weather {
+    /// <summary>
+    /// If errored
+    /// </summary>
+    [JsonPropertyName("error")]
+    public bool Error { get; set; }
+
+    /// <summary>
+    /// Status
+    /// </summary>
+    [JsonPropertyName("status")]
+    public int Status { get; set; }
+
+    /// <summary>
+    /// Weather data
+    /// </summary>
+    [JsonPropertyName("data")]
+    public WeatherData Data { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/Album.cs b/KSoftNet/Models/Music/Album.cs
new file mode 100644
index 0000000..5323ad6
--- /dev/null
+++ b/KSoftNet/Models/Music/Album.cs
@@ -0,0 +1,26 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+  /// <summary>
+  /// Album
+  /// </summary>
+  public class Album {
+    /// <summary>
+    /// Album ID
+    /// </summary>
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Album name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Album release year
+    /// </summary>
+    [JsonPropertyName("year")]
+    public int Year { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/AlbumInfo.cs b/KSoftNet/Models/Music/AlbumInfo.cs
new file mode 100644
index 0000000..48e913c
--- /dev/null
+++ b/KSoftNet/Models/Music/AlbumInfo.cs
@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+
+  /// <summary>
+  /// Album info
+  /// </summary>
+  public class AlbumInfo {
+    /// <summary>
+    /// Album ID
+    /// </summary>
+    [JsonPropertyName("id")] public int Id { get; set; }
+
+    /// <summary>
+    /// Album name
+    /// </summary>
+    [JsonPropertyName("name")] public string Name { get; set; }
+
+    /// <summary>
+    /// Album release year
+    /// </summary>
+    [JsonPropertyName("year")] public int Year { get; set; }
+
+    /// <summary>
+    /// Album artist
+    /// </summary>
+    [JsonPropertyName("artist")] public Artist Artist { get; set; }
+
+    /// <summary>
+    /// Album tracks
+    /// </summary>
+    [JsonPropertyName("tracks")] public List<Track> Tracks { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/Artist.cs b/KSoftNet/Models/Music/Artist.cs
new file mode 100644
index 0000000..9948c3c
--- /dev/null
+++ b/KSoftNet/Models/Music/Artist.cs
@@ -0,0 +1,20 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+  /// <summary>
+  /// Artist
+  /// </summary>
+  public class Artist {
+    /// <summary>
+    /// Artist ID
+    /// </summary>
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Artist name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/ArtistInfo.cs b/KSoftNet/Models/Music/ArtistInfo.cs
new file mode 100644
index 0000000..d554c9a
--- /dev/null
+++ b/KSoftNet/Models/Music/ArtistInfo.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+  /// <summary>
+  /// Artist info
+  /// </summary>
+  public class ArtistInfo {
+    /// <summary>
+    /// Artist ID
+    /// </summary>
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Artist name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Artist albums
+    /// </summary>
+    [JsonPropertyName("albums")]
+    public List<Album> Albums { get; set; }
+
+    /// <summary>
+    /// Artist tracks
+    /// </summary>
+    [JsonPropertyName("tracks")]
+    public List<Track> Tracks { get; set; }
+  }
+
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/Recommendations.cs b/KSoftNet/Models/Music/Recommendations.cs
new file mode 100644
index 0000000..ce6c7ea
--- /dev/null
+++ b/KSoftNet/Models/Music/Recommendations.cs
@@ -0,0 +1,161 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+  /// <summary>
+  /// Youtube track
+  /// </summary>
+  public class Youtube {
+    /// <summary>
+    /// Track ID
+    /// </summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+
+    /// <summary>
+    /// Link to track on youtube
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link { get; set; }
+
+    /// <summary>
+    /// Track title
+    /// </summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Thumbnail URL
+    /// </summary>
+    [JsonPropertyName("thumbnail")]
+    public string Thumbnail { get; set; }
+
+    /// <summary>
+    /// Track description
+    /// </summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; }
+  }
+
+  /// <summary>
+  /// Recommended album
+  /// </summary>
+  public class RecommendedAlbum {
+    /// <summary>
+    /// Album name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Album art URL
+    /// </summary>
+    [JsonPropertyName("album_art")]
+    public string AlbumArt { get; set; }
+
+    /// <summary>
+    /// Link to album on Spotify
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link { get; set; }
+  }
+
+  /// <summary>
+  /// Recommended artist
+  /// </summary>
+  public class RecommendedArtist {
+    /// <summary>
+    /// Artist name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Link to artist on Spotify
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link { get; set; }
+  }
+
+  /// <summary>
+  /// Spotify track
+  /// </summary>
+  public class Spotify {
+    /// <summary>
+    /// Track ID
+    /// </summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+
+    /// <summary>
+    /// Track album
+    /// </summary>
+    [JsonPropertyName("album")]
+    public RecommendedAlbum Album { get; set; }
+
+    /// <summary>
+    /// Track artists
+    /// </summary>
+    [JsonPropertyName("artists")]
+    public List<RecommendedArtist> Artists { get; set; }
+
+    /// <summary>
+    /// Track name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Link to track on spotify
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link { get; set; }
+  }
+
+  /// <summary>
+  /// Recommended track
+  /// </summary>
+  public class RecommendedTrack {
+    /// <summary>
+    /// Youtube information for track
+    /// </summary>
+    [JsonPropertyName("youtube")]
+    public Youtube Youtube { get; set; }
+
+    /// <summary>
+    /// Spotify information for track
+    /// </summary>
+    [JsonPropertyName("spotify")]
+    public Spotify Spotify { get; set; }
+
+    /// <summary>
+    /// Track name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+  }
+
+  /// <summary>
+  /// Music recommendations
+  /// </summary>
+  public class Recommendations {
+    /// <summary>
+    /// Track provider
+    /// </summary>
+    [JsonPropertyName("provider")]
+    public string Provider { get; set; }
+
+    /// <summary>
+    /// Total recommendations
+    /// </summary>
+    [JsonPropertyName("total")]
+    public int Total { get; set; }
+
+    /// <summary>
+    /// Tracks recommended
+    /// </summary>
+    [JsonPropertyName("tracks")]
+    public List<RecommendedTrack> Tracks { get; set; }
+  }
+
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/Track.cs b/KSoftNet/Models/Music/Track.cs
new file mode 100644
index 0000000..5ea292d
--- /dev/null
+++ b/KSoftNet/Models/Music/Track.cs
@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+  /// <summary>
+  /// Track
+  /// </summary>
+  public class Track {
+    /// <summary>
+    /// Track ID
+    /// </summary>
+    [JsonPropertyName("id")] public int Id { get; set; }
+
+    /// <summary>
+    /// Track name
+    /// </summary>
+    [JsonPropertyName("name")] public string Name { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Models/Music/TrackInfo.cs b/KSoftNet/Models/Music/TrackInfo.cs
new file mode 100644
index 0000000..2ee7cc4
--- /dev/null
+++ b/KSoftNet/Models/Music/TrackInfo.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Models.Music {
+
+  /// <summary>
+  /// Track info
+  /// </summary>
+  public class TrackInfo {
+    /// <summary>
+    /// Track Id
+    /// </summary>
+    public string Id { get; set; }
+    /// <summary>
+    /// Track name
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Track artist
+    /// </summary>
+    [JsonPropertyName("artist")]
+    public Artist Artist { get; set; }
+
+    /// <summary>
+    /// Track albums
+    /// </summary>
+    [JsonPropertyName("albums")]
+    public List<Album> Albums { get; set; }
+
+    /// <summary>
+    /// Track lyrics
+    /// </summary>
+    [JsonPropertyName("lyrics")]
+    public string Lyrics { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Requests/BanRequest.cs b/KSoftNet/Requests/BanRequest.cs
new file mode 100644
index 0000000..d93ce34
--- /dev/null
+++ b/KSoftNet/Requests/BanRequest.cs
@@ -0,0 +1,50 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Requests {
+  /// <summary>
+  /// New ban request
+  /// </summary>
+  public class BanRequest {
+    /// <summary>
+    /// Users Discord ID that you are banning/reporting
+    /// </summary>
+    [JsonPropertyName("user")]
+    public ulong User { get; set; }
+
+    /// <summary>
+    /// Users Discord ID who posted/reported the ban
+    /// </summary>
+    [JsonPropertyName("mod")]
+    public ulong Mod { get; set; }
+
+    /// <summary>
+    /// Users Discord username
+    /// </summary>
+    [JsonPropertyName("user_name")]
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// Users Discord discriminator
+    /// </summary>
+    [JsonPropertyName("user_discriminator")]
+    public string UserDiscriminator { get; set; }
+
+    /// <summary>
+    /// Reason why user should be globally banned
+    /// </summary>
+    [JsonPropertyName("reason")]
+    public string Reason { get; set; }
+
+    /// <summary>
+    /// URL of the image showing the act
+    /// </summary>
+    [JsonPropertyName("proof")]
+    public string Proof { get; set; }
+
+    /// <summary>
+    /// If appeal should be disabled for that user.
+    /// </summary>
+    [JsonPropertyName("appeal_possible")]
+    public bool AppealPossible { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Requests/RecommendationRequest.cs b/KSoftNet/Requests/RecommendationRequest.cs
new file mode 100644
index 0000000..51db3c7
--- /dev/null
+++ b/KSoftNet/Requests/RecommendationRequest.cs
@@ -0,0 +1,45 @@
+using System.Text.Json.Serialization;
+
+namespace KSoftNet.Requests {
+  /// <summary>
+  /// Music recommendation request
+  /// </summary>
+  public class RecommendationRequest {
+    /// <summary>
+    /// JSON List or comma-separated list of input tracks. Content of the list depends on selected provider.
+    /// </summary>
+    [JsonPropertyName("tracks")]
+    public object[] Tracks { get; set; }
+
+    /// <summary>
+    /// Recommended. YouTube v3 API token.
+    /// </summary>
+    [JsonPropertyName("youtube_token")]
+    public string YoutubeToken { get; set; }
+
+    /// <summary>
+    /// How many tracks to return. Defaults to 5. Valid range: 1-5
+    /// </summary>
+    [JsonPropertyName("limit")]
+    public int Limit { get; set; } = 5;
+
+    /// <summary>
+    /// Which data type to return.
+    /// <p> <c>track</c> - returns a list of track objects</p>
+    /// <p> <c>youtube_link</c> - returns a list of youtube links</p>
+    /// <p> <c>youtube_id</c> - returns a list of YouTube IDs</p>
+    /// </summary>
+    [JsonPropertyName("recommend_type")]
+    public string RecommendationType { get; set; }
+
+    /// <summary>
+    /// Format in which you'll provide tracks. Can be:
+    /// <p><c>youtube</c> - For list of YouTube links</p>
+    /// <p><c>youtube_ids</c> - For list of YouTube video IDs</p>
+    /// <p><c>youtube_titles</c> - For list of YouTube titles (faster)</p>
+    /// <p><c>spotify</c> - For list of Spotify IDs (fastest)</p>
+    /// </summary>
+    [JsonPropertyName("provider")]
+    public string Provider { get; set; }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet/Utils/ParameterFormatter.cs b/KSoftNet/Utils/ParameterFormatter.cs
new file mode 100644
index 0000000..4448975
--- /dev/null
+++ b/KSoftNet/Utils/ParameterFormatter.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Reflection;
+using System.Text;
+using KSoftNet.Enums;
+using Refit;
+
+namespace KSoftNet.Utils {
+  internal class ParameterFormatter : IUrlParameterFormatter {
+
+    public string Format(object value, ICustomAttributeProvider attributeProvider, Type type) {
+      if (value == null)
+        return null;
+
+      var parameterType = Denullify(type);
+
+      if (parameterType == typeof(Span)) {
+        return GetLowerEnumName<Span>(value);
+      }
+
+      if (parameterType == typeof(ReportType)) {
+        return GetLowerEnumName<ReportType>(value);
+      }
+
+      if (parameterType == typeof(IconPack)) {
+        return GetLowerEnumName<IconPack>(value);
+      }
+
+      if (parameterType == typeof(Unit)) {
+        return GetLowerEnumName<Unit>(value);
+      }
+
+      if (parameterType == typeof(CurrencyCode)) {
+        return GetUpperEnumName<CurrencyCode>(value);
+      }
+
+      // ReSharper disable once ConvertIfStatementToReturnStatement
+      if (parameterType == typeof(Language)) {
+        return Enum.GetName(typeof(Language), value)?.PascalToKebabCase();
+      }
+
+      return value.ToString().ToLowerInvariant();
+    }
+
+    private static Type Denullify(Type type) {
+      if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+        return type.GetGenericArguments()[0];
+
+      return type;
+    }
+
+    private static string GetLowerEnumName<T>(object e) {
+      return Enum.GetName(typeof(T), e)?.ToLowerInvariant();
+    }
+
+    private static string GetUpperEnumName<T>(object e) {
+      return Enum.GetName(typeof(T), e)?.ToUpperInvariant();
+    }
+
+  }
+
+  internal static class StringExtensions {
+    internal static string PascalToKebabCase(this string source) {
+      if (source is null) return null;
+
+      if (source.Length == 0) return string.Empty;
+
+      var builder = new StringBuilder();
+
+      for (var i = 0; i < source.Length; i++) {
+        // if current char is already lowercase
+        if (char.IsLower(source[i])) {
+          builder.Append(source[i]);
+        }
+        // if current char is the first char
+        else if (i == 0) {
+          builder.Append(char.ToLower(source[i]));
+        }
+        // if current or previous char is -
+        else if (source[i - 1] == '-' || source[i] == '-') {
+          builder.Append(char.ToLower(source[i]));
+        }
+        // if current char is a number and the previous is not
+        else if (char.IsDigit(source[i]) && !char.IsDigit(source[i - 1])) {
+          builder.Append('-');
+          builder.Append(source[i]);
+        }
+        // if current char is a number and previous is
+        else if (char.IsDigit(source[i])) {
+          builder.Append(source[i]);
+        }
+        // if current char is upper and previous char is lower
+        else if (char.IsLower(source[i - 1])) {
+          builder.Append('-');
+          builder.Append(char.ToLower(source[i]));
+        }
+        // if current char is upper and next char doesn't exist or is upper
+        else if (i + 1 == source.Length || char.IsUpper(source[i + 1])) {
+          builder.Append(char.ToLower(source[i]));
+        }
+        // if current char is upper and next char is lower
+        else {
+          builder.Append('-');
+          builder.Append(char.ToLower(source[i]));
+        }
+      }
+
+      return builder.ToString();
+    }
+  }
+}
\ No newline at end of file

From eb4ad4c0d6f6e75258e88ffe90d7a8b3f1b312f8 Mon Sep 17 00:00:00 2001
From: Foo <34515228+fooooooooooooooo@users.noreply.github.com>
Date: Fri, 10 Sep 2021 04:24:01 -0700
Subject: [PATCH 2/4] remove useless config

---
 KSoftNet.Tests/config.json | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 KSoftNet.Tests/config.json

diff --git a/KSoftNet.Tests/config.json b/KSoftNet.Tests/config.json
deleted file mode 100644
index 1c1f02e..0000000
--- a/KSoftNet.Tests/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "token": ""
-}
\ No newline at end of file

From 7d412a694ea3805656723fbecc5428b2fdc6d8a8 Mon Sep 17 00:00:00 2001
From: Foo <34515228+fooooooooooooooo@users.noreply.github.com>
Date: Fri, 10 Sep 2021 04:56:17 -0700
Subject: [PATCH 3/4] docs: added example projects

---
 .idea/.idea.KSoftNet/.idea/workspace.xml      | 161 +++++++++++-------
 CustomHttpclient/CustomHttpclient.csproj      |  12 ++
 CustomHttpclient/Program.cs                   |  36 ++++
 .../DependencyInjection.csproj                |  16 ++
 DependencyInjection/ExampleClass.cs           |  19 +++
 DependencyInjection/Program.cs                |  45 +++++
 KSoftNet.Examples/KSoftNet.Examples.csproj    |  12 ++
 KSoftNet.Examples/Program.cs                  |  30 ++++
 KSoftNet.Tests/KSoftAPIUnitTest.cs            |   2 +-
 KSoftNet.sln                                  |  29 +++-
 KSoftNet/KSoftAPI.cs                          |   7 -
 SimpleUsage/Program.cs                        |  27 +++
 SimpleUsage/SimpleUsage.csproj                |  12 ++
 13 files changed, 332 insertions(+), 76 deletions(-)
 create mode 100644 CustomHttpclient/CustomHttpclient.csproj
 create mode 100644 CustomHttpclient/Program.cs
 create mode 100644 DependencyInjection/DependencyInjection.csproj
 create mode 100644 DependencyInjection/ExampleClass.cs
 create mode 100644 DependencyInjection/Program.cs
 create mode 100644 KSoftNet.Examples/KSoftNet.Examples.csproj
 create mode 100644 KSoftNet.Examples/Program.cs
 create mode 100644 SimpleUsage/Program.cs
 create mode 100644 SimpleUsage/SimpleUsage.csproj

diff --git a/.idea/.idea.KSoftNet/.idea/workspace.xml b/.idea/.idea.KSoftNet/.idea/workspace.xml
index 955c923..055657e 100644
--- a/.idea/.idea.KSoftNet/.idea/workspace.xml
+++ b/.idea/.idea.KSoftNet/.idea/workspace.xml
@@ -1,72 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile>KSoftNet.Examples/KSoftNet.Examples.csproj</projectFile>
+    <projectFile>SimpleUsage/SimpleUsage.csproj</projectFile>
+    <projectFile>CustomHttpclient/CustomHttpclient.csproj</projectFile>
+    <projectFile>DependencyInjection/DependencyInjection.csproj</projectFile>
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="dd0674aa-9d82-49ee-9c9e-8f97ae15a1f2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/KSoftNet.Tests/HttpLoggingHandler.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet.sln.DotSettings" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/AssemblyInfo.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IBansApi.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IImagesApi.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IKumoApi.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Endpoints/IMusicApi.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/CurrencyCode.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/IconPack.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/Language.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/ReportType.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/Span.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Enums/Unit.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/Ban.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanCheck.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanDeletion.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanInfo.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanList.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Bans/BanUpdates.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/Image.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/RedditPost.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/TagList.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Images/WikihowPost.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/Currency.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/GeoIp.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/Location.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Kumo/Weather.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Album.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/AlbumInfo.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Artist.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/ArtistInfo.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Recommendations.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/Track.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Models/Music/TrackInfo.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Requests/BanRequest.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Requests/RecommendationRequest.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet/Utils/ParameterFormatter.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/CustomHttpclient/CustomHttpclient.csproj" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/CustomHttpclient/Program.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/DependencyInjection/DependencyInjection.csproj" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/DependencyInjection/ExampleClass.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/DependencyInjection/Program.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet.Examples/KSoftNet.Examples.csproj" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/KSoftNet.Examples/Program.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/SimpleUsage/Program.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/SimpleUsage/SimpleUsage.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet.Tests/KSoftAPIUnitTest.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet.Tests/KSoftAPIUnitTest.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/KSoftNet.sln" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet.sln" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/BansAPI.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/ImagesAPI.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/KumoAPI.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoft/MusicAPI.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoftAPI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoftApi.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/KSoftNet.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet/KSoftNet.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftAlbumInfo.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftArtistInfo.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBan.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanCheck.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanDeletion.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanInfo.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanList.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftBanUpdates.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftCurrency.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftGeoIP.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftImage.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftLocation.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftLyrics.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftRecommendations.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftRedditPost.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftTags.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftTrackInfo.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftWeather.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet/Models/KSoftWikiHowPost.cs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -86,6 +39,7 @@
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/8e4ffc2d570f4dcc8010b8f942b6229f21a68/1F/RestService.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/KSoftNet.Examples/Program.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/23179fa051e04dfc8d03e8cf341a8083114570/39/HttpClientHandler.Core.cs" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
@@ -126,13 +80,89 @@
       <command value="Console.WriteLine(&quot;pog&quot;)" />
     </option>
   </component>
-  <component name="RunManager" selected="Publish to folder.Build NuGet Package">
+  <component name="RunManager" selected=".NET Project.CustomHttpclient">
     <configuration name="Build NuGet Package" type="DotNetFolderPublish" factoryName="Publish to folder">
       <riderPublish configuration="Release" platform="Any CPU" runtime="Portable" target_folder="$PROJECT_DIR$/KSoftNet/bin/Release/netcoreapp2.1/publish" target_framework="netcoreapp2.1" uuid_high="-4150296797865556607" uuid_low="-4799663196355406114" />
       <method v="2" />
     </configuration>
+    <configuration name="CustomHttpclient" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/CustomHttpclient/CustomHttpclient.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="DotNetCore" />
+      <option name="PROJECT_TFM" value="" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+    <configuration name="DependencyInjection" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/DependencyInjection/DependencyInjection.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="DotNetCore" />
+      <option name="PROJECT_TFM" value="" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+    <configuration name="KSoftNet.Examples" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/KSoftNet.Examples/KSoftNet.Examples.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="DotNetCore" />
+      <option name="PROJECT_TFM" value="" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+    <configuration name="SimpleUsage" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/SimpleUsage/SimpleUsage.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="DotNetCore" />
+      <option name="PROJECT_TFM" value="" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
     <list>
+      <item itemvalue=".NET Project.KSoftNet.Examples" />
       <item itemvalue="Publish to folder.Build NuGet Package" />
+      <item itemvalue=".NET Project.SimpleUsage" />
+      <item itemvalue=".NET Project.CustomHttpclient" />
+      <item itemvalue=".NET Project.DependencyInjection" />
     </list>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
@@ -146,7 +176,8 @@
       <workItem from="1615976186230" duration="618000" />
       <workItem from="1615976820709" duration="3328000" />
       <workItem from="1631191289148" duration="25345000" />
-      <workItem from="1631263325061" duration="9405000" />
+      <workItem from="1631263325061" duration="10158000" />
+      <workItem from="1631273578125" duration="1082000" />
     </task>
     <servers />
   </component>
diff --git a/CustomHttpclient/CustomHttpclient.csproj b/CustomHttpclient/CustomHttpclient.csproj
new file mode 100644
index 0000000..a2f6586
--- /dev/null
+++ b/CustomHttpclient/CustomHttpclient.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\KSoftNet\KSoftNet.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/CustomHttpclient/Program.cs b/CustomHttpclient/Program.cs
new file mode 100644
index 0000000..bd1a27a
--- /dev/null
+++ b/CustomHttpclient/Program.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using KSoftNet;
+
+namespace CustomHttpclient {
+  internal static class Program {
+    private const string Token = "{token}";
+
+    private static void Main() {
+      new ExampleClass(Token).GetRandomImage("birb").GetAwaiter().GetResult();
+    }
+  }
+
+  public class ExampleClass {
+    private readonly KSoftApi _kSoftApi;
+
+    public ExampleClass(string token) {
+      var httpClient = new HttpClient {
+        BaseAddress = new Uri("https://api.ksoft.si"),
+        DefaultRequestHeaders = {
+          Authorization = new AuthenticationHeaderValue("Bearer", token)
+        }
+      };
+
+      _kSoftApi = new KSoftApi(httpClient);
+    }
+
+    public async Task GetRandomImage(string tag) {
+      var image = await _kSoftApi.ImagesApi.GetRandomImage(tag: tag);
+
+      Console.WriteLine(image.Url);
+    }
+  }
+}
\ No newline at end of file
diff --git a/DependencyInjection/DependencyInjection.csproj b/DependencyInjection/DependencyInjection.csproj
new file mode 100644
index 0000000..519d52f
--- /dev/null
+++ b/DependencyInjection/DependencyInjection.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\KSoftNet\KSoftNet.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    </ItemGroup>
+
+</Project>
diff --git a/DependencyInjection/ExampleClass.cs b/DependencyInjection/ExampleClass.cs
new file mode 100644
index 0000000..93f2a7d
--- /dev/null
+++ b/DependencyInjection/ExampleClass.cs
@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+using KSoftNet;
+using KSoftNet.Models.Images;
+
+namespace DependencyInjection {
+  public class ExampleClass {
+    private readonly KSoftApi _kSoftApi;
+
+    public ExampleClass(KSoftApi kSoftApi) {
+      _kSoftApi = kSoftApi;
+    }
+
+    public async Task<Image> GetRandomImage(string tag) {
+      var image = await _kSoftApi.ImagesApi.GetRandomImage(tag: tag);
+
+      return image;
+    }
+  }
+}
\ No newline at end of file
diff --git a/DependencyInjection/Program.cs b/DependencyInjection/Program.cs
new file mode 100644
index 0000000..81dcf06
--- /dev/null
+++ b/DependencyInjection/Program.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading.Tasks;
+using KSoftNet;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DependencyInjection {
+  internal static class Program {
+
+    private static void Main() {
+      var startup = new Startup();
+      startup.Init();
+      startup.RunAsync().GetAwaiter().GetResult();
+    }
+  }
+
+  public class Startup {
+    private const string Token = "{token}";
+    private KSoftApi _kSoftApi;
+
+    private IServiceProvider _serviceProvider;
+
+    public void Init() {
+      var services = new ServiceCollection();
+
+      _kSoftApi = new KSoftApi(Token);
+
+      ConfigureServices(services);
+      _serviceProvider = services.BuildServiceProvider();
+    }
+
+    public async Task RunAsync() {
+      var exampleClass = _serviceProvider.GetService<ExampleClass>();
+
+      var image = await exampleClass.GetRandomImage("birb");
+
+      Console.WriteLine(image.Url);
+    }
+
+    private void ConfigureServices(IServiceCollection services) {
+      services.AddSingleton(_kSoftApi);
+      services.AddSingleton<ExampleClass>();
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/KSoftNet.Examples/KSoftNet.Examples.csproj b/KSoftNet.Examples/KSoftNet.Examples.csproj
new file mode 100644
index 0000000..a2f6586
--- /dev/null
+++ b/KSoftNet.Examples/KSoftNet.Examples.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\KSoftNet\KSoftNet.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/KSoftNet.Examples/Program.cs b/KSoftNet.Examples/Program.cs
new file mode 100644
index 0000000..249891e
--- /dev/null
+++ b/KSoftNet.Examples/Program.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace KSoftNet.Examples {
+  internal static class Program {
+    private static string _token = "";
+
+    private static void Main(string[] args) {
+      
+    }
+  }
+
+  public class Startup {
+    private KSoftApi _kSoftApi;
+
+    private string _token = "token123";
+
+    public void Init() {
+      ServiceCollection services = new ServiceCollection();
+
+      kSoftAPI = new KSoftAPI(_token);
+
+      ConfigureServices(services);
+      ServiceProvider provider = services.BuildServiceProvider();
+    }
+
+    private void ConfigureServices(IServiceCollection services) {
+      services.AddSingleton(kSoftAPI);
+    }
+  }
+}
\ No newline at end of file
diff --git a/KSoftNet.Tests/KSoftAPIUnitTest.cs b/KSoftNet.Tests/KSoftAPIUnitTest.cs
index 7877b5e..8a31347 100644
--- a/KSoftNet.Tests/KSoftAPIUnitTest.cs
+++ b/KSoftNet.Tests/KSoftAPIUnitTest.cs
@@ -363,7 +363,7 @@ private static void LogObject(object obj) {
     }
   }
 
-  public static class CumExtensions {
+  public static class StringExtensions {
     public static string ToJson(this object obj) {
       return JsonConvert.SerializeObject(obj);
     }
diff --git a/KSoftNet.sln b/KSoftNet.sln
index 827a078..f15bf49 100644
--- a/KSoftNet.sln
+++ b/KSoftNet.sln
@@ -3,18 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KSoftNet", "KSoftNet\KSoftNet.csproj", "{C6672F0D-32C8-4581-BD64-2BC0ABB856DE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C65E521-1787-4517-9F02-F31D11CAC2AF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0756D0A2-518C-4B70-A096-F64B8847B0DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{976ACC01-CEE2-48E4-9290-0B09670440ED}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7C311470-DA09-4E9D-BFAE-0AD04B25CF1C}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KSoftNet", "KSoftNet\KSoftNet.csproj", "{C6672F0D-32C8-4581-BD64-2BC0ABB856DE}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KSoftNet.Tests", "KSoftNet.Tests\KSoftNet.Tests.csproj", "{EB16AA43-EFC8-468F-B112-33EB944B0D08}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C65E521-1787-4517-9F02-F31D11CAC2AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleUsage", "SimpleUsage\SimpleUsage.csproj", "{AAC72C61-F860-442F-8DBA-94B6DC0EA2FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0756D0A2-518C-4B70-A096-F64B8847B0DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomHttpclient", "CustomHttpclient\CustomHttpclient.csproj", "{01C2FA2C-2D1F-4F2E-B8D0-C1BBA0D2CD86}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependencyInjection", "DependencyInjection\DependencyInjection.csproj", "{E1D6A50D-8038-4635-9D95-E7DB1DC2CAAB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,6 +38,18 @@ Global
 		{EB16AA43-EFC8-468F-B112-33EB944B0D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB16AA43-EFC8-468F-B112-33EB944B0D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB16AA43-EFC8-468F-B112-33EB944B0D08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAC72C61-F860-442F-8DBA-94B6DC0EA2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAC72C61-F860-442F-8DBA-94B6DC0EA2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAC72C61-F860-442F-8DBA-94B6DC0EA2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAC72C61-F860-442F-8DBA-94B6DC0EA2FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01C2FA2C-2D1F-4F2E-B8D0-C1BBA0D2CD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01C2FA2C-2D1F-4F2E-B8D0-C1BBA0D2CD86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01C2FA2C-2D1F-4F2E-B8D0-C1BBA0D2CD86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01C2FA2C-2D1F-4F2E-B8D0-C1BBA0D2CD86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1D6A50D-8038-4635-9D95-E7DB1DC2CAAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1D6A50D-8038-4635-9D95-E7DB1DC2CAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1D6A50D-8038-4635-9D95-E7DB1DC2CAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1D6A50D-8038-4635-9D95-E7DB1DC2CAAB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,5 +61,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{C6672F0D-32C8-4581-BD64-2BC0ABB856DE} = {5C65E521-1787-4517-9F02-F31D11CAC2AF}
 		{EB16AA43-EFC8-468F-B112-33EB944B0D08} = {0756D0A2-518C-4B70-A096-F64B8847B0DC}
+		{AAC72C61-F860-442F-8DBA-94B6DC0EA2FC} = {976ACC01-CEE2-48E4-9290-0B09670440ED}
+		{01C2FA2C-2D1F-4F2E-B8D0-C1BBA0D2CD86} = {976ACC01-CEE2-48E4-9290-0B09670440ED}
+		{E1D6A50D-8038-4635-9D95-E7DB1DC2CAAB} = {976ACC01-CEE2-48E4-9290-0B09670440ED}
 	EndGlobalSection
 EndGlobal
diff --git a/KSoftNet/KSoftAPI.cs b/KSoftNet/KSoftAPI.cs
index 5bb9f0f..79fc01a 100644
--- a/KSoftNet/KSoftAPI.cs
+++ b/KSoftNet/KSoftAPI.cs
@@ -7,13 +7,6 @@
 using Refit;
 
 namespace KSoftNet {
-
-  public static class CumExtensions {
-    public static string ToJson(this object obj) {
-      return JsonConvert.SerializeObject(obj);
-    }
-  }
-
   /// <summary>
   ///   KSoftApi class
   /// </summary>
diff --git a/SimpleUsage/Program.cs b/SimpleUsage/Program.cs
new file mode 100644
index 0000000..8ba035a
--- /dev/null
+++ b/SimpleUsage/Program.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Threading.Tasks;
+using KSoftNet;
+
+namespace SimpleUsage {
+  internal static class Program {
+    private const string Token = "{token}";
+
+    private static void Main() {
+      new ExampleClass(Token).GetRandomImage("birb").GetAwaiter().GetResult();
+    }
+  }
+
+  public class ExampleClass {
+    private readonly KSoftApi _kSoftApi;
+
+    public ExampleClass(string token) {
+      _kSoftApi = new KSoftApi(token);
+    }
+
+    public async Task GetRandomImage(string tag) {
+      var image = await _kSoftApi.ImagesApi.GetRandomImage(tag: tag);
+
+      Console.WriteLine(image.Url);
+    }
+  }
+}
\ No newline at end of file
diff --git a/SimpleUsage/SimpleUsage.csproj b/SimpleUsage/SimpleUsage.csproj
new file mode 100644
index 0000000..a2f6586
--- /dev/null
+++ b/SimpleUsage/SimpleUsage.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\KSoftNet\KSoftNet.csproj" />
+    </ItemGroup>
+
+</Project>

From 19402b120dc7914965b83555f350ae480f94fbb6 Mon Sep 17 00:00:00 2001
From: Foo <34515228+fooooooooooooooo@users.noreply.github.com>
Date: Fri, 10 Sep 2021 05:17:27 -0700
Subject: [PATCH 4/4] docs: update readme

---
 .idea/.idea.KSoftNet/.idea/workspace.xml |  13 +--
 README.md                                | 126 +++++++++++++++--------
 SimpleUsage/Program.cs                   |   2 +-
 3 files changed, 87 insertions(+), 54 deletions(-)

diff --git a/.idea/.idea.KSoftNet/.idea/workspace.xml b/.idea/.idea.KSoftNet/.idea/workspace.xml
index 055657e..e57589b 100644
--- a/.idea/.idea.KSoftNet/.idea/workspace.xml
+++ b/.idea/.idea.KSoftNet/.idea/workspace.xml
@@ -8,18 +8,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="dd0674aa-9d82-49ee-9c9e-8f97ae15a1f2" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/CustomHttpclient/CustomHttpclient.csproj" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/CustomHttpclient/Program.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/DependencyInjection/DependencyInjection.csproj" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/DependencyInjection/ExampleClass.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/DependencyInjection/Program.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet.Examples/KSoftNet.Examples.csproj" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/KSoftNet.Examples/Program.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/SimpleUsage/Program.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/SimpleUsage/SimpleUsage.csproj" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KSoftNet/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/KSoftNet.sln" beforeDir="false" afterPath="$PROJECT_DIR$/KSoftNet.sln" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/SimpleUsage/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/SimpleUsage/Program.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -177,7 +168,7 @@
       <workItem from="1615976820709" duration="3328000" />
       <workItem from="1631191289148" duration="25345000" />
       <workItem from="1631263325061" duration="10158000" />
-      <workItem from="1631273578125" duration="1082000" />
+      <workItem from="1631273578125" duration="2498000" />
     </task>
     <servers />
   </component>
diff --git a/README.md b/README.md
index a1873ba..2e2f7e8 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,17 @@
 # KSoft.si API Wrapper
 
+[![nuget version][0]][1]
+[![downloads][2]][1]
+
 > http://api.ksoft.si
 
 ## Overview
 
-[KSoft.Si API](http://api.ksoft.si) is a service that provides Discord bot developers or others the ease in getting content from the internet. We provide easy to use interface and take hard tasks away from developers.
+[KSoft.Si API](http://api.ksoft.si) is a professional, fast, reliable and easy to use multi-function service for Discord
+bot developers or websites. It provides easy, no-nonsense endpoints with an extensive library of images, user data,
+weather, geo-location and songs. We help you build awesome services and keep Discord community safe and sound.
 
-### If you find any errors/issues or want any features added, create an issue and I will fix it ASAP
+### If you find any errors/issues or want any features added, [create an issue](https://github.com/KSoft-Si/KSoft.Net/issues/new/choose)
 
 ## Getting started
 
@@ -18,86 +23,123 @@ Add the NuGet package `KSoftNet` to your project:
 dotnet add package KSoftNet
 ```
 
-### Simple Example usage
+### Simple usage
+
+A minimal example to get a random image by tag
 
-You can use the wrapper with the images API for example like so:
-Create an instance of the KSoftAPI class:
+A complete example is available in the `examples/SimpleUsage` project
 
 ```cs
+using System;
+using System.Threading.Tasks;
 using KSoftNet;
 
 public class ExampleClass {
-	private string _token = "token";
+  private readonly KSoftApi _kSoftApi;
 
-	private KSoftAPI _kSoftAPI;
+  public ExampleClass(string token) {
+    _kSoftApi = new KSoftApi(token);
+  }
 
-	public void Setup() {
-		_kSoftAPI = new KSoftAPI(_token);
-	}
+  public async Task GetRandomImage(string tag) {
+    var image = await _kSoftApi.ImagesApi.GetRandomImage(tag: tag);
+
+    Console.WriteLine(image.Url);
+  }
 }
 ```
 
-An example implementation of the RandomImage method:
+### Example using custom HttpClient
+
+You can provide your own HttpClient instance, but you have to set the Authorization header and the BaseAddress manually
+
+A complete example is available in the `examples/CustomHttpclient` project
 
 ```cs
-public void ExampleMethod(string tag) {
-	KSoftImage image = _kSoftAPI.imagesAPI.RandomImage(tag: tag);
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using KSoftNet;
+
+public ExampleClass(string token) {
+  var httpClient = new HttpClient {
+    BaseAddress = new Uri("https://api.ksoft.si"),
+    DefaultRequestHeaders = {
+      Authorization = new AuthenticationHeaderValue("Bearer", token)
+    }
+  };
+
+  _kSoftApi = new KSoftApi(httpClient);
 }
 ```
 
 ### Example using dependency injection
 
-Create an instance of the KSoftAPI class, then create a ServiceCollection, add KSoftAPI to it, and then build the service provider:
+Create a ServiceCollection, then add an instance of the KSoftApi class to it
+
+A complete example is available in the `examples/DependencyInjection` project
 
 ```cs
-using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading.Tasks;
 using KSoftNet;
+using Microsoft.Extensions.DependencyInjection;
 
-public class Program {
+public class Startup {
+  private const string Token = "{token}";
+  private KSoftApi _kSoftApi;
 
-    static void Main(string[] args) {
-        new Startup().Init();
-    }
-}
+  private IServiceProvider _serviceProvider;
 
-public class Startup {
+  public void Init() {
+    var services = new ServiceCollection();
 
-    private KSoftAPI _kSoftAPI;
+    _kSoftApi = new KSoftApi(Token);
 
-    private string _token = "token123";
+    ConfigureServices(services);
+    _serviceProvider = services.BuildServiceProvider();
+  }
 
-    public void Init() {
-        ServiceCollection services = new ServiceCollection();
+  public async Task RunAsync() {
+    var exampleClass = _serviceProvider.GetService<ExampleClass>();
 
-        kSoftAPI = new KSoftAPI(_token);
+    var image = await exampleClass.GetRandomImage("birb");
 
-        ConfigureServices(services);
-        ServiceProvider provider = services.BuildServiceProvider();
-    }
+    Console.WriteLine(image.Url);
+  }
 
-    private void ConfigureServices(IServiceCollection services) {
-        services.AddSingleton(kSoftAPI);
-    }
+  private void ConfigureServices(IServiceCollection services) {
+    services.AddSingleton(_kSoftApi);
+    services.AddSingleton<ExampleClass>();
+  }
 }
 ```
 
 Using this in a class:
 
 ```cs
+using System.Threading.Tasks;
 using KSoftNet;
+using KSoftNet.Models.Images;
 
- public class ExampleClass {
-
-    private KSoftAPI _kSoftAPI;
+public class ExampleClass {
+  private readonly KSoftApi _kSoftApi;
 
-    public ExampleClass(KSoftAPI kSoftAPI) {
-        _kSoftAPI = kSoftAPI;
-    }
+  public ExampleClass(KSoftApi kSoftApi) {
+    _kSoftApi = kSoftApi;
+  }
 
-    public void GetRandomImage(string tag) {
-        KSoftImage image = _kSoftAPI.imagesAPI.RandomImage(tag: tag);
+  public async Task<Image> GetRandomImage(string tag) {
+    var image = await _kSoftApi.ImagesApi.GetRandomImage(tag: tag);
 
-        Console.WriteLine(image.Url);
-    }
+    return image;
+  }
 }
 ```
+
+[0]: https://img.shields.io/nuget/v/KSoftNet?style=flat-square
+
+[1]: https://www.nuget.org/packages/KSoftNet
+
+[2]: https://img.shields.io/nuget/dt/KSoftNet?style=flat-square
diff --git a/SimpleUsage/Program.cs b/SimpleUsage/Program.cs
index 8ba035a..6745887 100644
--- a/SimpleUsage/Program.cs
+++ b/SimpleUsage/Program.cs
@@ -23,5 +23,5 @@ public async Task GetRandomImage(string tag) {
 
       Console.WriteLine(image.Url);
     }
-  }
+  }                                                                   
 }
\ No newline at end of file