diff --git a/.gitmodules b/.gitmodules
index 888fb92..a27f096 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/OddDotCSharp/OddDotProto"]
-	path = src/OddDotCSharp/OddDotProto
+[submodule "src/OddDotCSharp/submodules/OddDotProto"]
+	path = src/OddDotCSharp/submodules/OddDotProto
 	url = https://github.com/OddDotNet/OddDotProto.git
diff --git a/.idea/.idea.OddDotCSharp/.idea/indexLayout.xml b/.idea/.idea.OddDotCSharp/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/.idea.OddDotCSharp/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.OddDotCSharp/.idea/protoeditor.xml b/.idea/.idea.OddDotCSharp/.idea/protoeditor.xml
index 8c809cc..1d0c6e2 100644
--- a/.idea/.idea.OddDotCSharp/.idea/protoeditor.xml
+++ b/.idea/.idea.OddDotCSharp/.idea/protoeditor.xml
@@ -3,6 +3,12 @@
   <component name="ProtobufLanguageSettings">
     <option name="importPathEntries">
       <list>
+        <ImportPathEntry>
+          <option name="location" value="file://$PROJECT_DIR$/src/OddDotCSharp/OddDotProto/odddotproto/proto/trace/v1" />
+        </ImportPathEntry>
+        <ImportPathEntry>
+          <option name="location" value="file://$PROJECT_DIR$/src/OddDotCSharp/OddDotProto/submodules" />
+        </ImportPathEntry>
         <ImportPathEntry>
           <option name="location" value="file://$PROJECT_DIR$/src/OddDotCSharp/OddDotProto" />
         </ImportPathEntry>
diff --git a/.idea/.idea.OddDotCSharp/.idea/vcs.xml b/.idea/.idea.OddDotCSharp/.idea/vcs.xml
index 3e3c857..5f92915 100644
--- a/.idea/.idea.OddDotCSharp/.idea/vcs.xml
+++ b/.idea/.idea.OddDotCSharp/.idea/vcs.xml
@@ -2,6 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/src/OddDotCSharp/OddDotProto" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/OddDotCSharp/submodules/OddDotProto" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/GitVersion.yml b/GitVersion.yml
index 268024a..c8a949c 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,2 +1,2 @@
 workflow: GitHubFlow/v1
-next-version: 0.0.2
+next-version: 0.1.0
diff --git a/src/OddDotCSharp/OddDotCSharp.csproj b/src/OddDotCSharp/OddDotCSharp.csproj
index a0994c2..d65b82c 100644
--- a/src/OddDotCSharp/OddDotCSharp.csproj
+++ b/src/OddDotCSharp/OddDotCSharp.csproj
@@ -26,9 +26,10 @@
       </PackageReference>
     </ItemGroup>
 
-    <!-- Internal proto definitions -->
+    <!-- Proto definitions -->
     <ItemGroup>
-        <Protobuf Include="OddDotProto/**/*.proto" GrpcServices="Client" ProtoRoot="OddDotProto/"/>
+        <Protobuf Include="submodules/OddDotProto/submodules/opentelemetry/**/*.proto" GrpcServices="None" ProtoRoot="submodules/OddDotProto/submodules"/>
+        <Protobuf Include="submodules/OddDotProto/odddotproto/**/*.proto" GrpcServices="Client" ProtoRoot="submodules/OddDotProto/odddotproto/proto/trace/v1" AdditionalImportDirs="submodules/OddDotProto/submodules"/>
     </ItemGroup>
     
     <ItemGroup>
diff --git a/src/OddDotCSharp/OddDotProto b/src/OddDotCSharp/OddDotProto
deleted file mode 160000
index 02d3126..0000000
--- a/src/OddDotCSharp/OddDotProto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 02d31264ae7bcfa7348942bc2697a2d6f1004928
diff --git a/src/OddDotCSharp/SpanQueryRequestBuilder.cs b/src/OddDotCSharp/SpanQueryRequestBuilder.cs
index 034fa21..7c899c1 100644
--- a/src/OddDotCSharp/SpanQueryRequestBuilder.cs
+++ b/src/OddDotCSharp/SpanQueryRequestBuilder.cs
@@ -1,5 +1,5 @@
 using System;
