diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 9e74037..047bb07 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
@@ -31,12 +31,12 @@ jobs:
         outputFormat: 'lcov'
         excludes: '[program]*,[test]test.*'
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: test_report
         path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: coverage_report
@@ -51,4 +51,4 @@ jobs:
       with:
         name: Test Report            # Name of the check run which will be created
         path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx    # Path to test results
-        reporter: dotnet-trx        # Format of test results
\ No newline at end of file
+        reporter: dotnet-trx        # Format of test results
diff --git a/RevolveUavcan/Dsdl/DsdlParser.cs b/RevolveUavcan/Dsdl/DsdlParser.cs
index afe1ef2..86a8b12 100644
--- a/RevolveUavcan/Dsdl/DsdlParser.cs
+++ b/RevolveUavcan/Dsdl/DsdlParser.cs
@@ -36,14 +36,14 @@ public void ParseAllDirectories()
                 throw new DsdlException($"Dsdl Path: {DsdlPath} could not be found!");
             }
 
-            // Parse each .uavcan file in the directory, including subdirectories
+            // Parse each .uavcan or .dsdl file in the directory, including subdirectories
             // Converted to list to easily add the root namespace folder as well
             var dirs = Directory.GetDirectories(DsdlPath, "*", SearchOption.AllDirectories).ToList();
             dirs.Add(DsdlPath);
 
             foreach (var file in dirs
                 .SelectMany(Directory.GetFiles)
-                .Where(fileName => fileName.Contains(".uavcan")))
+                .Where(fileName => fileName.Contains(".uavcan") || fileName.Contains("dsdl")))
             {
                 var (fullName, _, _) = FullTypenameVersionAndDtidFromFilename(file);
                 if (!ParsedDsdlDict.ContainsKey(fullName))