diff --git a/CogniteSdk.Protobuf/CogniteSdk.Protobuf.csproj b/CogniteSdk.Protobuf/CogniteSdk.Protobuf.csproj
new file mode 100644
index 00000000..046990d3
--- /dev/null
+++ b/CogniteSdk.Protobuf/CogniteSdk.Protobuf.csproj
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Protocol buffers for CogniteSdk</Description>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageId>CogniteSdk.Protobuf</PackageId>
+    <Author>Cognite AS</Author>
+    <Company>Cognite AS</Company>
+    <Copyright>Cognite AS</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <AssemblyOriginatorKeyFile>$(SolutionDir)/strong_name.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" Visible="false" PackagePath=""/>
+  </ItemGroup>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/CogniteSdk.Protobuf/DataPointInsertionRequest.cs b/CogniteSdk.Protobuf/DataPointInsertionRequest.cs
new file mode 100644
index 00000000..f02fd303
--- /dev/null
+++ b/CogniteSdk.Protobuf/DataPointInsertionRequest.cs
@@ -0,0 +1,623 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: data_point_insertion_request.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Com.Cognite.V1.Timeseries.Proto {
+
+  /// <summary>Holder for reflection information generated from data_point_insertion_request.proto</summary>
+  public static partial class DataPointInsertionRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for data_point_insertion_request.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DataPointInsertionRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiJkYXRhX3BvaW50X2luc2VydGlvbl9yZXF1ZXN0LnByb3RvEh9jb20uY29n",
+            "bml0ZS52MS50aW1lc2VyaWVzLnByb3RvGhFkYXRhX3BvaW50cy5wcm90byL/",
+            "AQoWRGF0YVBvaW50SW5zZXJ0aW9uSXRlbRIMCgJpZBgBIAEoA0gAEhQKCmV4",
+            "dGVybmFsSWQYAiABKAlIABJPChFudW1lcmljRGF0YXBvaW50cxgDIAEoCzIy",
+            "LmNvbS5jb2duaXRlLnYxLnRpbWVzZXJpZXMucHJvdG8uTnVtZXJpY0RhdGFw",
+            "b2ludHNIARJNChBzdHJpbmdEYXRhcG9pbnRzGAQgASgLMjEuY29tLmNvZ25p",
+            "dGUudjEudGltZXNlcmllcy5wcm90by5TdHJpbmdEYXRhcG9pbnRzSAFCEAoO",
+            "aWRPckV4dGVybmFsSWRCDwoNZGF0YXBvaW50VHlwZSJjChlEYXRhUG9pbnRJ",
+            "bnNlcnRpb25SZXF1ZXN0EkYKBWl0ZW1zGAEgAygLMjcuY29tLmNvZ25pdGUu",
+            "djEudGltZXNlcmllcy5wcm90by5EYXRhUG9pbnRJbnNlcnRpb25JdGVtQgJQ",
+            "AWIGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem), global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem.Parser, new[]{ "Id", "ExternalId", "NumericDatapoints", "StringDatapoints" }, new[]{ "IdOrExternalId", "DatapointType" }, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionRequest), global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionRequest.Parser, new[]{ "Items" }, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class DataPointInsertionItem : pb::IMessage<DataPointInsertionItem>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<DataPointInsertionItem> _parser = new pb::MessageParser<DataPointInsertionItem>(() => new DataPointInsertionItem());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<DataPointInsertionItem> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointInsertionItem() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointInsertionItem(DataPointInsertionItem other) : this() {
+      switch (other.IdOrExternalIdCase) {
+        case IdOrExternalIdOneofCase.Id:
+          Id = other.Id;
+          break;
+        case IdOrExternalIdOneofCase.ExternalId:
+          ExternalId = other.ExternalId;
+          break;
+      }
+
+      switch (other.DatapointTypeCase) {
+        case DatapointTypeOneofCase.NumericDatapoints:
+          NumericDatapoints = other.NumericDatapoints.Clone();
+          break;
+        case DatapointTypeOneofCase.StringDatapoints:
+          StringDatapoints = other.StringDatapoints.Clone();
+          break;
+      }
+
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointInsertionItem Clone() {
+      return new DataPointInsertionItem(this);
+    }
+
+    /// <summary>Field number for the "id" field.</summary>
+    public const int IdFieldNumber = 1;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public long Id {
+      get { return idOrExternalIdCase_ == IdOrExternalIdOneofCase.Id ? (long) idOrExternalId_ : 0L; }
+      set {
+        idOrExternalId_ = value;
+        idOrExternalIdCase_ = IdOrExternalIdOneofCase.Id;
+      }
+    }
+
+    /// <summary>Field number for the "externalId" field.</summary>
+    public const int ExternalIdFieldNumber = 2;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string ExternalId {
+      get { return idOrExternalIdCase_ == IdOrExternalIdOneofCase.ExternalId ? (string) idOrExternalId_ : ""; }
+      set {
+        idOrExternalId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        idOrExternalIdCase_ = IdOrExternalIdOneofCase.ExternalId;
+      }
+    }
+
+    /// <summary>Field number for the "numericDatapoints" field.</summary>
+    public const int NumericDatapointsFieldNumber = 3;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints NumericDatapoints {
+      get { return datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints ? (global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints) datapointType_ : null; }
+      set {
+        datapointType_ = value;
+        datapointTypeCase_ = value == null ? DatapointTypeOneofCase.None : DatapointTypeOneofCase.NumericDatapoints;
+      }
+    }
+
+    /// <summary>Field number for the "stringDatapoints" field.</summary>
+    public const int StringDatapointsFieldNumber = 4;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints StringDatapoints {
+      get { return datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints ? (global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints) datapointType_ : null; }
+      set {
+        datapointType_ = value;
+        datapointTypeCase_ = value == null ? DatapointTypeOneofCase.None : DatapointTypeOneofCase.StringDatapoints;
+      }
+    }
+
+    private object idOrExternalId_;
+    /// <summary>Enum of possible cases for the "idOrExternalId" oneof.</summary>
+    public enum IdOrExternalIdOneofCase {
+      None = 0,
+      Id = 1,
+      ExternalId = 2,
+    }
+    private IdOrExternalIdOneofCase idOrExternalIdCase_ = IdOrExternalIdOneofCase.None;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public IdOrExternalIdOneofCase IdOrExternalIdCase {
+      get { return idOrExternalIdCase_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void ClearIdOrExternalId() {
+      idOrExternalIdCase_ = IdOrExternalIdOneofCase.None;
+      idOrExternalId_ = null;
+    }
+
+    private object datapointType_;
+    /// <summary>Enum of possible cases for the "datapointType" oneof.</summary>
+    public enum DatapointTypeOneofCase {
+      None = 0,
+      NumericDatapoints = 3,
+      StringDatapoints = 4,
+    }
+    private DatapointTypeOneofCase datapointTypeCase_ = DatapointTypeOneofCase.None;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DatapointTypeOneofCase DatapointTypeCase {
+      get { return datapointTypeCase_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void ClearDatapointType() {
+      datapointTypeCase_ = DatapointTypeOneofCase.None;
+      datapointType_ = null;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as DataPointInsertionItem);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(DataPointInsertionItem other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Id != other.Id) return false;
+      if (ExternalId != other.ExternalId) return false;
+      if (!object.Equals(NumericDatapoints, other.NumericDatapoints)) return false;
+      if (!object.Equals(StringDatapoints, other.StringDatapoints)) return false;
+      if (IdOrExternalIdCase != other.IdOrExternalIdCase) return false;
+      if (DatapointTypeCase != other.DatapointTypeCase) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.Id) hash ^= Id.GetHashCode();
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.ExternalId) hash ^= ExternalId.GetHashCode();
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) hash ^= NumericDatapoints.GetHashCode();
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) hash ^= StringDatapoints.GetHashCode();
+      hash ^= (int) idOrExternalIdCase_;
+      hash ^= (int) datapointTypeCase_;
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.Id) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Id);
+      }
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.ExternalId) {
+        output.WriteRawTag(18);
+        output.WriteString(ExternalId);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+        output.WriteRawTag(26);
+        output.WriteMessage(NumericDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+        output.WriteRawTag(34);
+        output.WriteMessage(StringDatapoints);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.Id) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Id);
+      }
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.ExternalId) {
+        output.WriteRawTag(18);
+        output.WriteString(ExternalId);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+        output.WriteRawTag(26);
+        output.WriteMessage(NumericDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+        output.WriteRawTag(34);
+        output.WriteMessage(StringDatapoints);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.Id) {
+        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Id);
+      }
+      if (idOrExternalIdCase_ == IdOrExternalIdOneofCase.ExternalId) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(ExternalId);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(NumericDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StringDatapoints);
+      }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(DataPointInsertionItem other) {
+      if (other == null) {
+        return;
+      }
+      switch (other.IdOrExternalIdCase) {
+        case IdOrExternalIdOneofCase.Id:
+          Id = other.Id;
+          break;
+        case IdOrExternalIdOneofCase.ExternalId:
+          ExternalId = other.ExternalId;
+          break;
+      }
+
+      switch (other.DatapointTypeCase) {
+        case DatapointTypeOneofCase.NumericDatapoints:
+          if (NumericDatapoints == null) {
+            NumericDatapoints = new global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints();
+          }
+          NumericDatapoints.MergeFrom(other.NumericDatapoints);
+          break;
+        case DatapointTypeOneofCase.StringDatapoints:
+          if (StringDatapoints == null) {
+            StringDatapoints = new global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints();
+          }
+          StringDatapoints.MergeFrom(other.StringDatapoints);
+          break;
+      }
+
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 8: {
+            Id = input.ReadInt64();
+            break;
+          }
+          case 18: {
+            ExternalId = input.ReadString();
+            break;
+          }
+          case 26: {
+            global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+              subBuilder.MergeFrom(NumericDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            NumericDatapoints = subBuilder;
+            break;
+          }
+          case 34: {
+            global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+              subBuilder.MergeFrom(StringDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            StringDatapoints = subBuilder;
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 8: {
+            Id = input.ReadInt64();
+            break;
+          }
+          case 18: {
+            ExternalId = input.ReadString();
+            break;
+          }
+          case 26: {
+            global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+              subBuilder.MergeFrom(NumericDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            NumericDatapoints = subBuilder;
+            break;
+          }
+          case 34: {
+            global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+              subBuilder.MergeFrom(StringDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            StringDatapoints = subBuilder;
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class DataPointInsertionRequest : pb::IMessage<DataPointInsertionRequest>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<DataPointInsertionRequest> _parser = new pb::MessageParser<DataPointInsertionRequest>(() => new DataPointInsertionRequest());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<DataPointInsertionRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionRequestReflection.Descriptor.MessageTypes[1]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointInsertionRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointInsertionRequest(DataPointInsertionRequest other) : this() {
+      items_ = other.items_.Clone();
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointInsertionRequest Clone() {
+      return new DataPointInsertionRequest(this);
+    }
+
+    /// <summary>Field number for the "items" field.</summary>
+    public const int ItemsFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem> _repeated_items_codec
+        = pb::FieldCodec.ForMessage(10, global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem.Parser);
+    private readonly pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem> items_ = new pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.DataPointInsertionItem> Items {
+      get { return items_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as DataPointInsertionRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(DataPointInsertionRequest other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!items_.Equals(other.items_)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= items_.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      items_.WriteTo(output, _repeated_items_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      items_.WriteTo(ref output, _repeated_items_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      size += items_.CalculateSize(_repeated_items_codec);
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(DataPointInsertionRequest other) {
+      if (other == null) {
+        return;
+      }
+      items_.Add(other.items_);
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            items_.AddEntriesFrom(input, _repeated_items_codec);
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 10: {
+            items_.AddEntriesFrom(ref input, _repeated_items_codec);
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/CogniteSdk.Protobuf/DataPointListResponse.cs b/CogniteSdk.Protobuf/DataPointListResponse.cs
new file mode 100644
index 00000000..a9b08859
--- /dev/null
+++ b/CogniteSdk.Protobuf/DataPointListResponse.cs
@@ -0,0 +1,831 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: data_point_list_response.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Com.Cognite.V1.Timeseries.Proto {
+
+  /// <summary>Holder for reflection information generated from data_point_list_response.proto</summary>
+  public static partial class DataPointListResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for data_point_list_response.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DataPointListResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch5kYXRhX3BvaW50X2xpc3RfcmVzcG9uc2UucHJvdG8SH2NvbS5jb2duaXRl",
+            "LnYxLnRpbWVzZXJpZXMucHJvdG8aEWRhdGFfcG9pbnRzLnByb3RvIpUDChFE",
+            "YXRhUG9pbnRMaXN0SXRlbRIKCgJpZBgBIAEoAxISCgpleHRlcm5hbElkGAIg",
+            "ASgJEhAKCGlzU3RyaW5nGAYgASgIEg4KBmlzU3RlcBgHIAEoCBIMCgR1bml0",
+            "GAggASgJEhIKCm5leHRDdXJzb3IYCSABKAkSFgoOdW5pdEV4dGVybmFsSWQY",
+            "CiABKAkSTwoRbnVtZXJpY0RhdGFwb2ludHMYAyABKAsyMi5jb20uY29nbml0",
+            "ZS52MS50aW1lc2VyaWVzLnByb3RvLk51bWVyaWNEYXRhcG9pbnRzSAASTQoQ",
+            "c3RyaW5nRGF0YXBvaW50cxgEIAEoCzIxLmNvbS5jb2duaXRlLnYxLnRpbWVz",
+            "ZXJpZXMucHJvdG8uU3RyaW5nRGF0YXBvaW50c0gAElMKE2FnZ3JlZ2F0ZURh",
+            "dGFwb2ludHMYBSABKAsyNC5jb20uY29nbml0ZS52MS50aW1lc2VyaWVzLnBy",
+            "b3RvLkFnZ3JlZ2F0ZURhdGFwb2ludHNIAEIPCg1kYXRhcG9pbnRUeXBlIloK",
+            "FURhdGFQb2ludExpc3RSZXNwb25zZRJBCgVpdGVtcxgBIAMoCzIyLmNvbS5j",
+            "b2duaXRlLnYxLnRpbWVzZXJpZXMucHJvdG8uRGF0YVBvaW50TGlzdEl0ZW1C",
+            "AlABYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem), global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem.Parser, new[]{ "Id", "ExternalId", "IsString", "IsStep", "Unit", "NextCursor", "UnitExternalId", "NumericDatapoints", "StringDatapoints", "AggregateDatapoints" }, new[]{ "DatapointType" }, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.DataPointListResponse), global::Com.Cognite.V1.Timeseries.Proto.DataPointListResponse.Parser, new[]{ "Items" }, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class DataPointListItem : pb::IMessage<DataPointListItem>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<DataPointListItem> _parser = new pb::MessageParser<DataPointListItem>(() => new DataPointListItem());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<DataPointListItem> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointListResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointListItem() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointListItem(DataPointListItem other) : this() {
+      id_ = other.id_;
+      externalId_ = other.externalId_;
+      isString_ = other.isString_;
+      isStep_ = other.isStep_;
+      unit_ = other.unit_;
+      nextCursor_ = other.nextCursor_;
+      unitExternalId_ = other.unitExternalId_;
+      switch (other.DatapointTypeCase) {
+        case DatapointTypeOneofCase.NumericDatapoints:
+          NumericDatapoints = other.NumericDatapoints.Clone();
+          break;
+        case DatapointTypeOneofCase.StringDatapoints:
+          StringDatapoints = other.StringDatapoints.Clone();
+          break;
+        case DatapointTypeOneofCase.AggregateDatapoints:
+          AggregateDatapoints = other.AggregateDatapoints.Clone();
+          break;
+      }
+
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointListItem Clone() {
+      return new DataPointListItem(this);
+    }
+
+    /// <summary>Field number for the "id" field.</summary>
+    public const int IdFieldNumber = 1;
+    private long id_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public long Id {
+      get { return id_; }
+      set {
+        id_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "externalId" field.</summary>
+    public const int ExternalIdFieldNumber = 2;
+    private string externalId_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string ExternalId {
+      get { return externalId_; }
+      set {
+        externalId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "isString" field.</summary>
+    public const int IsStringFieldNumber = 6;
+    private bool isString_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool IsString {
+      get { return isString_; }
+      set {
+        isString_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "isStep" field.</summary>
+    public const int IsStepFieldNumber = 7;
+    private bool isStep_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool IsStep {
+      get { return isStep_; }
+      set {
+        isStep_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "unit" field.</summary>
+    public const int UnitFieldNumber = 8;
+    private string unit_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string Unit {
+      get { return unit_; }
+      set {
+        unit_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "nextCursor" field.</summary>
+    public const int NextCursorFieldNumber = 9;
+    private string nextCursor_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string NextCursor {
+      get { return nextCursor_; }
+      set {
+        nextCursor_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "unitExternalId" field.</summary>
+    public const int UnitExternalIdFieldNumber = 10;
+    private string unitExternalId_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string UnitExternalId {
+      get { return unitExternalId_; }
+      set {
+        unitExternalId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "numericDatapoints" field.</summary>
+    public const int NumericDatapointsFieldNumber = 3;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints NumericDatapoints {
+      get { return datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints ? (global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints) datapointType_ : null; }
+      set {
+        datapointType_ = value;
+        datapointTypeCase_ = value == null ? DatapointTypeOneofCase.None : DatapointTypeOneofCase.NumericDatapoints;
+      }
+    }
+
+    /// <summary>Field number for the "stringDatapoints" field.</summary>
+    public const int StringDatapointsFieldNumber = 4;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints StringDatapoints {
+      get { return datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints ? (global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints) datapointType_ : null; }
+      set {
+        datapointType_ = value;
+        datapointTypeCase_ = value == null ? DatapointTypeOneofCase.None : DatapointTypeOneofCase.StringDatapoints;
+      }
+    }
+
+    /// <summary>Field number for the "aggregateDatapoints" field.</summary>
+    public const int AggregateDatapointsFieldNumber = 5;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints AggregateDatapoints {
+      get { return datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints ? (global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints) datapointType_ : null; }
+      set {
+        datapointType_ = value;
+        datapointTypeCase_ = value == null ? DatapointTypeOneofCase.None : DatapointTypeOneofCase.AggregateDatapoints;
+      }
+    }
+
+    private object datapointType_;
+    /// <summary>Enum of possible cases for the "datapointType" oneof.</summary>
+    public enum DatapointTypeOneofCase {
+      None = 0,
+      NumericDatapoints = 3,
+      StringDatapoints = 4,
+      AggregateDatapoints = 5,
+    }
+    private DatapointTypeOneofCase datapointTypeCase_ = DatapointTypeOneofCase.None;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DatapointTypeOneofCase DatapointTypeCase {
+      get { return datapointTypeCase_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void ClearDatapointType() {
+      datapointTypeCase_ = DatapointTypeOneofCase.None;
+      datapointType_ = null;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as DataPointListItem);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(DataPointListItem other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Id != other.Id) return false;
+      if (ExternalId != other.ExternalId) return false;
+      if (IsString != other.IsString) return false;
+      if (IsStep != other.IsStep) return false;
+      if (Unit != other.Unit) return false;
+      if (NextCursor != other.NextCursor) return false;
+      if (UnitExternalId != other.UnitExternalId) return false;
+      if (!object.Equals(NumericDatapoints, other.NumericDatapoints)) return false;
+      if (!object.Equals(StringDatapoints, other.StringDatapoints)) return false;
+      if (!object.Equals(AggregateDatapoints, other.AggregateDatapoints)) return false;
+      if (DatapointTypeCase != other.DatapointTypeCase) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Id != 0L) hash ^= Id.GetHashCode();
+      if (ExternalId.Length != 0) hash ^= ExternalId.GetHashCode();
+      if (IsString != false) hash ^= IsString.GetHashCode();
+      if (IsStep != false) hash ^= IsStep.GetHashCode();
+      if (Unit.Length != 0) hash ^= Unit.GetHashCode();
+      if (NextCursor.Length != 0) hash ^= NextCursor.GetHashCode();
+      if (UnitExternalId.Length != 0) hash ^= UnitExternalId.GetHashCode();
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) hash ^= NumericDatapoints.GetHashCode();
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) hash ^= StringDatapoints.GetHashCode();
+      if (datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints) hash ^= AggregateDatapoints.GetHashCode();
+      hash ^= (int) datapointTypeCase_;
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      if (Id != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Id);
+      }
+      if (ExternalId.Length != 0) {
+        output.WriteRawTag(18);
+        output.WriteString(ExternalId);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+        output.WriteRawTag(26);
+        output.WriteMessage(NumericDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+        output.WriteRawTag(34);
+        output.WriteMessage(StringDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints) {
+        output.WriteRawTag(42);
+        output.WriteMessage(AggregateDatapoints);
+      }
+      if (IsString != false) {
+        output.WriteRawTag(48);
+        output.WriteBool(IsString);
+      }
+      if (IsStep != false) {
+        output.WriteRawTag(56);
+        output.WriteBool(IsStep);
+      }
+      if (Unit.Length != 0) {
+        output.WriteRawTag(66);
+        output.WriteString(Unit);
+      }
+      if (NextCursor.Length != 0) {
+        output.WriteRawTag(74);
+        output.WriteString(NextCursor);
+      }
+      if (UnitExternalId.Length != 0) {
+        output.WriteRawTag(82);
+        output.WriteString(UnitExternalId);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (Id != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Id);
+      }
+      if (ExternalId.Length != 0) {
+        output.WriteRawTag(18);
+        output.WriteString(ExternalId);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+        output.WriteRawTag(26);
+        output.WriteMessage(NumericDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+        output.WriteRawTag(34);
+        output.WriteMessage(StringDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints) {
+        output.WriteRawTag(42);
+        output.WriteMessage(AggregateDatapoints);
+      }
+      if (IsString != false) {
+        output.WriteRawTag(48);
+        output.WriteBool(IsString);
+      }
+      if (IsStep != false) {
+        output.WriteRawTag(56);
+        output.WriteBool(IsStep);
+      }
+      if (Unit.Length != 0) {
+        output.WriteRawTag(66);
+        output.WriteString(Unit);
+      }
+      if (NextCursor.Length != 0) {
+        output.WriteRawTag(74);
+        output.WriteString(NextCursor);
+      }
+      if (UnitExternalId.Length != 0) {
+        output.WriteRawTag(82);
+        output.WriteString(UnitExternalId);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      if (Id != 0L) {
+        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Id);
+      }
+      if (ExternalId.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(ExternalId);
+      }
+      if (IsString != false) {
+        size += 1 + 1;
+      }
+      if (IsStep != false) {
+        size += 1 + 1;
+      }
+      if (Unit.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(Unit);
+      }
+      if (NextCursor.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(NextCursor);
+      }
+      if (UnitExternalId.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(UnitExternalId);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(NumericDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StringDatapoints);
+      }
+      if (datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(AggregateDatapoints);
+      }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(DataPointListItem other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Id != 0L) {
+        Id = other.Id;
+      }
+      if (other.ExternalId.Length != 0) {
+        ExternalId = other.ExternalId;
+      }
+      if (other.IsString != false) {
+        IsString = other.IsString;
+      }
+      if (other.IsStep != false) {
+        IsStep = other.IsStep;
+      }
+      if (other.Unit.Length != 0) {
+        Unit = other.Unit;
+      }
+      if (other.NextCursor.Length != 0) {
+        NextCursor = other.NextCursor;
+      }
+      if (other.UnitExternalId.Length != 0) {
+        UnitExternalId = other.UnitExternalId;
+      }
+      switch (other.DatapointTypeCase) {
+        case DatapointTypeOneofCase.NumericDatapoints:
+          if (NumericDatapoints == null) {
+            NumericDatapoints = new global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints();
+          }
+          NumericDatapoints.MergeFrom(other.NumericDatapoints);
+          break;
+        case DatapointTypeOneofCase.StringDatapoints:
+          if (StringDatapoints == null) {
+            StringDatapoints = new global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints();
+          }
+          StringDatapoints.MergeFrom(other.StringDatapoints);
+          break;
+        case DatapointTypeOneofCase.AggregateDatapoints:
+          if (AggregateDatapoints == null) {
+            AggregateDatapoints = new global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints();
+          }
+          AggregateDatapoints.MergeFrom(other.AggregateDatapoints);
+          break;
+      }
+
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 8: {
+            Id = input.ReadInt64();
+            break;
+          }
+          case 18: {
+            ExternalId = input.ReadString();
+            break;
+          }
+          case 26: {
+            global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+              subBuilder.MergeFrom(NumericDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            NumericDatapoints = subBuilder;
+            break;
+          }
+          case 34: {
+            global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+              subBuilder.MergeFrom(StringDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            StringDatapoints = subBuilder;
+            break;
+          }
+          case 42: {
+            global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints) {
+              subBuilder.MergeFrom(AggregateDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            AggregateDatapoints = subBuilder;
+            break;
+          }
+          case 48: {
+            IsString = input.ReadBool();
+            break;
+          }
+          case 56: {
+            IsStep = input.ReadBool();
+            break;
+          }
+          case 66: {
+            Unit = input.ReadString();
+            break;
+          }
+          case 74: {
+            NextCursor = input.ReadString();
+            break;
+          }
+          case 82: {
+            UnitExternalId = input.ReadString();
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 8: {
+            Id = input.ReadInt64();
+            break;
+          }
+          case 18: {
+            ExternalId = input.ReadString();
+            break;
+          }
+          case 26: {
+            global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.NumericDatapoints) {
+              subBuilder.MergeFrom(NumericDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            NumericDatapoints = subBuilder;
+            break;
+          }
+          case 34: {
+            global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.StringDatapoints) {
+              subBuilder.MergeFrom(StringDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            StringDatapoints = subBuilder;
+            break;
+          }
+          case 42: {
+            global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints subBuilder = new global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints();
+            if (datapointTypeCase_ == DatapointTypeOneofCase.AggregateDatapoints) {
+              subBuilder.MergeFrom(AggregateDatapoints);
+            }
+            input.ReadMessage(subBuilder);
+            AggregateDatapoints = subBuilder;
+            break;
+          }
+          case 48: {
+            IsString = input.ReadBool();
+            break;
+          }
+          case 56: {
+            IsStep = input.ReadBool();
+            break;
+          }
+          case 66: {
+            Unit = input.ReadString();
+            break;
+          }
+          case 74: {
+            NextCursor = input.ReadString();
+            break;
+          }
+          case 82: {
+            UnitExternalId = input.ReadString();
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class DataPointListResponse : pb::IMessage<DataPointListResponse>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<DataPointListResponse> _parser = new pb::MessageParser<DataPointListResponse>(() => new DataPointListResponse());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<DataPointListResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointListResponseReflection.Descriptor.MessageTypes[1]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointListResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointListResponse(DataPointListResponse other) : this() {
+      items_ = other.items_.Clone();
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public DataPointListResponse Clone() {
+      return new DataPointListResponse(this);
+    }
+
+    /// <summary>Field number for the "items" field.</summary>
+    public const int ItemsFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem> _repeated_items_codec
+        = pb::FieldCodec.ForMessage(10, global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem.Parser);
+    private readonly pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem> items_ = new pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.DataPointListItem> Items {
+      get { return items_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as DataPointListResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(DataPointListResponse other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!items_.Equals(other.items_)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= items_.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      items_.WriteTo(output, _repeated_items_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      items_.WriteTo(ref output, _repeated_items_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      size += items_.CalculateSize(_repeated_items_codec);
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(DataPointListResponse other) {
+      if (other == null) {
+        return;
+      }
+      items_.Add(other.items_);
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            items_.AddEntriesFrom(input, _repeated_items_codec);
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 10: {
+            items_.AddEntriesFrom(ref input, _repeated_items_codec);
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/CogniteSdk.Protobuf/DataPoints.cs b/CogniteSdk.Protobuf/DataPoints.cs
new file mode 100644
index 00000000..19b7ddae
--- /dev/null
+++ b/CogniteSdk.Protobuf/DataPoints.cs
@@ -0,0 +1,1607 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: data_points.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Com.Cognite.V1.Timeseries.Proto {
+
+  /// <summary>Holder for reflection information generated from data_points.proto</summary>
+  public static partial class DataPointsReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for data_points.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DataPointsReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChFkYXRhX3BvaW50cy5wcm90bxIfY29tLmNvZ25pdGUudjEudGltZXNlcmll",
+            "cy5wcm90byI0ChBOdW1lcmljRGF0YXBvaW50EhEKCXRpbWVzdGFtcBgBIAEo",
+            "AxINCgV2YWx1ZRgCIAEoASJaChFOdW1lcmljRGF0YXBvaW50cxJFCgpkYXRh",
+            "cG9pbnRzGAEgAygLMjEuY29tLmNvZ25pdGUudjEudGltZXNlcmllcy5wcm90",
+            "by5OdW1lcmljRGF0YXBvaW50IjMKD1N0cmluZ0RhdGFwb2ludBIRCgl0aW1l",
+            "c3RhbXAYASABKAMSDQoFdmFsdWUYAiABKAkiWAoQU3RyaW5nRGF0YXBvaW50",
+            "cxJECgpkYXRhcG9pbnRzGAEgAygLMjAuY29tLmNvZ25pdGUudjEudGltZXNl",
+            "cmllcy5wcm90by5TdHJpbmdEYXRhcG9pbnQi7gEKEkFnZ3JlZ2F0ZURhdGFw",
+            "b2ludBIRCgl0aW1lc3RhbXAYASABKAMSDwoHYXZlcmFnZRgCIAEoARILCgNt",
+            "YXgYAyABKAESCwoDbWluGAQgASgBEg0KBWNvdW50GAUgASgBEgsKA3N1bRgG",
+            "IAEoARIVCg1pbnRlcnBvbGF0aW9uGAcgASgBEhkKEXN0ZXBJbnRlcnBvbGF0",
+            "aW9uGAggASgBEhoKEmNvbnRpbnVvdXNWYXJpYW5jZRgJIAEoARIYChBkaXNj",
+            "cmV0ZVZhcmlhbmNlGAogASgBEhYKDnRvdGFsVmFyaWF0aW9uGAsgASgBIl4K",
+            "E0FnZ3JlZ2F0ZURhdGFwb2ludHMSRwoKZGF0YXBvaW50cxgBIAMoCzIzLmNv",
+            "bS5jb2duaXRlLnYxLnRpbWVzZXJpZXMucHJvdG8uQWdncmVnYXRlRGF0YXBv",
+            "aW50QgJQAWIGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint), global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint.Parser, new[]{ "Timestamp", "Value" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints), global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoints.Parser, new[]{ "Datapoints" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint), global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint.Parser, new[]{ "Timestamp", "Value" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints), global::Com.Cognite.V1.Timeseries.Proto.StringDatapoints.Parser, new[]{ "Datapoints" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint), global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint.Parser, new[]{ "Timestamp", "Average", "Max", "Min", "Count", "Sum", "Interpolation", "StepInterpolation", "ContinuousVariance", "DiscreteVariance", "TotalVariation" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints), global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoints.Parser, new[]{ "Datapoints" }, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class NumericDatapoint : pb::IMessage<NumericDatapoint>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<NumericDatapoint> _parser = new pb::MessageParser<NumericDatapoint>(() => new NumericDatapoint());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<NumericDatapoint> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public NumericDatapoint() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public NumericDatapoint(NumericDatapoint other) : this() {
+      timestamp_ = other.timestamp_;
+      value_ = other.value_;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public NumericDatapoint Clone() {
+      return new NumericDatapoint(this);
+    }
+
+    /// <summary>Field number for the "timestamp" field.</summary>
+    public const int TimestampFieldNumber = 1;
+    private long timestamp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public long Timestamp {
+      get { return timestamp_; }
+      set {
+        timestamp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "value" field.</summary>
+    public const int ValueFieldNumber = 2;
+    private double value_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Value {
+      get { return value_; }
+      set {
+        value_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as NumericDatapoint);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(NumericDatapoint other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Timestamp != other.Timestamp) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Value, other.Value)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Timestamp != 0L) hash ^= Timestamp.GetHashCode();
+      if (Value != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Value);
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      if (Timestamp != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Timestamp);
+      }
+      if (Value != 0D) {
+        output.WriteRawTag(17);
+        output.WriteDouble(Value);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (Timestamp != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Timestamp);
+      }
+      if (Value != 0D) {
+        output.WriteRawTag(17);
+        output.WriteDouble(Value);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      if (Timestamp != 0L) {
+        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Timestamp);
+      }
+      if (Value != 0D) {
+        size += 1 + 8;
+      }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(NumericDatapoint other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Timestamp != 0L) {
+        Timestamp = other.Timestamp;
+      }
+      if (other.Value != 0D) {
+        Value = other.Value;
+      }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 8: {
+            Timestamp = input.ReadInt64();
+            break;
+          }
+          case 17: {
+            Value = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 8: {
+            Timestamp = input.ReadInt64();
+            break;
+          }
+          case 17: {
+            Value = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class NumericDatapoints : pb::IMessage<NumericDatapoints>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<NumericDatapoints> _parser = new pb::MessageParser<NumericDatapoints>(() => new NumericDatapoints());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<NumericDatapoints> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor.MessageTypes[1]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public NumericDatapoints() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public NumericDatapoints(NumericDatapoints other) : this() {
+      datapoints_ = other.datapoints_.Clone();
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public NumericDatapoints Clone() {
+      return new NumericDatapoints(this);
+    }
+
+    /// <summary>Field number for the "datapoints" field.</summary>
+    public const int DatapointsFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint> _repeated_datapoints_codec
+        = pb::FieldCodec.ForMessage(10, global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint.Parser);
+    private readonly pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint> datapoints_ = new pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.NumericDatapoint> Datapoints {
+      get { return datapoints_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as NumericDatapoints);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(NumericDatapoints other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!datapoints_.Equals(other.datapoints_)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= datapoints_.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      datapoints_.WriteTo(output, _repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      datapoints_.WriteTo(ref output, _repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      size += datapoints_.CalculateSize(_repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(NumericDatapoints other) {
+      if (other == null) {
+        return;
+      }
+      datapoints_.Add(other.datapoints_);
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            datapoints_.AddEntriesFrom(input, _repeated_datapoints_codec);
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 10: {
+            datapoints_.AddEntriesFrom(ref input, _repeated_datapoints_codec);
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class StringDatapoint : pb::IMessage<StringDatapoint>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<StringDatapoint> _parser = new pb::MessageParser<StringDatapoint>(() => new StringDatapoint());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<StringDatapoint> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor.MessageTypes[2]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public StringDatapoint() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public StringDatapoint(StringDatapoint other) : this() {
+      timestamp_ = other.timestamp_;
+      value_ = other.value_;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public StringDatapoint Clone() {
+      return new StringDatapoint(this);
+    }
+
+    /// <summary>Field number for the "timestamp" field.</summary>
+    public const int TimestampFieldNumber = 1;
+    private long timestamp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public long Timestamp {
+      get { return timestamp_; }
+      set {
+        timestamp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "value" field.</summary>
+    public const int ValueFieldNumber = 2;
+    private string value_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public string Value {
+      get { return value_; }
+      set {
+        value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as StringDatapoint);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(StringDatapoint other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Timestamp != other.Timestamp) return false;
+      if (Value != other.Value) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Timestamp != 0L) hash ^= Timestamp.GetHashCode();
+      if (Value.Length != 0) hash ^= Value.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      if (Timestamp != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Timestamp);
+      }
+      if (Value.Length != 0) {
+        output.WriteRawTag(18);
+        output.WriteString(Value);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (Timestamp != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Timestamp);
+      }
+      if (Value.Length != 0) {
+        output.WriteRawTag(18);
+        output.WriteString(Value);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      if (Timestamp != 0L) {
+        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Timestamp);
+      }
+      if (Value.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(Value);
+      }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(StringDatapoint other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Timestamp != 0L) {
+        Timestamp = other.Timestamp;
+      }
+      if (other.Value.Length != 0) {
+        Value = other.Value;
+      }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 8: {
+            Timestamp = input.ReadInt64();
+            break;
+          }
+          case 18: {
+            Value = input.ReadString();
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 8: {
+            Timestamp = input.ReadInt64();
+            break;
+          }
+          case 18: {
+            Value = input.ReadString();
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class StringDatapoints : pb::IMessage<StringDatapoints>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<StringDatapoints> _parser = new pb::MessageParser<StringDatapoints>(() => new StringDatapoints());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<StringDatapoints> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor.MessageTypes[3]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public StringDatapoints() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public StringDatapoints(StringDatapoints other) : this() {
+      datapoints_ = other.datapoints_.Clone();
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public StringDatapoints Clone() {
+      return new StringDatapoints(this);
+    }
+
+    /// <summary>Field number for the "datapoints" field.</summary>
+    public const int DatapointsFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint> _repeated_datapoints_codec
+        = pb::FieldCodec.ForMessage(10, global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint.Parser);
+    private readonly pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint> datapoints_ = new pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.StringDatapoint> Datapoints {
+      get { return datapoints_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as StringDatapoints);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(StringDatapoints other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!datapoints_.Equals(other.datapoints_)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= datapoints_.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      datapoints_.WriteTo(output, _repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      datapoints_.WriteTo(ref output, _repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      size += datapoints_.CalculateSize(_repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(StringDatapoints other) {
+      if (other == null) {
+        return;
+      }
+      datapoints_.Add(other.datapoints_);
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            datapoints_.AddEntriesFrom(input, _repeated_datapoints_codec);
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 10: {
+            datapoints_.AddEntriesFrom(ref input, _repeated_datapoints_codec);
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class AggregateDatapoint : pb::IMessage<AggregateDatapoint>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<AggregateDatapoint> _parser = new pb::MessageParser<AggregateDatapoint>(() => new AggregateDatapoint());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<AggregateDatapoint> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor.MessageTypes[4]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public AggregateDatapoint() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public AggregateDatapoint(AggregateDatapoint other) : this() {
+      timestamp_ = other.timestamp_;
+      average_ = other.average_;
+      max_ = other.max_;
+      min_ = other.min_;
+      count_ = other.count_;
+      sum_ = other.sum_;
+      interpolation_ = other.interpolation_;
+      stepInterpolation_ = other.stepInterpolation_;
+      continuousVariance_ = other.continuousVariance_;
+      discreteVariance_ = other.discreteVariance_;
+      totalVariation_ = other.totalVariation_;
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public AggregateDatapoint Clone() {
+      return new AggregateDatapoint(this);
+    }
+
+    /// <summary>Field number for the "timestamp" field.</summary>
+    public const int TimestampFieldNumber = 1;
+    private long timestamp_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public long Timestamp {
+      get { return timestamp_; }
+      set {
+        timestamp_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "average" field.</summary>
+    public const int AverageFieldNumber = 2;
+    private double average_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Average {
+      get { return average_; }
+      set {
+        average_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "max" field.</summary>
+    public const int MaxFieldNumber = 3;
+    private double max_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Max {
+      get { return max_; }
+      set {
+        max_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "min" field.</summary>
+    public const int MinFieldNumber = 4;
+    private double min_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Min {
+      get { return min_; }
+      set {
+        min_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "count" field.</summary>
+    public const int CountFieldNumber = 5;
+    private double count_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Count {
+      get { return count_; }
+      set {
+        count_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "sum" field.</summary>
+    public const int SumFieldNumber = 6;
+    private double sum_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Sum {
+      get { return sum_; }
+      set {
+        sum_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "interpolation" field.</summary>
+    public const int InterpolationFieldNumber = 7;
+    private double interpolation_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double Interpolation {
+      get { return interpolation_; }
+      set {
+        interpolation_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "stepInterpolation" field.</summary>
+    public const int StepInterpolationFieldNumber = 8;
+    private double stepInterpolation_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double StepInterpolation {
+      get { return stepInterpolation_; }
+      set {
+        stepInterpolation_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "continuousVariance" field.</summary>
+    public const int ContinuousVarianceFieldNumber = 9;
+    private double continuousVariance_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double ContinuousVariance {
+      get { return continuousVariance_; }
+      set {
+        continuousVariance_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "discreteVariance" field.</summary>
+    public const int DiscreteVarianceFieldNumber = 10;
+    private double discreteVariance_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double DiscreteVariance {
+      get { return discreteVariance_; }
+      set {
+        discreteVariance_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "totalVariation" field.</summary>
+    public const int TotalVariationFieldNumber = 11;
+    private double totalVariation_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public double TotalVariation {
+      get { return totalVariation_; }
+      set {
+        totalVariation_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as AggregateDatapoint);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(AggregateDatapoint other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Timestamp != other.Timestamp) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Average, other.Average)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Max, other.Max)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Min, other.Min)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Count, other.Count)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Sum, other.Sum)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Interpolation, other.Interpolation)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(StepInterpolation, other.StepInterpolation)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(ContinuousVariance, other.ContinuousVariance)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DiscreteVariance, other.DiscreteVariance)) return false;
+      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(TotalVariation, other.TotalVariation)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Timestamp != 0L) hash ^= Timestamp.GetHashCode();
+      if (Average != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Average);
+      if (Max != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Max);
+      if (Min != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Min);
+      if (Count != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Count);
+      if (Sum != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Sum);
+      if (Interpolation != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Interpolation);
+      if (StepInterpolation != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(StepInterpolation);
+      if (ContinuousVariance != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(ContinuousVariance);
+      if (DiscreteVariance != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DiscreteVariance);
+      if (TotalVariation != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(TotalVariation);
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      if (Timestamp != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Timestamp);
+      }
+      if (Average != 0D) {
+        output.WriteRawTag(17);
+        output.WriteDouble(Average);
+      }
+      if (Max != 0D) {
+        output.WriteRawTag(25);
+        output.WriteDouble(Max);
+      }
+      if (Min != 0D) {
+        output.WriteRawTag(33);
+        output.WriteDouble(Min);
+      }
+      if (Count != 0D) {
+        output.WriteRawTag(41);
+        output.WriteDouble(Count);
+      }
+      if (Sum != 0D) {
+        output.WriteRawTag(49);
+        output.WriteDouble(Sum);
+      }
+      if (Interpolation != 0D) {
+        output.WriteRawTag(57);
+        output.WriteDouble(Interpolation);
+      }
+      if (StepInterpolation != 0D) {
+        output.WriteRawTag(65);
+        output.WriteDouble(StepInterpolation);
+      }
+      if (ContinuousVariance != 0D) {
+        output.WriteRawTag(73);
+        output.WriteDouble(ContinuousVariance);
+      }
+      if (DiscreteVariance != 0D) {
+        output.WriteRawTag(81);
+        output.WriteDouble(DiscreteVariance);
+      }
+      if (TotalVariation != 0D) {
+        output.WriteRawTag(89);
+        output.WriteDouble(TotalVariation);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      if (Timestamp != 0L) {
+        output.WriteRawTag(8);
+        output.WriteInt64(Timestamp);
+      }
+      if (Average != 0D) {
+        output.WriteRawTag(17);
+        output.WriteDouble(Average);
+      }
+      if (Max != 0D) {
+        output.WriteRawTag(25);
+        output.WriteDouble(Max);
+      }
+      if (Min != 0D) {
+        output.WriteRawTag(33);
+        output.WriteDouble(Min);
+      }
+      if (Count != 0D) {
+        output.WriteRawTag(41);
+        output.WriteDouble(Count);
+      }
+      if (Sum != 0D) {
+        output.WriteRawTag(49);
+        output.WriteDouble(Sum);
+      }
+      if (Interpolation != 0D) {
+        output.WriteRawTag(57);
+        output.WriteDouble(Interpolation);
+      }
+      if (StepInterpolation != 0D) {
+        output.WriteRawTag(65);
+        output.WriteDouble(StepInterpolation);
+      }
+      if (ContinuousVariance != 0D) {
+        output.WriteRawTag(73);
+        output.WriteDouble(ContinuousVariance);
+      }
+      if (DiscreteVariance != 0D) {
+        output.WriteRawTag(81);
+        output.WriteDouble(DiscreteVariance);
+      }
+      if (TotalVariation != 0D) {
+        output.WriteRawTag(89);
+        output.WriteDouble(TotalVariation);
+      }
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      if (Timestamp != 0L) {
+        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Timestamp);
+      }
+      if (Average != 0D) {
+        size += 1 + 8;
+      }
+      if (Max != 0D) {
+        size += 1 + 8;
+      }
+      if (Min != 0D) {
+        size += 1 + 8;
+      }
+      if (Count != 0D) {
+        size += 1 + 8;
+      }
+      if (Sum != 0D) {
+        size += 1 + 8;
+      }
+      if (Interpolation != 0D) {
+        size += 1 + 8;
+      }
+      if (StepInterpolation != 0D) {
+        size += 1 + 8;
+      }
+      if (ContinuousVariance != 0D) {
+        size += 1 + 8;
+      }
+      if (DiscreteVariance != 0D) {
+        size += 1 + 8;
+      }
+      if (TotalVariation != 0D) {
+        size += 1 + 8;
+      }
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(AggregateDatapoint other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Timestamp != 0L) {
+        Timestamp = other.Timestamp;
+      }
+      if (other.Average != 0D) {
+        Average = other.Average;
+      }
+      if (other.Max != 0D) {
+        Max = other.Max;
+      }
+      if (other.Min != 0D) {
+        Min = other.Min;
+      }
+      if (other.Count != 0D) {
+        Count = other.Count;
+      }
+      if (other.Sum != 0D) {
+        Sum = other.Sum;
+      }
+      if (other.Interpolation != 0D) {
+        Interpolation = other.Interpolation;
+      }
+      if (other.StepInterpolation != 0D) {
+        StepInterpolation = other.StepInterpolation;
+      }
+      if (other.ContinuousVariance != 0D) {
+        ContinuousVariance = other.ContinuousVariance;
+      }
+      if (other.DiscreteVariance != 0D) {
+        DiscreteVariance = other.DiscreteVariance;
+      }
+      if (other.TotalVariation != 0D) {
+        TotalVariation = other.TotalVariation;
+      }
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 8: {
+            Timestamp = input.ReadInt64();
+            break;
+          }
+          case 17: {
+            Average = input.ReadDouble();
+            break;
+          }
+          case 25: {
+            Max = input.ReadDouble();
+            break;
+          }
+          case 33: {
+            Min = input.ReadDouble();
+            break;
+          }
+          case 41: {
+            Count = input.ReadDouble();
+            break;
+          }
+          case 49: {
+            Sum = input.ReadDouble();
+            break;
+          }
+          case 57: {
+            Interpolation = input.ReadDouble();
+            break;
+          }
+          case 65: {
+            StepInterpolation = input.ReadDouble();
+            break;
+          }
+          case 73: {
+            ContinuousVariance = input.ReadDouble();
+            break;
+          }
+          case 81: {
+            DiscreteVariance = input.ReadDouble();
+            break;
+          }
+          case 89: {
+            TotalVariation = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 8: {
+            Timestamp = input.ReadInt64();
+            break;
+          }
+          case 17: {
+            Average = input.ReadDouble();
+            break;
+          }
+          case 25: {
+            Max = input.ReadDouble();
+            break;
+          }
+          case 33: {
+            Min = input.ReadDouble();
+            break;
+          }
+          case 41: {
+            Count = input.ReadDouble();
+            break;
+          }
+          case 49: {
+            Sum = input.ReadDouble();
+            break;
+          }
+          case 57: {
+            Interpolation = input.ReadDouble();
+            break;
+          }
+          case 65: {
+            StepInterpolation = input.ReadDouble();
+            break;
+          }
+          case 73: {
+            ContinuousVariance = input.ReadDouble();
+            break;
+          }
+          case 81: {
+            DiscreteVariance = input.ReadDouble();
+            break;
+          }
+          case 89: {
+            TotalVariation = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  public sealed partial class AggregateDatapoints : pb::IMessage<AggregateDatapoints>
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      , pb::IBufferMessage
+  #endif
+  {
+    private static readonly pb::MessageParser<AggregateDatapoints> _parser = new pb::MessageParser<AggregateDatapoints>(() => new AggregateDatapoints());
+    private pb::UnknownFieldSet _unknownFields;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pb::MessageParser<AggregateDatapoints> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Com.Cognite.V1.Timeseries.Proto.DataPointsReflection.Descriptor.MessageTypes[5]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public AggregateDatapoints() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public AggregateDatapoints(AggregateDatapoints other) : this() {
+      datapoints_ = other.datapoints_.Clone();
+      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public AggregateDatapoints Clone() {
+      return new AggregateDatapoints(this);
+    }
+
+    /// <summary>Field number for the "datapoints" field.</summary>
+    public const int DatapointsFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint> _repeated_datapoints_codec
+        = pb::FieldCodec.ForMessage(10, global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint.Parser);
+    private readonly pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint> datapoints_ = new pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public pbc::RepeatedField<global::Com.Cognite.V1.Timeseries.Proto.AggregateDatapoint> Datapoints {
+      get { return datapoints_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override bool Equals(object other) {
+      return Equals(other as AggregateDatapoints);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public bool Equals(AggregateDatapoints other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!datapoints_.Equals(other.datapoints_)) return false;
+      return Equals(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= datapoints_.GetHashCode();
+      if (_unknownFields != null) {
+        hash ^= _unknownFields.GetHashCode();
+      }
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void WriteTo(pb::CodedOutputStream output) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      output.WriteRawMessage(this);
+    #else
+      datapoints_.WriteTo(output, _repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(output);
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+      datapoints_.WriteTo(ref output, _repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        _unknownFields.WriteTo(ref output);
+      }
+    }
+    #endif
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public int CalculateSize() {
+      int size = 0;
+      size += datapoints_.CalculateSize(_repeated_datapoints_codec);
+      if (_unknownFields != null) {
+        size += _unknownFields.CalculateSize();
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(AggregateDatapoints other) {
+      if (other == null) {
+        return;
+      }
+      datapoints_.Add(other.datapoints_);
+      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    public void MergeFrom(pb::CodedInputStream input) {
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+      input.ReadRawMessage(this);
+    #else
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+            break;
+          case 10: {
+            datapoints_.AddEntriesFrom(input, _repeated_datapoints_codec);
+            break;
+          }
+        }
+      }
+    #endif
+    }
+
+    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+            break;
+          case 10: {
+            datapoints_.AddEntriesFrom(ref input, _repeated_datapoints_codec);
+            break;
+          }
+        }
+      }
+    }
+    #endif
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/CogniteSdk.Protobuf/paket.references b/CogniteSdk.Protobuf/paket.references
new file mode 100644
index 00000000..60a5aa0c
--- /dev/null
+++ b/CogniteSdk.Protobuf/paket.references
@@ -0,0 +1,3 @@
+group Protobuf
+
+Google.Protobuf
\ No newline at end of file
diff --git a/CogniteSdk.Types/Units/UnitItem.cs b/CogniteSdk.Types/Units/UnitItem.cs
index 5f6fbd10..304cc0a5 100644
--- a/CogniteSdk.Types/Units/UnitItem.cs
+++ b/CogniteSdk.Types/Units/UnitItem.cs
@@ -15,16 +15,16 @@ public class ConversionFactor
         /// The multiplier to convert from the unit to the base unit.
         /// </summary>
         public double Multiplier { get; set; }
-        
+
         /// <summary>
         /// The offset to convert from the unit to the base unit.
         /// </summary>
         public double Offset { get; set; }
-        
+
         /// <inheritdoc />
         public override string ToString() => Stringable.ToString(this);
     }
-    
+
     /// <summary>
     /// UnitItem read class.
     /// </summary>
@@ -34,49 +34,49 @@ public class UnitItem
         /// Unique identifier of the unit.
         /// </summary>
         public string ExternalId { get; set; }
-        
+
         /// <summary>
         /// Name of the unit, e.g. `DEG_C` for Celsius.
         /// </summary>
         public string Name { get; set; }
-        
+
         /// <summary>
         /// More descriptive name of the unit, e.g., `degrees Celsius`.
         /// </summary>
         public string LongName { get; set; }
-        
+
         /// <summary>
         /// The symbol of the unit, e.g., `°C`.
         /// </summary>
         public string Symbol { get; set; }
-        
+
         /// <summary>
         /// List of alias names for the unit, e.g., `Degree C`, `degC`, `°C`, and so on.
         /// </summary>
         public IEnumerable<string> AliasNames { get; set; }
-        
+
         /// <summary>
         /// The quantity of the unit, e.g., `Temperature`.
         /// </summary>
         public string Quantity { get; set; }
-        
+
         /// <summary>
         /// The conversion between the unit and its base unit. For example, the base unit
         /// for Temperature is Kelvin, and the conversion from Celsius to Kelvin is
         /// multiplier = 1, offset = 273.15.
         /// </summary>
         public ConversionFactor Conversion { get; set; }
-        
+
         /// <summary>
         /// The source of the unit, e.g., `qudt.org`.
         /// </summary>
-        public string? Source { get; set; }
-        
+        public string Source { get; set; }
+
         /// <summary>
         /// The reference to the source of the unit, e.g., `http://qudt.org/vocab/unit/DEG_C`.
         /// </summary>
-        public string? SourceReference { get; set; }
-        
+        public string SourceReference { get; set; }
+
         /// <inheritdoc />
         public override string ToString() => Stringable.ToString(this);
     }
diff --git a/CogniteSdk/test/csharp/Annotations.cs b/CogniteSdk/test/csharp/Annotations.cs
index c94ae3e2..707aa34b 100644
--- a/CogniteSdk/test/csharp/Annotations.cs
+++ b/CogniteSdk/test/csharp/Annotations.cs
@@ -163,7 +163,7 @@ await WriteClient.Annotations.CreateAsync(new List<AnnotationCreate> { createAnn
                 }
             };
             var updatedAnnotation = (await WriteClient.Annotations.UpdateAsync(updateAnnotationQuery)
-                .ConfigureAwait(false)).FirstOrDefault();
+).FirstOrDefault();
             Assert.True(updatedAnnotation.Id == annotation.Id, "The updated annotation id doesn't match with the created one.");
             Assert.True(updatedAnnotation.Status == "rejected", "The status of the annotation is not updated.");
             Assert.True(updatedAnnotation.Data.Region.First().Cylinder is null, "The data of the annotation is not updated.");
diff --git a/CogniteSdk/test/csharp/Assets.cs b/CogniteSdk/test/csharp/Assets.cs
index 0396bbf9..b4f7933b 100644
--- a/CogniteSdk/test/csharp/Assets.cs
+++ b/CogniteSdk/test/csharp/Assets.cs
@@ -309,7 +309,7 @@ public async Task UpdatedAssetsLabelPerformsExpectedChangesAsync()
             };
 
             // Act
-            _ = await WriteClient.Assets.CreateAsync(new List<AssetCreate>() { initialAsset }).ConfigureAwait(false);
+            _ = await WriteClient.Assets.CreateAsync(new List<AssetCreate>() { initialAsset });
             await WriteClient.Assets.UpdateAsync(update);
 
             var getRes = await WriteClient.Assets.RetrieveAsync(new List<string>() { externalIdString });
diff --git a/CogniteSdk/test/fsharp/Files.fs b/CogniteSdk/test/fsharp/Files.fs
index 913f91a9..37b31a02 100644
--- a/CogniteSdk/test/fsharp/Files.fs
+++ b/CogniteSdk/test/fsharp/Files.fs
@@ -2,6 +2,7 @@ module Tests.Integration.Files
 
 open System
 open System.Collections.Generic
+open System.Threading.Tasks
 
 open Xunit
 open Swensen.Unquote
@@ -49,7 +50,7 @@ let ``Get file by missing id is Error`` () = task {
     let fileId = 0L
 
     // Act
-    Assert.ThrowsAsync<ResponseException>(fun () -> readClient.Files.GetAsync fileId :> _)
+    Assert.ThrowsAsync<ResponseException>(Func<Task>(fun () -> readClient.Files.GetAsync fileId :> _))
     |> ignore
 }
 [<Trait("resource", "files")>]
diff --git a/CogniteSdk/test/fsharp/TimeSeries.fs b/CogniteSdk/test/fsharp/TimeSeries.fs
index af7d6b2c..130cdb1f 100644
--- a/CogniteSdk/test/fsharp/TimeSeries.fs
+++ b/CogniteSdk/test/fsharp/TimeSeries.fs
@@ -2,6 +2,7 @@ module Tests.Integration.Timeseries
 
 open System
 open System.Collections.Generic
+open System.Threading.Tasks
 
 open FSharp.Control.TaskBuilder
 open Swensen.Unquote
@@ -55,7 +56,7 @@ let ``Get timeseries by missing id is Error`` () = task {
     let id = 0L
 
     // Act
-    Assert.ThrowsAsync<ArgumentException>(fun () -> readClient.TimeSeries.GetAsync id :> _)
+    Assert.ThrowsAsync<ArgumentException>(Func<Task>(fun () -> readClient.TimeSeries.GetAsync id :> _))
     |> ignore
 }
 
@@ -86,7 +87,7 @@ let ``Get timeseries by missing ids is Error`` () = task {
     let id = Identity 0L
 
     // Act
-    Assert.ThrowsAsync<ArgumentException>(fun () -> readClient.TimeSeries.RetrieveAsync [ id ] :> _)
+    Assert.ThrowsAsync<ArgumentException>(Func<Task>(fun () -> readClient.TimeSeries.RetrieveAsync [ id ] :> _))
     |> ignore
 }
 
diff --git a/Oryx.Cognite/src/Oryx.Cognite.fsproj b/Oryx.Cognite/src/Oryx.Cognite.fsproj
index ff06c506..5078762b 100644
--- a/Oryx.Cognite/src/Oryx.Cognite.fsproj
+++ b/Oryx.Cognite/src/Oryx.Cognite.fsproj
@@ -44,6 +44,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../CogniteSdk.Types/CogniteSdk.Types.csproj" />
+    <ProjectReference Include="../../CogniteSdk.Protobuf/CogniteSdk.Protobuf.csproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
\ No newline at end of file
diff --git a/Oryx.Cognite/src/paket.references b/Oryx.Cognite/src/paket.references
index 3d6afc9a..078b5abf 100644
--- a/Oryx.Cognite/src/paket.references
+++ b/Oryx.Cognite/src/paket.references
@@ -4,4 +4,3 @@ group Oryx.Cognite
     Oryx
     Oryx.SystemTextJson
     Oryx.Protobuf
-    CogniteSdk.Protobuf
diff --git a/cognite-sdk-dotnet.sln b/cognite-sdk-dotnet.sln
index 4c8ff155..e8eae2f5 100644
--- a/cognite-sdk-dotnet.sln
+++ b/cognite-sdk-dotnet.sln
@@ -21,6 +21,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CogniteSdk.FSharp", "Cognit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CogniteSdk.Test.CSharp", "CogniteSdk\test\csharp\CogniteSdk.Test.csproj", "{B42088FD-0284-46D8-8C34-EE348DC02850}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CogniteSdk.Protobuf", "CogniteSdk.Protobuf\CogniteSdk.Protobuf.csproj", "{70C1CDD1-42CB-4823-83B2-F08A4E930096}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,6 +117,18 @@ Global
 		{B42088FD-0284-46D8-8C34-EE348DC02850}.Release|x64.Build.0 = Release|Any CPU
 		{B42088FD-0284-46D8-8C34-EE348DC02850}.Release|x86.ActiveCfg = Release|Any CPU
 		{B42088FD-0284-46D8-8C34-EE348DC02850}.Release|x86.Build.0 = Release|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Debug|x64.Build.0 = Debug|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Debug|x86.Build.0 = Debug|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Release|x64.ActiveCfg = Release|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Release|x64.Build.0 = Release|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Release|x86.ActiveCfg = Release|Any CPU
+		{70C1CDD1-42CB-4823-83B2-F08A4E930096}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/paket.dependencies b/paket.dependencies
index fa0c91a5..c30da4d1 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -16,7 +16,6 @@ group Oryx.Cognite
 
     nuget FSharp.Core >= 7 lowest_matching: true
     nuget System.Text.Json >= 6 lowest_matching: true
-    nuget CogniteSdk.Protobuf
     nuget Oryx ~> 5
     nuget Oryx.Protobuf ~> 5
     nuget Oryx.SystemTextJson ~> 5
@@ -31,6 +30,12 @@ group CogniteSdk.FSharp
     nuget Oryx ~> 5
     nuget FsToolkit.ErrorHandling ~> 4
 
+group Protobuf
+    source https://www.nuget.org/api/v2
+    framework: netstandard2.0
+
+    nuget Google.Protobuf ~> 3
+
 group Types
     source https://www.nuget.org/api/v2
     framework: netstandard2.0
diff --git a/paket.lock b/paket.lock
index 0e203171..6c2f58fb 100644
--- a/paket.lock
+++ b/paket.lock
@@ -6,7 +6,7 @@ RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
     FSharp.Core (7.0)
-    FsToolkit.ErrorHandling (4.7)
+    FsToolkit.ErrorHandling (4.10)
       FSharp.Core (>= 4.7.2)
     Microsoft.Bcl.AsyncInterfaces (7.0)
       System.Threading.Tasks.Extensions (>= 4.5.4)
@@ -60,12 +60,10 @@ STORAGE: NONE
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
-    CogniteSdk.Protobuf (1.0.4)
-      Google.Protobuf (>= 3.19.4)
     FSharp.Core (7.0)
-    FsToolkit.ErrorHandling (4.7)
+    FsToolkit.ErrorHandling (4.10)
       FSharp.Core (>= 4.7.2)
-    Google.Protobuf (3.23.3)
+    Google.Protobuf (3.24.4)
       System.Memory (>= 4.5.3)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
     Microsoft.Bcl.AsyncInterfaces (7.0)
@@ -142,11 +140,11 @@ NUGET
       FSharp.Core (>= 4.2.3)
       Microsoft.Extensions.Configuration
       TypeShape (>= 8.0)
-    FSharp.Core (7.0.300)
-    FsToolkit.ErrorHandling (4.7) - restriction: >= netstandard2.0
+    FSharp.Core (7.0.401)
+    FsToolkit.ErrorHandling (4.10) - restriction: >= netstandard2.0
       FSharp.Core (>= 4.7.2) - restriction: && (>= netstandard2.0) (< netstandard2.1)
-      FSharp.Core (>= 7.0) - restriction: >= netstandard2.1
-    Google.Protobuf (3.23.3) - restriction: >= netstandard2.0
+      FSharp.Core (>= 7.0.300) - restriction: >= netstandard2.1
+    Google.Protobuf (3.24.4) - restriction: >= netstandard2.0
       System.Memory (>= 4.5.3) - restriction: || (>= net45) (&& (< net5.0) (>= netstandard2.0)) (&& (>= netstandard1.1) (< netstandard2.0))
       System.Runtime.CompilerServices.Unsafe (>= 4.5.2) - restriction: && (< net45) (< net5.0) (>= netstandard2.0)
     Microsoft.AspNetCore.Hosting (2.2.7)
@@ -322,7 +320,7 @@ NUGET
       System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0))
       System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netstandard2.0))
       System.Text.Json (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
-    Microsoft.Extensions.ObjectPool (7.0.8) - restriction: >= netstandard2.0
+    Microsoft.Extensions.ObjectPool (7.0.13) - restriction: >= netstandard2.0
     Microsoft.Extensions.Options (7.0.1) - restriction: || (>= net462) (>= netstandard2.0)
       Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
       Microsoft.Extensions.Primitives (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
@@ -339,7 +337,7 @@ NUGET
     Microsoft.Net.Http.Headers (2.2.8) - restriction: >= netstandard2.0
       Microsoft.Extensions.Primitives (>= 2.2) - restriction: >= netstandard2.0
       System.Buffers (>= 4.5) - restriction: >= netstandard2.0
-    Microsoft.NETCore.Platforms (7.0.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net462) (>= net6.0)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (< netstandard1.0) (>= netstandard1.3) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard1.3) (>= win8)) (&& (< netstandard1.0) (>= netstandard1.3) (< win8)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (>= wp8)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1)
+    Microsoft.NETCore.Platforms (7.0.4) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net461) (< netstandard2.0)) (&& (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net462) (>= net6.0)) (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (< netstandard1.0) (>= netstandard1.3) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard1.3) (>= win8)) (&& (< netstandard1.0) (>= netstandard1.3) (< win8)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.3) (>= wp8)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1)
     Microsoft.NETCore.Targets (5.0) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81))
     Microsoft.Win32.Primitives (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -867,12 +865,27 @@ NUGET
       FSharp.Core (>= 4.5.4) - restriction: >= netstandard2.0
       System.Reflection.Emit.Lightweight (>= 4.7) - restriction: && (< netcoreapp3.1) (>= netstandard2.0)
 
+GROUP Protobuf
+RESTRICTION: == netstandard2.0
+NUGET
+  remote: https://www.nuget.org/api/v2
+    Google.Protobuf (3.24.4)
+      System.Memory (>= 4.5.3)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
+    System.Buffers (4.5.1)
+    System.Memory (4.5.5)
+      System.Buffers (>= 4.5.1)
+      System.Numerics.Vectors (>= 4.4)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
+    System.Numerics.Vectors (4.5)
+    System.Runtime.CompilerServices.Unsafe (6.0)
+
 GROUP Sdk
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
     FSharp.Core (7.0)
-    FsToolkit.ErrorHandling (4.7)
+    FsToolkit.ErrorHandling (4.10)
       FSharp.Core (>= 4.7.2)
     Microsoft.Bcl.AsyncInterfaces (7.0)
       System.Threading.Tasks.Extensions (>= 4.5.4)
@@ -927,12 +940,12 @@ NUGET
     FsToolkit.ErrorHandling (4.7)
       FSharp.Core (>= 4.7.2) - restriction: && (>= netstandard2.0) (< netstandard2.1)
       FSharp.Core (>= 7.0) - restriction: >= netstandard2.1
-    Google.Protobuf (3.23.3) - restriction: >= netstandard2.0
+    Google.Protobuf (3.24.4) - restriction: >= netstandard2.0
       System.Memory (>= 4.5.3) - restriction: || (>= net45) (&& (< net5.0) (>= netstandard2.0)) (&& (>= netstandard1.1) (< netstandard2.0))
       System.Runtime.CompilerServices.Unsafe (>= 4.5.2) - restriction: && (< net45) (< net5.0) (>= netstandard2.0)
     Microsoft.Bcl.AsyncInterfaces (7.0) - restriction: || (&& (>= net462) (>= netstandard2.0)) (&& (< net6.0) (>= netstandard2.0)) (&& (>= netstandard2.0) (< netstandard2.1))
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
-    Microsoft.CodeCoverage (17.6.2) - restriction: || (>= net462) (>= netcoreapp3.1)
+    Microsoft.CodeCoverage (17.7.2) - restriction: || (>= net462) (>= netcoreapp3.1)
     Microsoft.Extensions.DependencyInjection (7.0) - restriction: >= netstandard2.0
       Microsoft.Bcl.AsyncInterfaces (>= 7.0) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
       Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
@@ -958,16 +971,16 @@ NUGET
     Microsoft.Extensions.Primitives (7.0) - restriction: >= netstandard2.0
       System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0))
       System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netstandard2.0))
-    Microsoft.NET.Test.Sdk (17.6.2)
-      Microsoft.CodeCoverage (>= 17.6.2) - restriction: || (>= net462) (>= netcoreapp3.1)
-      Microsoft.TestPlatform.TestHost (>= 17.6.2) - restriction: >= netcoreapp3.1
-    Microsoft.NETCore.Platforms (7.0.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< uap10.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net46) (>= netstandard1.5)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netcoreapp1.0) (>= netstandard2.0) (< uap10.0)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= net46) (>= netcoreapp1.0)) (&& (>= net461) (>= netcoreapp1.0)) (&& (< net5.0) (>= netcoreapp1.0) (>= netstandard2.0)) (&& (< net5.0) (>= netcoreapp2.0)) (&& (>= netcoreapp1.0) (< netstandard1.0)) (&& (>= netcoreapp1.0) (< netstandard1.2)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.0) (>= uap10.1)) (&& (>= netcoreapp1.0) (>= wp8)) (&& (< netcoreapp1.0) (>= netcoreapp2.0)) (&& (< netstandard1.0) (>= netstandard1.5) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard1.5) (>= win8)) (&& (< netstandard1.0) (>= netstandard1.5) (< win8)) (&& (< netstandard1.3) (>= netstandard1.5) (< win8) (>= wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< uap10.0) (>= uap10.1)) (&& (>= netstandard1.5) (>= wp8))
+    Microsoft.NET.Test.Sdk (17.7.2)
+      Microsoft.CodeCoverage (>= 17.7.2) - restriction: || (>= net462) (>= netcoreapp3.1)
+      Microsoft.TestPlatform.TestHost (>= 17.7.2) - restriction: >= netcoreapp3.1
+    Microsoft.NETCore.Platforms (7.0.4) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< uap10.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net46) (>= netstandard1.5)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netcoreapp1.0) (>= netstandard2.0) (< uap10.0)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= net46) (>= netcoreapp1.0)) (&& (>= net461) (>= netcoreapp1.0)) (&& (< net5.0) (>= netcoreapp1.0) (>= netstandard2.0)) (&& (< net5.0) (>= netcoreapp2.0)) (&& (>= netcoreapp1.0) (< netstandard1.0)) (&& (>= netcoreapp1.0) (< netstandard1.2)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netcoreapp1.0) (>= uap10.1)) (&& (>= netcoreapp1.0) (>= wp8)) (&& (< netcoreapp1.0) (>= netcoreapp2.0)) (&& (< netstandard1.0) (>= netstandard1.5) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard1.5) (>= win8)) (&& (< netstandard1.0) (>= netstandard1.5) (< win8)) (&& (< netstandard1.3) (>= netstandard1.5) (< win8) (>= wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< uap10.0) (>= uap10.1)) (&& (>= netstandard1.5) (>= wp8))
     Microsoft.NETCore.Targets (5.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< uap10.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net46) (>= netstandard1.5)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= net46) (>= netcoreapp1.0)) (&& (>= netcoreapp1.0) (< netstandard1.2)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81))
-    Microsoft.TestPlatform.ObjectModel (17.6.2) - restriction: >= netcoreapp3.1
+    Microsoft.TestPlatform.ObjectModel (17.7.2) - restriction: || (>= net462) (>= netcoreapp3.1)
       NuGet.Frameworks (>= 6.5) - restriction: || (>= net462) (>= netstandard2.0)
       System.Reflection.Metadata (>= 1.6) - restriction: || (>= net462) (>= netstandard2.0)
-    Microsoft.TestPlatform.TestHost (17.6.2) - restriction: >= netcoreapp3.1
-      Microsoft.TestPlatform.ObjectModel (>= 17.6.2) - restriction: >= netcoreapp3.1
+    Microsoft.TestPlatform.TestHost (17.7.2) - restriction: >= netcoreapp3.1
+      Microsoft.TestPlatform.ObjectModel (>= 17.7.2) - restriction: >= netcoreapp3.1
       Newtonsoft.Json (>= 13.0.1) - restriction: >= netcoreapp3.1
     Microsoft.Win32.Primitives (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.2)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.5)) (&& (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -1026,7 +1039,7 @@ NUGET
       System.Xml.ReaderWriter (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1))
       System.Xml.XDocument (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1))
     Newtonsoft.Json (13.0.3) - restriction: >= netcoreapp3.1
-    NuGet.Frameworks (6.6.1) - restriction: >= netcoreapp3.1
+    NuGet.Frameworks (6.7) - restriction: >= net462
     Oryx (5.3.3)
       FSharp.Core (>= 7.0) - restriction: >= netstandard2.0
       FsToolkit.ErrorHandling (>= 4.6 < 5.0) - restriction: >= netstandard2.0
@@ -1100,7 +1113,7 @@ NUGET
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81))
-    System.Collections.Immutable (7.0) - restriction: >= netcoreapp3.1
+    System.Collections.Immutable (7.0) - restriction: >= net462
       System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0))
       System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netstandard2.0))
     System.ComponentModel.Annotations (5.0) - restriction: && (< net462) (>= netstandard2.0) (< netstandard2.1)
@@ -1225,7 +1238,7 @@ NUGET
       System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       System.Runtime.Extensions (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monotouch) (< net45) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Memory (4.5.5) - restriction: || (&& (>= net45) (>= netstandard2.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net462) (>= netstandard2.0)) (&& (< net5.0) (>= netstandard2.0)) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< net6.0) (>= netstandard2.0))
+    System.Memory (4.5.5) - restriction: || (&& (>= net45) (>= netstandard2.0)) (>= net462) (&& (< net5.0) (>= netstandard2.0)) (&& (< net6.0) (>= netstandard2.0))
       System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos)
       System.Numerics.Vectors (>= 4.4) - restriction: && (< net45) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Numerics.Vectors (>= 4.5) - restriction: >= net461
@@ -1308,7 +1321,7 @@ NUGET
       Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Reflection.Metadata (7.0.2) - restriction: >= netcoreapp3.1
+    System.Reflection.Metadata (7.0.2) - restriction: >= net462
       System.Collections.Immutable (>= 7.0) - restriction: || (>= net462) (>= netstandard2.0)
       System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0))
     System.Reflection.Primitives (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= netcoreapp1.0) (< netstandard1.2)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
@@ -1328,7 +1341,7 @@ NUGET
     System.Runtime (4.3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< uap10.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp1.0) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= netcoreapp1.0) (< netstandard1.2)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
-    System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (< netstandard1.1) (>= netstandard2.0)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netstandard2.0)) (&& (< net45) (< net5.0) (>= netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net461) (>= netstandard2.0)) (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp2.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net462) (>= netstandard2.0)) (&& (>= net462) (>= netstandard2.1)) (&& (>= net462) (>= xamarinios)) (&& (>= net462) (>= xamarinmac)) (&& (>= net6.0) (< net7.0)) (&& (>= net6.0) (< netstandard2.1)) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< net6.0) (>= netstandard2.0)) (&& (< net6.0) (>= netstandard2.1)) (&& (< net6.0) (>= xamarinios)) (&& (< net6.0) (>= xamarinmac)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (< netstandard2.1)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= wp8))
+    System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (< netstandard1.1) (>= netstandard2.0)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (< monoandroid) (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netstandard2.0)) (&& (< net45) (< net5.0) (>= netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net461) (>= netstandard2.0)) (>= net462) (&& (>= net6.0) (< net7.0)) (&& (>= net6.0) (< netstandard2.1)) (&& (< net6.0) (>= netstandard2.0)) (&& (< net6.0) (>= netstandard2.1)) (&& (< net6.0) (>= xamarinios)) (&& (< net6.0) (>= xamarinmac)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (< netstandard2.1)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= wp8))
     System.Runtime.Extensions (4.3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< uap10.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< net45) (>= net46) (>= netstandard1.5)) (&& (< net45) (< netcoreapp1.0) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (>= net46) (>= netcoreapp1.0)) (&& (>= netcoreapp1.0) (< netstandard1.2)) (&& (>= netcoreapp1.0) (< netstandard1.3)) (&& (>= netcoreapp1.0) (< netstandard1.4)) (&& (>= netcoreapp1.0) (< netstandard1.5)) (&& (>= netcoreapp1.0) (< netstandard1.6)) (&& (>= netcoreapp1.0) (< netstandard2.0)) (&& (>= netcoreapp1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81))
       Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
@@ -1531,25 +1544,26 @@ NUGET
       System.Xml.ReaderWriter (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81))
     Unquote (6.1)
       FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0
-    xunit (2.4.2)
-      xunit.analyzers (>= 1.0)
-      xunit.assert (>= 2.4.2)
-      xunit.core (2.4.2)
+    xunit (2.6)
+      xunit.analyzers (>= 1.4)
+      xunit.assert (>= 2.6)
+      xunit.core (2.6)
     xunit.abstractions (2.0.3) - restriction: >= netstandard1.1
       NETStandard.Library (>= 1.6) - restriction: && (< net35) (>= netstandard1.0) (< netstandard2.0)
-    xunit.analyzers (1.1)
-    xunit.assert (2.4.2)
-      NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (>= netstandard1.1)
-    xunit.core (2.4.2)
-      xunit.extensibility.core (2.4.2)
-      xunit.extensibility.execution (2.4.2)
-    xunit.extensibility.core (2.4.2)
+    xunit.analyzers (1.4)
+    xunit.assert (2.6)
+      NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (< net6.0) (>= netstandard1.1)
+    xunit.core (2.6)
+      xunit.extensibility.core (2.6)
+      xunit.extensibility.execution (2.6)
+    xunit.extensibility.core (2.6)
       NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (>= netstandard1.1)
       xunit.abstractions (>= 2.0.3) - restriction: >= netstandard1.1
-    xunit.extensibility.execution (2.4.2)
+    xunit.extensibility.execution (2.6)
       NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (>= netstandard1.1)
-      xunit.extensibility.core (2.4.2) - restriction: >= netstandard1.1
-    xunit.runner.visualstudio (2.4.5)
+      xunit.extensibility.core (2.6) - restriction: >= netstandard1.1
+    xunit.runner.visualstudio (2.5.3)
+      Microsoft.TestPlatform.ObjectModel (>= 17.7.2) - restriction: >= net462
 
 GROUP Types
 RESTRICTION: == netstandard2.0
diff --git a/test.sh b/test.sh
index 22b78e14..93a1fd24 100755
--- a/test.sh
+++ b/test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 source ./test_auth.sh
-dotnet test CogniteSdk/test/fsharp /p:Exclude="[xunit*]*" /p:CollectCoverage=true /p:CoverletOutputFormat=json /p:CoverletOutput='coverage.json'
-dotnet test CogniteSdk/test/csharp /p:Exclude="[xunit*]*" /p:CollectCoverage=true /p:MergeWith='../fsharp/coverage.json' /p:CoverletOutputFormat=lcov /p:CoverletOutput='../../../coverage.lcov'
+dotnet test CogniteSdk/test/fsharp /p:Exclude="[xunit*]*" /p:Exclude="[CogniteSdk.Protobuf*]*" /p:CollectCoverage=true /p:CoverletOutputFormat=json /p:CoverletOutput='coverage.json'
+dotnet test CogniteSdk/test/csharp /p:Exclude="[xunit*]*" /p:Exclude="[CogniteSdk.Protobuf*]*" /p:CollectCoverage=true /p:MergeWith='../fsharp/coverage.json' /p:CoverletOutputFormat=lcov /p:CoverletOutput='../../../coverage.lcov'
 rm CogniteSdk/test/fsharp/coverage.json
diff --git a/version b/version
index 87dbaa15..77fdc6bb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-3.12.0
\ No newline at end of file
+3.13.0
\ No newline at end of file