-using OddDotNet.Proto.Spans.V1;
+using OddDotNet.Proto.Trace.V1;
 
 namespace OddDotCSharp
 {
diff --git a/src/OddDotCSharp/WhereSpanFilterConfigurator.cs b/src/OddDotCSharp/WhereSpanFilterConfigurator.cs
index dbad365..fae3ef3 100644
--- a/src/OddDotCSharp/WhereSpanFilterConfigurator.cs
+++ b/src/OddDotCSharp/WhereSpanFilterConfigurator.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Google.Protobuf;
-using OddDotNet.Proto.Spans.V1;
+using OddDotNet.Proto.Trace.V1;
+using OpenTelemetry.Proto.Trace.V1;
+
 
 namespace OddDotCSharp
 {
@@ -84,7 +86,7 @@ public WhereSpanFilterConfigurator AddFilter(WhereSpanPropertyFilter.ValueOneofC
         /// <param name="compare">The <see cref="SpanStatusCode"/> to compare the property against.</param>
         /// <param name="compareAs">The type of comparison to do. See <see cref="EnumCompareAsType"/> for more details.</param>
         /// <returns>this <see cref="WhereSpanFilterConfigurator"/>.</returns>
-        public WhereSpanFilterConfigurator AddSpanStatusCodeFilter(SpanStatusCode compare,
+        public WhereSpanFilterConfigurator AddSpanStatusCodeFilter(Status.Types.StatusCode compare,
             EnumCompareAsType compareAs)
         {
             var spanStatusCodeProperty = new SpanStatusCodeProperty
@@ -100,10 +102,10 @@ public WhereSpanFilterConfigurator AddSpanStatusCodeFilter(SpanStatusCode compar
         /// <summary>
         /// Adds a <see cref="SpanKindProperty"/> filter to the list of filters.
         /// </summary>
-        /// <param name="compare">The <see cref="SpanKind"/> to compare the property against.</param>
+        /// <param name="compare">The <see cref="Span.Types.SpanKind"/> to compare the property against.</param>
         /// <param name="compareAs">The type of comparison to do. See <see cref="EnumCompareAsType"/> for more details.</param>
         /// <returns>this <see cref="WhereSpanFilterConfigurator"/>.</returns>
-        public WhereSpanFilterConfigurator AddSpanKindFilter(SpanKind compare,
+        public WhereSpanFilterConfigurator AddSpanKindFilter(Span.Types.SpanKind compare,
             EnumCompareAsType compareAs)
         {
             var spanKindProperty = new SpanKindProperty
diff --git a/src/OddDotCSharp/submodules/OddDotProto b/src/OddDotCSharp/submodules/OddDotProto
new file mode 160000
index 0000000..c7dd040
--- /dev/null
+++ b/src/OddDotCSharp/submodules/OddDotProto
@@ -0,0 +1 @@
+Subproject commit c7dd040880cc3c56030bab7574ab85f97d47f4bd
diff --git a/tests/OddDotCSharp.Tests/SpanQueryRequestBuilderTests.cs b/tests/OddDotCSharp.Tests/SpanQueryRequestBuilderTests.cs
index d639cfb..0a1e9d3 100644
--- a/tests/OddDotCSharp.Tests/SpanQueryRequestBuilderTests.cs
+++ b/tests/OddDotCSharp.Tests/SpanQueryRequestBuilderTests.cs
@@ -1,4 +1,5 @@
-using OddDotNet.Proto.Spans.V1;
+using OddDotNet.Proto.Trace.V1;
+using OpenTelemetry.Proto.Trace.V1;
 
 namespace OddDotCSharp.Tests;
 
@@ -176,7 +177,7 @@ public void AddUInt64PropertyFilter()
         public void AddSpanStatusCodePropertyFilter()
         {
             var builder = new SpanQueryRequestBuilder();
-            SpanStatusCode code = SpanStatusCode.Ok;
+            Status.Types.StatusCode code = Status.Types.StatusCode.Ok;
             builder.Where(filters =>
             {
                 filters.AddSpanStatusCodeFilter(code, EnumCompareAsType.Equals);
@@ -197,7 +198,7 @@ public void AddSpanStatusCodePropertyFilter()
         public void AddSpanKindPropertyFilter()
         {
             var builder = new SpanQueryRequestBuilder();
-            SpanKind kind = SpanKind.Internal;
+            Span.Types.SpanKind kind = Span.Types.SpanKind.Internal;
             builder.Where(filters =>
             {
                 filters.AddSpanKindFilter(kind, EnumCompareAsType.Equals);