diff --git a/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/My Project/AssemblyInfo.vb b/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/My Project/AssemblyInfo.vb
index a40b502..fc4aed0 100644
--- a/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/My Project/AssemblyInfo.vb	
+++ b/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.4.0.0")> 
-<Assembly: AssemblyFileVersion("1.4.0.0")> 
+<Assembly: AssemblyVersion("1.7.0.0")> 
+<Assembly: AssemblyFileVersion("1.7.0.0")> 
diff --git a/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj b/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj
index 7c0ade5..dd937cd 100644
--- a/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj
+++ b/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj
@@ -13,7 +13,7 @@
     <AssemblyName>SnoopCivil3DObjects</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\R21\</OutputPath>
+    <OutputPath>..\..\R24.1\</OutputPath>
     <DocumentationFile>SnoopCivil3DObjects.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
@@ -51,23 +51,23 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="accoremgd">
-      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD Civil 3D 2014\accoremgd.dll</HintPath>
+      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD 2022\accoremgd.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="acdbmgd">
-      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD Civil 3D 2014\acdbmgd.dll</HintPath>
+      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD 2022\acdbmgd.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="acmgd">
-      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD Civil 3D 2014\acmgd.dll</HintPath>
+      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD 2022\acmgd.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="AecBaseMgd">
-      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD Civil 3D 2014\AecBaseMgd.dll</HintPath>
+      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD 2022\C3D\AecBaseMgd.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="AeccDbMgd">
-      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD Civil 3D 2014\AeccDbMgd.dll</HintPath>
+      <HintPath>..\..\..\..\..\Program Files\Autodesk\Autodesk AutoCAD 2022\C3D\AeccDbMgd.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -139,11 +139,11 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>
\ No newline at end of file
diff --git a/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj.user b/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj.user
index 2166a52..6be2e4a 100644
--- a/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj.user
+++ b/Civil3DSnoopDB.bundle/Contents/Source/SnoopCivil3D/SnoopCivil3D.vbproj.user
@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files\Autodesk\AutoCAD 2017\acad.exe</StartProgram>
+    <StartProgram>C:\Program Files\Autodesk\AutoCAD 2022\acad.exe</StartProgram>
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <StartArguments>/ld "C:\Program Files\Autodesk\AutoCAD 2017\\AecBase.dbx" /p "&lt;&lt;C3D_Metric&gt;&gt;"  /product "C3D" /language "en-US"</StartArguments>
+    <StartArguments>/ld "C:\Program Files\Autodesk\AutoCAD 2022\\AecBase.dbx" /p "&lt;&lt;C3D_Metric&gt;&gt;"  /product "C3D" /language "en-US"</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
-    <ReferencePath>C:\Program Files\Autodesk\AutoCAD 2017\;C:\Program Files\Autodesk\AutoCAD 2017\C3D\</ReferencePath>
+    <ReferencePath>C:\Program Files\Autodesk\AutoCAD 2020\;C:\Program Files\Autodesk\AutoCAD 2022\C3D\</ReferencePath>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Civil3DSnoopDB.bundle/PackageContents.xml b/Civil3DSnoopDB.bundle/PackageContents.xml
index cf7d6f9..d031667 100644
--- a/Civil3DSnoopDB.bundle/PackageContents.xml
+++ b/Civil3DSnoopDB.bundle/PackageContents.xml
@@ -3,7 +3,7 @@
   <CompanyDetails Name="Autodesk" Email="augusto.goncalves@autodesk.com" />
   <RuntimeRequirements OS="Win64" Platform="Civil3D" />
   <Components Description="R21 part">
-    <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R21.0" SeriesMax="R22.0" />
-    <ComponentEntry AppName="Civil3DSnoopDB" Version="1.1" ModuleName="./Contents/R21/SnoopCivil3DObjects.dll" AppDescription="R21 module" LoadOnAppearance="True" LoadOnAutoCADStartup="True" />
+    <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R21.0" SeriesMax="R24.1" />
+    <ComponentEntry AppName="Civil3DSnoopDB" Version="1.7" ModuleName="./Contents/R24.1/SnoopCivil3DObjects.dll" AppDescription="R24.1 module" LoadOnAppearance="True" LoadOnAutoCADStartup="True" />
   </Components>
 </ApplicationPackage>
\ No newline at end of file
diff --git a/README.md b/README.md
index 1670218..ef932c1 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Database Snoop for AutoCAD Civil 3D 2017
+# Database Snoop for AutoCAD Civil 3D 2022
 
 This tool uses .NET Reflection to list all properties of AutoCAD Civil 3D major objects, such as Alignments, Corridors, Surfaces, Networks, etc. It also lists collections items and allows selection of objects on-screen.
 
 # Setup
 
-Open the [SnoopCivil3D.sln](Civil3DSnoopDB.bundle\Contents\Source\SnoopCivil3D\SnoopCivil3D.sln) on Visual Studio 2015. All references should be ready for AutoCAD Civil 3D 2017 default install path, otherwise go to project properties >> References, then click on Reference Paths and adjust. Build the project in Release, the DLL should be placed at /Contents/R21 folder. Copy the entire .bundle folder to <b>c:\Program Files\Autodesk\Autodesk\ApplicationPlugins</b> folder and launch Civil 3D.
+Open the [SnoopCivil3D.sln](Civil3DSnoopDB.bundle\Contents\Source\SnoopCivil3D\SnoopCivil3D.sln) on Visual Studio 2015. All references should be ready for AutoCAD Civil 3D 2022 default install path, otherwise go to project properties >> References, then click on Reference Paths and adjust. Build the project in Release, the DLL should be placed at /Contents/R24.1 folder. Copy the entire .bundle folder to <b>c:\Program Files\Autodesk\Autodesk\ApplicationPlugins</b> folder and launch Civil 3D.
 
 # Usage
 
@@ -32,3 +32,5 @@ The tool may stop working on some properties that cannot be reflected (using .NE
 - 1.3 Support for additional drawing
 - 1.4 2017 support
 - 1.5 2018 support
+- 1.6 2020 support
+- 1.7 2022 support