diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d61fb6d..7d72101 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -18,14 +18,10 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Setup .NET Core 3.1
+    - name: Setup .NET Core 7.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
-    - name: Setup .NET Core 6.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 1eacfe0..5eed2da 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -16,14 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 3.1
+    - name: Setup .NET Core 7.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
-    - name: Setup .NET Core 6.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
     - name: Install dependencies
       run: dotnet restore
     - name: Build
@@ -44,14 +40,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: Setup .NET Core 6.0
+    - name: Setup .NET Core 7.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
     - name: Pack NuGet
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:
diff --git a/.github/workflows/sonarqube-analysis.yml b/.github/workflows/sonarqube-analysis.yml
index ced25e6..f6f86ee 100644
--- a/.github/workflows/sonarqube-analysis.yml
+++ b/.github/workflows/sonarqube-analysis.yml
@@ -12,16 +12,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup .NET Core 3.1
+    - name: Setup .NET Core 7.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
-    - name: Setup .NET Core 6.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
     - name: SonarScanner for .NET Core with pull request decoration support
-      uses: highbyte/sonarscan-dotnet@v2.1.2
+      uses: highbyte/sonarscan-dotnet@v2.2.1
       with:
         sonarProjectKey: qatoolkit_qatoolkit-source-swagger-net
         sonarProjectName:  qatoolkit_qatoolkit-source-swagger-net
diff --git a/.gitignore b/.gitignore
index 15725df..583eb90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -361,3 +361,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /src/QAToolKit.Source.Swagger.Test/global.json
+.idea/
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 8f74366..60b81f5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 07407fb..436e239 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 ## Description
 `QAToolKit.Source.Swagger` is a .NET library, which generates `IEnumerable<HttpRequest>` object that is the input for other components.
 
-Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
+Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
 
 Major features:
 
@@ -182,7 +182,10 @@ By default this option is set to false.
 
 MIT License
 
-Copyright (c) 2020-2021 Miha Jakovac
+Copyright (c) 2020-2023 Miha Jakovac
+Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `net7.0`
+Supported .NET frameworks and standards: `netstandard2.0`, `netstandard2.1`, `netcoreapp3.1`, `net6.0`
+Copyright (c) 2020-2023 Miha Jakovac
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj b/src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj
index 36dede8..c7711a9 100644
--- a/src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj
+++ b/src/QAToolKit.Source.Swagger.Test/QAToolKit.Source.Swagger.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -21,10 +21,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj b/src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj
index 1eab65d..5b9284f 100644
--- a/src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj
+++ b/src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<LangVersion>latest</LangVersion>
 		<ProjectGuid>ee940718-945a-4c34-8ce6-0790972ada44</ProjectGuid>
@@ -19,7 +19,7 @@
 		<PackageProjectUrl>https://github.com/qatoolkit/qatoolkit-source-swagger-net</PackageProjectUrl>
 		<PackageIcon>qatoolkit-64x64.png</PackageIcon>
 		<RepositoryUrl>https://github.com/qatoolkit/qatoolkit-source-swagger-net</RepositoryUrl>
-		<PackageTags>qatoolkit-source-swagger-net;.net;c#;f#;swagger;dotnet;netstandard;net6</PackageTags>
+		<PackageTags>qatoolkit-source-swagger-net;.net;c#;f#;swagger;dotnet;netstandard;net7</PackageTags>
 		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>
 
diff --git a/src/QAToolKit.Source.Swagger/SwaggerProcessor.cs b/src/QAToolKit.Source.Swagger/SwaggerProcessor.cs
index b8be58d..3c708ab 100644
--- a/src/QAToolKit.Source.Swagger/SwaggerProcessor.cs
+++ b/src/QAToolKit.Source.Swagger/SwaggerProcessor.cs
@@ -265,7 +265,7 @@ private HttpMethod GetHttpMethod(KeyValuePair<OperationType, OpenApiOperation> o
 #elif NETCOREAPP3_1
                 case "patch":
                     return HttpMethod.Patch;
-#elif NET6_0
+#elif NET7_0
                 case "patch":
                     return HttpMethod.Patch;
 #endif