diff --git a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesModel.java b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesModel.java
index 5e8192da8..2e7cfde27 100644
--- a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesModel.java
+++ b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.tribuo.classification.mnb;
 
+import com.google.protobuf.Any;
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.oracle.labs.mlrg.olcut.util.Pair;
 import org.tribuo.Example;
 import org.tribuo.Excuse;
@@ -25,12 +27,16 @@
 import org.tribuo.Model;
 import org.tribuo.Prediction;
 import org.tribuo.classification.Label;
+import org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto;
+import org.tribuo.impl.ModelDataCarrier;
 import org.tribuo.math.la.DenseSparseMatrix;
 import org.tribuo.math.la.DenseVector;
 import org.tribuo.math.la.SparseVector;
+import org.tribuo.math.la.Tensor;
 import org.tribuo.math.la.VectorTuple;
 import org.tribuo.math.util.ExpNormalizer;
 import org.tribuo.math.util.VectorNormalizer;
+import org.tribuo.protos.core.ModelProto;
 import org.tribuo.provenance.ModelProvenance;
 
 import java.util.ArrayList;
@@ -56,6 +62,11 @@
 public class MultinomialNaiveBayesModel extends Model<Label> {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * Protobuf serialization version.
+     */
+    public static final int CURRENT_VERSION = 0;
+
     private final DenseSparseMatrix labelWordProbs;
     private final double alpha;
 
@@ -67,6 +78,46 @@ public class MultinomialNaiveBayesModel extends Model<Label> {
         this.alpha = alpha;
     }
 
+    /**
+     * Deserialization factory.
+     * @param version The serialized object version.
+     * @param className The class name.
+     * @param message The serialized data.
+     */
+    public static MultinomialNaiveBayesModel deserializeFromProto(int version, String className, Any message) throws InvalidProtocolBufferException {
+        if (version < 0 || version > CURRENT_VERSION) {
+            throw new IllegalArgumentException("Unknown version " + version + ", this class supports at most version " + CURRENT_VERSION);
+        }
+        MultinomialNaiveBayesProto proto = message.unpack(MultinomialNaiveBayesProto.class);
+
+        ModelDataCarrier<?> carrier = ModelDataCarrier.deserialize(proto.getMetadata());
+        if (!carrier.outputDomain().getOutput(0).getClass().equals(Label.class)) {
+            throw new IllegalStateException("Invalid protobuf, output domain is not a label domain, found " + carrier.outputDomain().getClass());
+        }
+        @SuppressWarnings("unchecked") // guarded by getClass
+        ImmutableOutputInfo<Label> outputDomain = (ImmutableOutputInfo<Label>) carrier.outputDomain();
+
+        Tensor weights = Tensor.deserialize(proto.getLabelWordProbs());
+        if (!(weights instanceof DenseSparseMatrix)) {
+            throw new IllegalStateException("Invalid protobuf, label word probs must be a sparse matrix, found " + weights.getClass());
+        }
+        DenseSparseMatrix labelWordProbs = (DenseSparseMatrix) weights;
+        if (labelWordProbs.getDimension1Size() != carrier.outputDomain().size()) {
+            throw new IllegalStateException("Invalid protobuf, labelWordProbs not the right size, expected " + carrier.outputDomain().size() + ", found " + labelWordProbs.getDimension1Size());
+        }
+        if (labelWordProbs.getDimension2Size() != carrier.featureDomain().size()) {
+            throw new IllegalStateException("Invalid protobuf, labelWordProbs not the right size, expected " + carrier.featureDomain().size() + ", found " + labelWordProbs.getDimension2Size());
+        }
+
+        double alpha = proto.getAlpha();
+
+        if (alpha < 0.0) {
+            throw new IllegalStateException("Invalid protobuf, alpha must be non-negative, found " + alpha);
+        }
+
+        return new MultinomialNaiveBayesModel(carrier.name(),carrier.provenance(),carrier.featureDomain(),outputDomain,labelWordProbs,alpha);
+    }
+
     @Override
     public Prediction<Label> predict(Example<Label> example) {
         SparseVector exVector = SparseVector.createSparseVector(example, featureIDMap, false);
@@ -157,4 +208,21 @@ public Optional<Excuse<Label>> getExcuse(Example<Label> example) {
     protected MultinomialNaiveBayesModel copy(String newName, ModelProvenance newProvenance) {
         return new MultinomialNaiveBayesModel(newName,newProvenance,featureIDMap,outputIDInfo,new DenseSparseMatrix(labelWordProbs),alpha);
     }
+
+    @Override
+    public ModelProto serialize() {
+        ModelDataCarrier<Label> carrier = createDataCarrier();
+
+        MultinomialNaiveBayesProto.Builder modelBuilder = MultinomialNaiveBayesProto.newBuilder();
+        modelBuilder.setMetadata(carrier.serialize());
+        modelBuilder.setLabelWordProbs(labelWordProbs.serialize());
+        modelBuilder.setAlpha(alpha);
+
+        ModelProto.Builder builder = ModelProto.newBuilder();
+        builder.setSerializedData(Any.pack(modelBuilder.build()));
+        builder.setClassName(MultinomialNaiveBayesModel.class.getName());
+        builder.setVersion(CURRENT_VERSION);
+
+        return builder.build();
+    }
 }
diff --git a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/MultinomialNaiveBayesProto.java b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/MultinomialNaiveBayesProto.java
new file mode 100644
index 000000000..10881bfec
--- /dev/null
+++ b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/MultinomialNaiveBayesProto.java
@@ -0,0 +1,869 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tribuo-classification-mnb.proto
+
+package org.tribuo.classification.mnb.protos;
+
+/**
+ * <pre>
+ *MultinomialNaiveBayesModel proto
+ * </pre>
+ *
+ * Protobuf type {@code tribuo.classification.mnb.MultinomialNaiveBayesProto}
+ */
+public final class MultinomialNaiveBayesProto extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:tribuo.classification.mnb.MultinomialNaiveBayesProto)
+    MultinomialNaiveBayesProtoOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use MultinomialNaiveBayesProto.newBuilder() to construct.
+  private MultinomialNaiveBayesProto(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private MultinomialNaiveBayesProto() {
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new MultinomialNaiveBayesProto();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private MultinomialNaiveBayesProto(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 10: {
+            org.tribuo.protos.core.ModelDataProto.Builder subBuilder = null;
+            if (metadata_ != null) {
+              subBuilder = metadata_.toBuilder();
+            }
+            metadata_ = input.readMessage(org.tribuo.protos.core.ModelDataProto.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(metadata_);
+              metadata_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            org.tribuo.math.protos.TensorProto.Builder subBuilder = null;
+            if (labelWordProbs_ != null) {
+              subBuilder = labelWordProbs_.toBuilder();
+            }
+            labelWordProbs_ = input.readMessage(org.tribuo.math.protos.TensorProto.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(labelWordProbs_);
+              labelWordProbs_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 25: {
+
+            alpha_ = input.readDouble();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.tribuo.classification.mnb.protos.TribuoClassificationMnb.internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.tribuo.classification.mnb.protos.TribuoClassificationMnb.internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.class, org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.Builder.class);
+  }
+
+  public static final int METADATA_FIELD_NUMBER = 1;
+  private org.tribuo.protos.core.ModelDataProto metadata_;
+  /**
+   * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+   * @return Whether the metadata field is set.
+   */
+  @java.lang.Override
+  public boolean hasMetadata() {
+    return metadata_ != null;
+  }
+  /**
+   * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+   * @return The metadata.
+   */
+  @java.lang.Override
+  public org.tribuo.protos.core.ModelDataProto getMetadata() {
+    return metadata_ == null ? org.tribuo.protos.core.ModelDataProto.getDefaultInstance() : metadata_;
+  }
+  /**
+   * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+   */
+  @java.lang.Override
+  public org.tribuo.protos.core.ModelDataProtoOrBuilder getMetadataOrBuilder() {
+    return getMetadata();
+  }
+
+  public static final int LABEL_WORD_PROBS_FIELD_NUMBER = 2;
+  private org.tribuo.math.protos.TensorProto labelWordProbs_;
+  /**
+   * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+   * @return Whether the labelWordProbs field is set.
+   */
+  @java.lang.Override
+  public boolean hasLabelWordProbs() {
+    return labelWordProbs_ != null;
+  }
+  /**
+   * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+   * @return The labelWordProbs.
+   */
+  @java.lang.Override
+  public org.tribuo.math.protos.TensorProto getLabelWordProbs() {
+    return labelWordProbs_ == null ? org.tribuo.math.protos.TensorProto.getDefaultInstance() : labelWordProbs_;
+  }
+  /**
+   * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+   */
+  @java.lang.Override
+  public org.tribuo.math.protos.TensorProtoOrBuilder getLabelWordProbsOrBuilder() {
+    return getLabelWordProbs();
+  }
+
+  public static final int ALPHA_FIELD_NUMBER = 3;
+  private double alpha_;
+  /**
+   * <code>double alpha = 3;</code>
+   * @return The alpha.
+   */
+  @java.lang.Override
+  public double getAlpha() {
+    return alpha_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (metadata_ != null) {
+      output.writeMessage(1, getMetadata());
+    }
+    if (labelWordProbs_ != null) {
+      output.writeMessage(2, getLabelWordProbs());
+    }
+    if (java.lang.Double.doubleToRawLongBits(alpha_) != 0) {
+      output.writeDouble(3, alpha_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (metadata_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getMetadata());
+    }
+    if (labelWordProbs_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getLabelWordProbs());
+    }
+    if (java.lang.Double.doubleToRawLongBits(alpha_) != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeDoubleSize(3, alpha_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto)) {
+      return super.equals(obj);
+    }
+    org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto other = (org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto) obj;
+
+    if (hasMetadata() != other.hasMetadata()) return false;
+    if (hasMetadata()) {
+      if (!getMetadata()
+          .equals(other.getMetadata())) return false;
+    }
+    if (hasLabelWordProbs() != other.hasLabelWordProbs()) return false;
+    if (hasLabelWordProbs()) {
+      if (!getLabelWordProbs()
+          .equals(other.getLabelWordProbs())) return false;
+    }
+    if (java.lang.Double.doubleToLongBits(getAlpha())
+        != java.lang.Double.doubleToLongBits(
+            other.getAlpha())) return false;
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasMetadata()) {
+      hash = (37 * hash) + METADATA_FIELD_NUMBER;
+      hash = (53 * hash) + getMetadata().hashCode();
+    }
+    if (hasLabelWordProbs()) {
+      hash = (37 * hash) + LABEL_WORD_PROBS_FIELD_NUMBER;
+      hash = (53 * hash) + getLabelWordProbs().hashCode();
+    }
+    hash = (37 * hash) + ALPHA_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        java.lang.Double.doubleToLongBits(getAlpha()));
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   *MultinomialNaiveBayesModel proto
+   * </pre>
+   *
+   * Protobuf type {@code tribuo.classification.mnb.MultinomialNaiveBayesProto}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:tribuo.classification.mnb.MultinomialNaiveBayesProto)
+      org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProtoOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.tribuo.classification.mnb.protos.TribuoClassificationMnb.internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.tribuo.classification.mnb.protos.TribuoClassificationMnb.internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.class, org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.Builder.class);
+    }
+
+    // Construct using org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+      } else {
+        metadata_ = null;
+        metadataBuilder_ = null;
+      }
+      if (labelWordProbsBuilder_ == null) {
+        labelWordProbs_ = null;
+      } else {
+        labelWordProbs_ = null;
+        labelWordProbsBuilder_ = null;
+      }
+      alpha_ = 0D;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.tribuo.classification.mnb.protos.TribuoClassificationMnb.internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_descriptor;
+    }
+
+    @java.lang.Override
+    public org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto getDefaultInstanceForType() {
+      return org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto build() {
+      org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto buildPartial() {
+      org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto result = new org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto(this);
+      if (metadataBuilder_ == null) {
+        result.metadata_ = metadata_;
+      } else {
+        result.metadata_ = metadataBuilder_.build();
+      }
+      if (labelWordProbsBuilder_ == null) {
+        result.labelWordProbs_ = labelWordProbs_;
+      } else {
+        result.labelWordProbs_ = labelWordProbsBuilder_.build();
+      }
+      result.alpha_ = alpha_;
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto) {
+        return mergeFrom((org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto other) {
+      if (other == org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto.getDefaultInstance()) return this;
+      if (other.hasMetadata()) {
+        mergeMetadata(other.getMetadata());
+      }
+      if (other.hasLabelWordProbs()) {
+        mergeLabelWordProbs(other.getLabelWordProbs());
+      }
+      if (other.getAlpha() != 0D) {
+        setAlpha(other.getAlpha());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private org.tribuo.protos.core.ModelDataProto metadata_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.tribuo.protos.core.ModelDataProto, org.tribuo.protos.core.ModelDataProto.Builder, org.tribuo.protos.core.ModelDataProtoOrBuilder> metadataBuilder_;
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     * @return Whether the metadata field is set.
+     */
+    public boolean hasMetadata() {
+      return metadataBuilder_ != null || metadata_ != null;
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     * @return The metadata.
+     */
+    public org.tribuo.protos.core.ModelDataProto getMetadata() {
+      if (metadataBuilder_ == null) {
+        return metadata_ == null ? org.tribuo.protos.core.ModelDataProto.getDefaultInstance() : metadata_;
+      } else {
+        return metadataBuilder_.getMessage();
+      }
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    public Builder setMetadata(org.tribuo.protos.core.ModelDataProto value) {
+      if (metadataBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        metadata_ = value;
+        onChanged();
+      } else {
+        metadataBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    public Builder setMetadata(
+        org.tribuo.protos.core.ModelDataProto.Builder builderForValue) {
+      if (metadataBuilder_ == null) {
+        metadata_ = builderForValue.build();
+        onChanged();
+      } else {
+        metadataBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    public Builder mergeMetadata(org.tribuo.protos.core.ModelDataProto value) {
+      if (metadataBuilder_ == null) {
+        if (metadata_ != null) {
+          metadata_ =
+            org.tribuo.protos.core.ModelDataProto.newBuilder(metadata_).mergeFrom(value).buildPartial();
+        } else {
+          metadata_ = value;
+        }
+        onChanged();
+      } else {
+        metadataBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    public Builder clearMetadata() {
+      if (metadataBuilder_ == null) {
+        metadata_ = null;
+        onChanged();
+      } else {
+        metadata_ = null;
+        metadataBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    public org.tribuo.protos.core.ModelDataProto.Builder getMetadataBuilder() {
+      
+      onChanged();
+      return getMetadataFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    public org.tribuo.protos.core.ModelDataProtoOrBuilder getMetadataOrBuilder() {
+      if (metadataBuilder_ != null) {
+        return metadataBuilder_.getMessageOrBuilder();
+      } else {
+        return metadata_ == null ?
+            org.tribuo.protos.core.ModelDataProto.getDefaultInstance() : metadata_;
+      }
+    }
+    /**
+     * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.tribuo.protos.core.ModelDataProto, org.tribuo.protos.core.ModelDataProto.Builder, org.tribuo.protos.core.ModelDataProtoOrBuilder> 
+        getMetadataFieldBuilder() {
+      if (metadataBuilder_ == null) {
+        metadataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.tribuo.protos.core.ModelDataProto, org.tribuo.protos.core.ModelDataProto.Builder, org.tribuo.protos.core.ModelDataProtoOrBuilder>(
+                getMetadata(),
+                getParentForChildren(),
+                isClean());
+        metadata_ = null;
+      }
+      return metadataBuilder_;
+    }
+
+    private org.tribuo.math.protos.TensorProto labelWordProbs_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.tribuo.math.protos.TensorProto, org.tribuo.math.protos.TensorProto.Builder, org.tribuo.math.protos.TensorProtoOrBuilder> labelWordProbsBuilder_;
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     * @return Whether the labelWordProbs field is set.
+     */
+    public boolean hasLabelWordProbs() {
+      return labelWordProbsBuilder_ != null || labelWordProbs_ != null;
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     * @return The labelWordProbs.
+     */
+    public org.tribuo.math.protos.TensorProto getLabelWordProbs() {
+      if (labelWordProbsBuilder_ == null) {
+        return labelWordProbs_ == null ? org.tribuo.math.protos.TensorProto.getDefaultInstance() : labelWordProbs_;
+      } else {
+        return labelWordProbsBuilder_.getMessage();
+      }
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    public Builder setLabelWordProbs(org.tribuo.math.protos.TensorProto value) {
+      if (labelWordProbsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        labelWordProbs_ = value;
+        onChanged();
+      } else {
+        labelWordProbsBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    public Builder setLabelWordProbs(
+        org.tribuo.math.protos.TensorProto.Builder builderForValue) {
+      if (labelWordProbsBuilder_ == null) {
+        labelWordProbs_ = builderForValue.build();
+        onChanged();
+      } else {
+        labelWordProbsBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    public Builder mergeLabelWordProbs(org.tribuo.math.protos.TensorProto value) {
+      if (labelWordProbsBuilder_ == null) {
+        if (labelWordProbs_ != null) {
+          labelWordProbs_ =
+            org.tribuo.math.protos.TensorProto.newBuilder(labelWordProbs_).mergeFrom(value).buildPartial();
+        } else {
+          labelWordProbs_ = value;
+        }
+        onChanged();
+      } else {
+        labelWordProbsBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    public Builder clearLabelWordProbs() {
+      if (labelWordProbsBuilder_ == null) {
+        labelWordProbs_ = null;
+        onChanged();
+      } else {
+        labelWordProbs_ = null;
+        labelWordProbsBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    public org.tribuo.math.protos.TensorProto.Builder getLabelWordProbsBuilder() {
+      
+      onChanged();
+      return getLabelWordProbsFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    public org.tribuo.math.protos.TensorProtoOrBuilder getLabelWordProbsOrBuilder() {
+      if (labelWordProbsBuilder_ != null) {
+        return labelWordProbsBuilder_.getMessageOrBuilder();
+      } else {
+        return labelWordProbs_ == null ?
+            org.tribuo.math.protos.TensorProto.getDefaultInstance() : labelWordProbs_;
+      }
+    }
+    /**
+     * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        org.tribuo.math.protos.TensorProto, org.tribuo.math.protos.TensorProto.Builder, org.tribuo.math.protos.TensorProtoOrBuilder> 
+        getLabelWordProbsFieldBuilder() {
+      if (labelWordProbsBuilder_ == null) {
+        labelWordProbsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            org.tribuo.math.protos.TensorProto, org.tribuo.math.protos.TensorProto.Builder, org.tribuo.math.protos.TensorProtoOrBuilder>(
+                getLabelWordProbs(),
+                getParentForChildren(),
+                isClean());
+        labelWordProbs_ = null;
+      }
+      return labelWordProbsBuilder_;
+    }
+
+    private double alpha_ ;
+    /**
+     * <code>double alpha = 3;</code>
+     * @return The alpha.
+     */
+    @java.lang.Override
+    public double getAlpha() {
+      return alpha_;
+    }
+    /**
+     * <code>double alpha = 3;</code>
+     * @param value The alpha to set.
+     * @return This builder for chaining.
+     */
+    public Builder setAlpha(double value) {
+      
+      alpha_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>double alpha = 3;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearAlpha() {
+      
+      alpha_ = 0D;
+      onChanged();
+      return this;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:tribuo.classification.mnb.MultinomialNaiveBayesProto)
+  }
+
+  // @@protoc_insertion_point(class_scope:tribuo.classification.mnb.MultinomialNaiveBayesProto)
+  private static final org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto();
+  }
+
+  public static org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<MultinomialNaiveBayesProto>
+      PARSER = new com.google.protobuf.AbstractParser<MultinomialNaiveBayesProto>() {
+    @java.lang.Override
+    public MultinomialNaiveBayesProto parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new MultinomialNaiveBayesProto(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<MultinomialNaiveBayesProto> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<MultinomialNaiveBayesProto> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.tribuo.classification.mnb.protos.MultinomialNaiveBayesProto getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/MultinomialNaiveBayesProtoOrBuilder.java b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/MultinomialNaiveBayesProtoOrBuilder.java
new file mode 100644
index 000000000..a3c4cc390
--- /dev/null
+++ b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/MultinomialNaiveBayesProtoOrBuilder.java
@@ -0,0 +1,45 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tribuo-classification-mnb.proto
+
+package org.tribuo.classification.mnb.protos;
+
+public interface MultinomialNaiveBayesProtoOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:tribuo.classification.mnb.MultinomialNaiveBayesProto)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+   * @return Whether the metadata field is set.
+   */
+  boolean hasMetadata();
+  /**
+   * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+   * @return The metadata.
+   */
+  org.tribuo.protos.core.ModelDataProto getMetadata();
+  /**
+   * <code>.tribuo.core.ModelDataProto metadata = 1;</code>
+   */
+  org.tribuo.protos.core.ModelDataProtoOrBuilder getMetadataOrBuilder();
+
+  /**
+   * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+   * @return Whether the labelWordProbs field is set.
+   */
+  boolean hasLabelWordProbs();
+  /**
+   * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+   * @return The labelWordProbs.
+   */
+  org.tribuo.math.protos.TensorProto getLabelWordProbs();
+  /**
+   * <code>.tribuo.math.TensorProto label_word_probs = 2;</code>
+   */
+  org.tribuo.math.protos.TensorProtoOrBuilder getLabelWordProbsOrBuilder();
+
+  /**
+   * <code>double alpha = 3;</code>
+   * @return The alpha.
+   */
+  double getAlpha();
+}
diff --git a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/TribuoClassificationMnb.java b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/TribuoClassificationMnb.java
new file mode 100644
index 000000000..305eaa80b
--- /dev/null
+++ b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/protos/TribuoClassificationMnb.java
@@ -0,0 +1,57 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tribuo-classification-mnb.proto
+
+package org.tribuo.classification.mnb.protos;
+
+public final class TribuoClassificationMnb {
+  private TribuoClassificationMnb() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\037tribuo-classification-mnb.proto\022\031tribu" +
+      "o.classification.mnb\032\021tribuo-core.proto\032" +
+      "\021tribuo-math.proto\"\216\001\n\032MultinomialNaiveB" +
+      "ayesProto\022-\n\010metadata\030\001 \001(\0132\033.tribuo.cor" +
+      "e.ModelDataProto\0222\n\020label_word_probs\030\002 \001" +
+      "(\0132\030.tribuo.math.TensorProto\022\r\n\005alpha\030\003 " +
+      "\001(\001B(\n$org.tribuo.classification.mnb.pro" +
+      "tosP\001b\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          org.tribuo.protos.core.TribuoCore.getDescriptor(),
+          org.tribuo.math.protos.TribuoMath.getDescriptor(),
+        });
+    internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tribuo_classification_mnb_MultinomialNaiveBayesProto_descriptor,
+        new java.lang.String[] { "Metadata", "LabelWordProbs", "Alpha", });
+    org.tribuo.protos.core.TribuoCore.getDescriptor();
+    org.tribuo.math.protos.TribuoMath.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/Classification/MultinomialNaiveBayes/src/main/resources/protos/tribuo-classification-mnb.proto b/Classification/MultinomialNaiveBayes/src/main/resources/protos/tribuo-classification-mnb.proto
new file mode 100644
index 000000000..48c29541d
--- /dev/null
+++ b/Classification/MultinomialNaiveBayes/src/main/resources/protos/tribuo-classification-mnb.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+/*
+ * Protos for serializing Tribuo's Multinomial Naive Bayes.
+ */
+package tribuo.classification.mnb;
+
+option java_multiple_files = true;
+option java_package = "org.tribuo.classification.mnb.protos";
+
+// Import Tribuo's core protos
+import "tribuo-core.proto";
+
+// Import Tribuo's math protos
+import "tribuo-math.proto";
+
+/*
+MultinomialNaiveBayesModel proto
+ */
+message MultinomialNaiveBayesProto {
+ tribuo.core.ModelDataProto metadata = 1;
+ tribuo.math.TensorProto label_word_probs = 2;
+ double alpha = 3;
+}
diff --git a/Classification/MultinomialNaiveBayes/src/test/java/org/tribuo/classification/mnb/TestMNB.java b/Classification/MultinomialNaiveBayes/src/test/java/org/tribuo/classification/mnb/TestMNB.java
index 961298d4a..ea5393f88 100644
--- a/Classification/MultinomialNaiveBayes/src/test/java/org/tribuo/classification/mnb/TestMNB.java
+++ b/Classification/MultinomialNaiveBayes/src/test/java/org/tribuo/classification/mnb/TestMNB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,9 @@ public void testSingleClassTraining() {
     public void testDenseData() {
         Pair<Dataset<Label>,Dataset<Label>> p = LabelledDataGenerator.denseTrainTest(1.0);
         Model<Label> model = testMNB(p);
-        Helpers.testModelSerialization(model,Label.class);
+        Helpers.testModelSerialization(model, Label.class);
+        Model<Label> m = Helpers.testModelProtoSerialization(model, Label.class, p.getB());
+        m.predict(p.getB());
     }
 
     @Test
diff --git a/Core/src/main/java/org/tribuo/Model.java b/Core/src/main/java/org/tribuo/Model.java
index 2d1b3fded..cd51ed325 100644
--- a/Core/src/main/java/org/tribuo/Model.java
+++ b/Core/src/main/java/org/tribuo/Model.java
@@ -16,13 +16,15 @@
 
 package org.tribuo;
 
-import com.oracle.labs.mlrg.olcut.config.protobuf.ProtoProvenanceSerialization;
 import com.oracle.labs.mlrg.olcut.provenance.Provenancable;
 import com.oracle.labs.mlrg.olcut.provenance.ProvenanceUtil;
 import com.oracle.labs.mlrg.olcut.provenance.io.ObjectMarshalledProvenance;
 import com.oracle.labs.mlrg.olcut.util.Pair;
-import java.util.Objects;
-import org.tribuo.protos.core.ModelDataProto;
+
+import org.tribuo.impl.ModelDataCarrier;
+import org.tribuo.protos.ProtoSerializable;
+import org.tribuo.protos.ProtoUtil;
+import org.tribuo.protos.core.ModelProto;
 import org.tribuo.provenance.ModelProvenance;
 
 import java.io.Serializable;
@@ -38,9 +40,13 @@
  * <p>
  * If two features map to the same id in the featureIDMap, then
  * occurrences of those features will be combined at prediction time.
+ * <p>
+ * Note Model's implementation of {@link ProtoSerializable} throws {@link UnsupportedOperationException}
+ * for compatibility reasons. This default implementation will be removed in the next major release
+ * of Tribuo.
  * @param <T> the type of prediction produced by the model.
  */
-public abstract class Model<T extends Output<T>> implements Provenancable<ModelProvenance>, Serializable {
+public abstract class Model<T extends Output<T>> implements ProtoSerializable<ModelProto>, Provenancable<ModelProvenance>, Serializable {
     private static final long serialVersionUID = 2L;
 
     /**
@@ -321,6 +327,20 @@ public <U extends Output<U>> Model<U> castModel(Class<U> outputType) {
         }
     }
 
+    @Override
+    public ModelProto serialize() {
+        throw new UnsupportedOperationException("The default implementation of Model.serialize() must be overridden to support protobuf serialization.");
+    }
+
+    /**
+     * Deserializes the model from the supplied protobuf.
+     * @param proto The protobuf to deserialize.
+     * @return The model.
+     */
+    public static Model<?> deserialize(ModelProto proto) {
+        return ProtoUtil.deserialize(proto);
+    }
+
     /**
      * Constructs the data carrier for serialization.
      * @return The serialization data carrier.
@@ -329,171 +349,4 @@ protected ModelDataCarrier<T> createDataCarrier() {
         return new ModelDataCarrier<>(name,provenance,featureIDMap,outputIDInfo,generatesProbabilities,provenance.getTribuoVersion());
     }
 
-    /**
-     * Serialization carrier for common fields in Model.
-     * <p>
-     * Likely to be a record one day.
-     */
-    protected static final class ModelDataCarrier<T extends Output<T>> {
-        private static final ProtoProvenanceSerialization PROVENANCE_SERIALIZER = new ProtoProvenanceSerialization(false);
-
-        /**
-         * The model's name.
-         */
-        private final String name;
-
-        /**
-         * The model provenance.
-         */
-        private final ModelProvenance provenance;
-
-        /**
-         * The features this model knows about.
-         */
-        private final ImmutableFeatureMap featureDomain;
-
-        /**
-         * The outputs this model predicts.
-         */
-        private final ImmutableOutputInfo<T> outputDomain;
-
-        /**
-         * Does this model generate probability distributions in the output.
-         */
-        private final boolean generatesProbabilities;
-
-        /**
-         * The Tribuo version string.
-         */
-        private final String tribuoVersion;
-
-        /**
-         * Constructs a new ModelDataCarrier.
-         * <p>
-         * Will be the canonical constructor for the record form.
-         * @param name The model name.
-         * @param provenance The model provenance.
-         * @param featureDomain The feature domain.
-         * @param outputDomain The output domain.
-         * @param generatesProbabilities Does this model generate probabilities?
-         * @param tribuoVersion The Tribuo version string.
-         */
-        ModelDataCarrier(String name, ModelProvenance provenance, ImmutableFeatureMap featureDomain, ImmutableOutputInfo<T> outputDomain, boolean generatesProbabilities, String tribuoVersion) {
-            this.name = name;
-            this.provenance = provenance;
-            this.featureDomain = featureDomain;
-            this.outputDomain = outputDomain;
-            this.generatesProbabilities = generatesProbabilities;
-            this.tribuoVersion = tribuoVersion;
-        }
-
-        /**
-         * The model name.
-         * @return The model name.
-         */
-        public String name() {
-            return name;
-        }
-
-        /**
-         * The model provenance.
-         * @return The model provenance.
-         */
-        public ModelProvenance provenance() {
-            return provenance;
-        }
-
-        /**
-         * The feature domain.
-         * @return The feature domain.
-         */
-        public ImmutableFeatureMap featureDomain() {
-            return featureDomain;
-        }
-
-        /**
-         * The output domain.
-         * @return The output domain.
-         */
-        public ImmutableOutputInfo<T> outputDomain() {
-            return outputDomain;
-        }
-
-        /**
-         * Does this model generate probabilities?
-         * @return Does the model generate probabilities?
-         */
-        public boolean generatesProbabilities() {
-            return generatesProbabilities;
-        }
-
-        /**
-         * Gets the Tribuo version string.
-         * @return The Tribuo version string.
-         */
-        public String tribuoVersion() {
-            return tribuoVersion;
-        }
-
-        /**
-         * Deserializes a {@link ModelDataProto} into a {@link ModelDataCarrier}.
-         * @param proto The proto to deserialize.
-         * @return The model data.
-         */
-        public static ModelDataCarrier<?> deserialize(ModelDataProto proto) {
-            ModelProvenance provenance = (ModelProvenance) ProvenanceUtil.unmarshalProvenance(PROVENANCE_SERIALIZER.deserializeFromProto(proto.getProvenance()));
-            ImmutableFeatureMap featureDomain = (ImmutableFeatureMap) FeatureMap.deserialize(proto.getFeatureDomain());
-            ImmutableOutputInfo<?> outputDomain = (ImmutableOutputInfo<?>) OutputInfo.deserialize(proto.getOutputDomain());
-            return new ModelDataCarrier<>(proto.getName(),provenance,featureDomain,outputDomain,proto.getGenerateProbabilities(),proto.getTribuoVersion());
-        }
-
-        /**
-         * Serializes this object to a protobuf.
-         * @return The protobuf representation.
-         */
-        public ModelDataProto serialize() {
-            ModelDataProto.Builder builder = ModelDataProto.newBuilder();
-
-            builder.setName(name);
-            builder.setGenerateProbabilities(generatesProbabilities);
-            builder.setFeatureDomain(featureDomain.serialize());
-            builder.setOutputDomain(outputDomain.serialize());
-            builder.setProvenance(PROVENANCE_SERIALIZER.serializeToProto(ProvenanceUtil.marshalProvenance(provenance)));
-            builder.setTribuoVersion(tribuoVersion);
-
-            return builder.build();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (!(o instanceof ModelDataCarrier)) {
-                return false;
-            }
-            ModelDataCarrier<?> that = (ModelDataCarrier<?>) o;
-            return generatesProbabilities == that.generatesProbabilities && name.equals(that.name)
-                && provenance.equals(that.provenance) && featureDomain.equals(that.featureDomain)
-                && outputDomain.equals(that.outputDomain) && tribuoVersion.equals(that.tribuoVersion);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(name, provenance, featureDomain, outputDomain,
-                generatesProbabilities, tribuoVersion);
-        }
-
-        @Override
-        public String toString() {
-            return "ModelDataCarrier{" +
-                "name='" + name + '\'' +
-                ", provenance=" + provenance +
-                ", featureDomain=" + featureDomain +
-                ", outputDomain=" + outputDomain +
-                ", generatesProbabilities=" + generatesProbabilities +
-                ", tribuoVersion=" + tribuoVersion +
-                '}';
-        }
-    }
 }
diff --git a/Core/src/main/java/org/tribuo/impl/ModelDataCarrier.java b/Core/src/main/java/org/tribuo/impl/ModelDataCarrier.java
new file mode 100644
index 000000000..e8c3cdbc5
--- /dev/null
+++ b/Core/src/main/java/org/tribuo/impl/ModelDataCarrier.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.tribuo.impl;
+
+import com.oracle.labs.mlrg.olcut.config.protobuf.ProtoProvenanceSerialization;
+import com.oracle.labs.mlrg.olcut.provenance.ProvenanceUtil;
+import org.tribuo.FeatureMap;
+import org.tribuo.ImmutableFeatureMap;
+import org.tribuo.ImmutableOutputInfo;
+import org.tribuo.Model;
+import org.tribuo.Output;
+import org.tribuo.OutputInfo;
+import org.tribuo.protos.core.ModelDataProto;
+import org.tribuo.provenance.ModelProvenance;
+
+import java.util.Objects;
+
+/**
+ * Serialization carrier for common fields in Model and SequenceModel.
+ * <p>
+ * Likely to be a record one day.
+ */
+public final class ModelDataCarrier<T extends Output<T>> {
+    private static final ProtoProvenanceSerialization PROVENANCE_SERIALIZER = new ProtoProvenanceSerialization(false);
+
+    /**
+     * The model's name.
+     */
+    private final String name;
+
+    /**
+     * The model provenance.
+     */
+    private final ModelProvenance provenance;
+
+    /**
+     * The features this model knows about.
+     */
+    private final ImmutableFeatureMap featureDomain;
+
+    /**
+     * The outputs this model predicts.
+     */
+    private final ImmutableOutputInfo<T> outputDomain;
+
+    /**
+     * Does this model generate probability distributions in the output.
+     */
+    private final boolean generatesProbabilities;
+
+    /**
+     * The Tribuo version string.
+     */
+    private final String tribuoVersion;
+
+    /**
+     * Constructs a new ModelDataCarrier.
+     * <p>
+     * Will be the canonical constructor for the record form.
+     *
+     * @param name                   The model name.
+     * @param provenance             The model provenance.
+     * @param featureDomain          The feature domain.
+     * @param outputDomain           The output domain.
+     * @param generatesProbabilities Does this model generate probabilities?
+     * @param tribuoVersion          The Tribuo version string.
+     */
+    public ModelDataCarrier(String name, ModelProvenance provenance, ImmutableFeatureMap featureDomain, ImmutableOutputInfo<T> outputDomain, boolean generatesProbabilities, String tribuoVersion) {
+        this.name = name;
+        this.provenance = provenance;
+        this.featureDomain = featureDomain;
+        this.outputDomain = outputDomain;
+        this.generatesProbabilities = generatesProbabilities;
+        this.tribuoVersion = tribuoVersion;
+    }
+
+    /**
+     * The model name.
+     *
+     * @return The model name.
+     */
+    public String name() {
+        return name;
+    }
+
+    /**
+     * The model provenance.
+     *
+     * @return The model provenance.
+     */
+    public ModelProvenance provenance() {
+        return provenance;
+    }
+
+    /**
+     * The feature domain.
+     *
+     * @return The feature domain.
+     */
+    public ImmutableFeatureMap featureDomain() {
+        return featureDomain;
+    }
+
+    /**
+     * The output domain.
+     *
+     * @return The output domain.
+     */
+    public ImmutableOutputInfo<T> outputDomain() {
+        return outputDomain;
+    }
+
+    /**
+     * Does this model generate probabilities?
+     *
+     * @return Does the model generate probabilities?
+     */
+    public boolean generatesProbabilities() {
+        return generatesProbabilities;
+    }
+
+    /**
+     * Gets the Tribuo version string.
+     *
+     * @return The Tribuo version string.
+     */
+    public String tribuoVersion() {
+        return tribuoVersion;
+    }
+
+    /**
+     * Deserializes a {@link ModelDataProto} into a {@link ModelDataCarrier}.
+     *
+     * @param proto The proto to deserialize.
+     * @return The model data.
+     */
+    public static ModelDataCarrier<?> deserialize(ModelDataProto proto) {
+        ModelProvenance provenance = (ModelProvenance) ProvenanceUtil.unmarshalProvenance(PROVENANCE_SERIALIZER.deserializeFromProto(proto.getProvenance()));
+        ImmutableFeatureMap featureDomain = (ImmutableFeatureMap) FeatureMap.deserialize(proto.getFeatureDomain());
+        ImmutableOutputInfo<?> outputDomain = (ImmutableOutputInfo<?>) OutputInfo.deserialize(proto.getOutputDomain());
+        return new ModelDataCarrier<>(proto.getName(), provenance, featureDomain, outputDomain, proto.getGenerateProbabilities(), proto.getTribuoVersion());
+    }
+
+    /**
+     * Serializes this object to a protobuf.
+     *
+     * @return The protobuf representation.
+     */
+    public ModelDataProto serialize() {
+        ModelDataProto.Builder builder = ModelDataProto.newBuilder();
+
+        builder.setName(name);
+        builder.setGenerateProbabilities(generatesProbabilities);
+        builder.setFeatureDomain(featureDomain.serialize());
+        builder.setOutputDomain(outputDomain.serialize());
+        builder.setProvenance(PROVENANCE_SERIALIZER.serializeToProto(ProvenanceUtil.marshalProvenance(provenance)));
+        builder.setTribuoVersion(tribuoVersion);
+
+        return builder.build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ModelDataCarrier)) {
+            return false;
+        }
+        ModelDataCarrier<?> that = (ModelDataCarrier<?>) o;
+        return generatesProbabilities == that.generatesProbabilities && name.equals(that.name)
+                && provenance.equals(that.provenance) && featureDomain.equals(that.featureDomain)
+                && outputDomain.equals(that.outputDomain) && tribuoVersion.equals(that.tribuoVersion);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, provenance, featureDomain, outputDomain,
+                generatesProbabilities, tribuoVersion);
+    }
+
+    @Override
+    public String toString() {
+        return "ModelDataCarrier{" +
+                "name='" + name + '\'' +
+                ", provenance=" + provenance +
+                ", featureDomain=" + featureDomain +
+                ", outputDomain=" + outputDomain +
+                ", generatesProbabilities=" + generatesProbabilities +
+                ", tribuoVersion=" + tribuoVersion +
+                '}';
+    }
+}
diff --git a/Core/src/main/java/org/tribuo/protos/core/SequenceModelProto.java b/Core/src/main/java/org/tribuo/protos/core/SequenceModelProto.java
new file mode 100644
index 000000000..7f495de8d
--- /dev/null
+++ b/Core/src/main/java/org/tribuo/protos/core/SequenceModelProto.java
@@ -0,0 +1,817 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tribuo-core.proto
+
+package org.tribuo.protos.core;
+
+/**
+ * <pre>
+ *SequenceModel redirect proto
+ * </pre>
+ *
+ * Protobuf type {@code tribuo.core.SequenceModelProto}
+ */
+public final class SequenceModelProto extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:tribuo.core.SequenceModelProto)
+    SequenceModelProtoOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use SequenceModelProto.newBuilder() to construct.
+  private SequenceModelProto(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private SequenceModelProto() {
+    className_ = "";
+  }
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
+    return new SequenceModelProto();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private SequenceModelProto(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8: {
+
+            version_ = input.readInt32();
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            className_ = s;
+            break;
+          }
+          case 26: {
+            com.google.protobuf.Any.Builder subBuilder = null;
+            if (serializedData_ != null) {
+              subBuilder = serializedData_.toBuilder();
+            }
+            serializedData_ = input.readMessage(com.google.protobuf.Any.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(serializedData_);
+              serializedData_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return org.tribuo.protos.core.TribuoCore.internal_static_tribuo_core_SequenceModelProto_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return org.tribuo.protos.core.TribuoCore.internal_static_tribuo_core_SequenceModelProto_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            org.tribuo.protos.core.SequenceModelProto.class, org.tribuo.protos.core.SequenceModelProto.Builder.class);
+  }
+
+  public static final int VERSION_FIELD_NUMBER = 1;
+  private int version_;
+  /**
+   * <code>int32 version = 1;</code>
+   * @return The version.
+   */
+  @java.lang.Override
+  public int getVersion() {
+    return version_;
+  }
+
+  public static final int CLASS_NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object className_;
+  /**
+   * <code>string class_name = 2;</code>
+   * @return The className.
+   */
+  @java.lang.Override
+  public java.lang.String getClassName() {
+    java.lang.Object ref = className_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      className_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>string class_name = 2;</code>
+   * @return The bytes for className.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getClassNameBytes() {
+    java.lang.Object ref = className_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      className_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SERIALIZED_DATA_FIELD_NUMBER = 3;
+  private com.google.protobuf.Any serializedData_;
+  /**
+   * <code>.google.protobuf.Any serialized_data = 3;</code>
+   * @return Whether the serializedData field is set.
+   */
+  @java.lang.Override
+  public boolean hasSerializedData() {
+    return serializedData_ != null;
+  }
+  /**
+   * <code>.google.protobuf.Any serialized_data = 3;</code>
+   * @return The serializedData.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Any getSerializedData() {
+    return serializedData_ == null ? com.google.protobuf.Any.getDefaultInstance() : serializedData_;
+  }
+  /**
+   * <code>.google.protobuf.Any serialized_data = 3;</code>
+   */
+  @java.lang.Override
+  public com.google.protobuf.AnyOrBuilder getSerializedDataOrBuilder() {
+    return getSerializedData();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  @java.lang.Override
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  @java.lang.Override
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (version_ != 0) {
+      output.writeInt32(1, version_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(className_)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, className_);
+    }
+    if (serializedData_ != null) {
+      output.writeMessage(3, getSerializedData());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (version_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(1, version_);
+    }
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(className_)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, className_);
+    }
+    if (serializedData_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getSerializedData());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof org.tribuo.protos.core.SequenceModelProto)) {
+      return super.equals(obj);
+    }
+    org.tribuo.protos.core.SequenceModelProto other = (org.tribuo.protos.core.SequenceModelProto) obj;
+
+    if (getVersion()
+        != other.getVersion()) return false;
+    if (!getClassName()
+        .equals(other.getClassName())) return false;
+    if (hasSerializedData() != other.hasSerializedData()) return false;
+    if (hasSerializedData()) {
+      if (!getSerializedData()
+          .equals(other.getSerializedData())) return false;
+    }
+    if (!unknownFields.equals(other.unknownFields)) return false;
+    return true;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + VERSION_FIELD_NUMBER;
+    hash = (53 * hash) + getVersion();
+    hash = (37 * hash) + CLASS_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getClassName().hashCode();
+    if (hasSerializedData()) {
+      hash = (37 * hash) + SERIALIZED_DATA_FIELD_NUMBER;
+      hash = (53 * hash) + getSerializedData().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static org.tribuo.protos.core.SequenceModelProto parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  @java.lang.Override
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(org.tribuo.protos.core.SequenceModelProto prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  @java.lang.Override
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   *SequenceModel redirect proto
+   * </pre>
+   *
+   * Protobuf type {@code tribuo.core.SequenceModelProto}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:tribuo.core.SequenceModelProto)
+      org.tribuo.protos.core.SequenceModelProtoOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.tribuo.protos.core.TribuoCore.internal_static_tribuo_core_SequenceModelProto_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.tribuo.protos.core.TribuoCore.internal_static_tribuo_core_SequenceModelProto_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.tribuo.protos.core.SequenceModelProto.class, org.tribuo.protos.core.SequenceModelProto.Builder.class);
+    }
+
+    // Construct using org.tribuo.protos.core.SequenceModelProto.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      version_ = 0;
+
+      className_ = "";
+
+      if (serializedDataBuilder_ == null) {
+        serializedData_ = null;
+      } else {
+        serializedData_ = null;
+        serializedDataBuilder_ = null;
+      }
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return org.tribuo.protos.core.TribuoCore.internal_static_tribuo_core_SequenceModelProto_descriptor;
+    }
+
+    @java.lang.Override
+    public org.tribuo.protos.core.SequenceModelProto getDefaultInstanceForType() {
+      return org.tribuo.protos.core.SequenceModelProto.getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public org.tribuo.protos.core.SequenceModelProto build() {
+      org.tribuo.protos.core.SequenceModelProto result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public org.tribuo.protos.core.SequenceModelProto buildPartial() {
+      org.tribuo.protos.core.SequenceModelProto result = new org.tribuo.protos.core.SequenceModelProto(this);
+      result.version_ = version_;
+      result.className_ = className_;
+      if (serializedDataBuilder_ == null) {
+        result.serializedData_ = serializedData_;
+      } else {
+        result.serializedData_ = serializedDataBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    @java.lang.Override
+    public Builder clone() {
+      return super.clone();
+    }
+    @java.lang.Override
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.setField(field, value);
+    }
+    @java.lang.Override
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return super.clearField(field);
+    }
+    @java.lang.Override
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return super.clearOneof(oneof);
+    }
+    @java.lang.Override
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return super.setRepeatedField(field, index, value);
+    }
+    @java.lang.Override
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return super.addRepeatedField(field, value);
+    }
+    @java.lang.Override
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof org.tribuo.protos.core.SequenceModelProto) {
+        return mergeFrom((org.tribuo.protos.core.SequenceModelProto)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(org.tribuo.protos.core.SequenceModelProto other) {
+      if (other == org.tribuo.protos.core.SequenceModelProto.getDefaultInstance()) return this;
+      if (other.getVersion() != 0) {
+        setVersion(other.getVersion());
+      }
+      if (!other.getClassName().isEmpty()) {
+        className_ = other.className_;
+        onChanged();
+      }
+      if (other.hasSerializedData()) {
+        mergeSerializedData(other.getSerializedData());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    @java.lang.Override
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    @java.lang.Override
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      org.tribuo.protos.core.SequenceModelProto parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (org.tribuo.protos.core.SequenceModelProto) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int version_ ;
+    /**
+     * <code>int32 version = 1;</code>
+     * @return The version.
+     */
+    @java.lang.Override
+    public int getVersion() {
+      return version_;
+    }
+    /**
+     * <code>int32 version = 1;</code>
+     * @param value The version to set.
+     * @return This builder for chaining.
+     */
+    public Builder setVersion(int value) {
+      
+      version_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>int32 version = 1;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearVersion() {
+      
+      version_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object className_ = "";
+    /**
+     * <code>string class_name = 2;</code>
+     * @return The className.
+     */
+    public java.lang.String getClassName() {
+      java.lang.Object ref = className_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        className_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>string class_name = 2;</code>
+     * @return The bytes for className.
+     */
+    public com.google.protobuf.ByteString
+        getClassNameBytes() {
+      java.lang.Object ref = className_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        className_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>string class_name = 2;</code>
+     * @param value The className to set.
+     * @return This builder for chaining.
+     */
+    public Builder setClassName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      className_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string class_name = 2;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearClassName() {
+      
+      className_ = getDefaultInstance().getClassName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>string class_name = 2;</code>
+     * @param value The bytes for className to set.
+     * @return This builder for chaining.
+     */
+    public Builder setClassNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      className_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Any serializedData_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> serializedDataBuilder_;
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     * @return Whether the serializedData field is set.
+     */
+    public boolean hasSerializedData() {
+      return serializedDataBuilder_ != null || serializedData_ != null;
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     * @return The serializedData.
+     */
+    public com.google.protobuf.Any getSerializedData() {
+      if (serializedDataBuilder_ == null) {
+        return serializedData_ == null ? com.google.protobuf.Any.getDefaultInstance() : serializedData_;
+      } else {
+        return serializedDataBuilder_.getMessage();
+      }
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    public Builder setSerializedData(com.google.protobuf.Any value) {
+      if (serializedDataBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        serializedData_ = value;
+        onChanged();
+      } else {
+        serializedDataBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    public Builder setSerializedData(
+        com.google.protobuf.Any.Builder builderForValue) {
+      if (serializedDataBuilder_ == null) {
+        serializedData_ = builderForValue.build();
+        onChanged();
+      } else {
+        serializedDataBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    public Builder mergeSerializedData(com.google.protobuf.Any value) {
+      if (serializedDataBuilder_ == null) {
+        if (serializedData_ != null) {
+          serializedData_ =
+            com.google.protobuf.Any.newBuilder(serializedData_).mergeFrom(value).buildPartial();
+        } else {
+          serializedData_ = value;
+        }
+        onChanged();
+      } else {
+        serializedDataBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    public Builder clearSerializedData() {
+      if (serializedDataBuilder_ == null) {
+        serializedData_ = null;
+        onChanged();
+      } else {
+        serializedData_ = null;
+        serializedDataBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    public com.google.protobuf.Any.Builder getSerializedDataBuilder() {
+      
+      onChanged();
+      return getSerializedDataFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    public com.google.protobuf.AnyOrBuilder getSerializedDataOrBuilder() {
+      if (serializedDataBuilder_ != null) {
+        return serializedDataBuilder_.getMessageOrBuilder();
+      } else {
+        return serializedData_ == null ?
+            com.google.protobuf.Any.getDefaultInstance() : serializedData_;
+      }
+    }
+    /**
+     * <code>.google.protobuf.Any serialized_data = 3;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder> 
+        getSerializedDataFieldBuilder() {
+      if (serializedDataBuilder_ == null) {
+        serializedDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Any, com.google.protobuf.Any.Builder, com.google.protobuf.AnyOrBuilder>(
+                getSerializedData(),
+                getParentForChildren(),
+                isClean());
+        serializedData_ = null;
+      }
+      return serializedDataBuilder_;
+    }
+    @java.lang.Override
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFields(unknownFields);
+    }
+
+    @java.lang.Override
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:tribuo.core.SequenceModelProto)
+  }
+
+  // @@protoc_insertion_point(class_scope:tribuo.core.SequenceModelProto)
+  private static final org.tribuo.protos.core.SequenceModelProto DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new org.tribuo.protos.core.SequenceModelProto();
+  }
+
+  public static org.tribuo.protos.core.SequenceModelProto getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<SequenceModelProto>
+      PARSER = new com.google.protobuf.AbstractParser<SequenceModelProto>() {
+    @java.lang.Override
+    public SequenceModelProto parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new SequenceModelProto(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<SequenceModelProto> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<SequenceModelProto> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public org.tribuo.protos.core.SequenceModelProto getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/Core/src/main/java/org/tribuo/protos/core/SequenceModelProtoOrBuilder.java b/Core/src/main/java/org/tribuo/protos/core/SequenceModelProtoOrBuilder.java
new file mode 100644
index 000000000..18f888ac3
--- /dev/null
+++ b/Core/src/main/java/org/tribuo/protos/core/SequenceModelProtoOrBuilder.java
@@ -0,0 +1,42 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: tribuo-core.proto
+
+package org.tribuo.protos.core;
+
+public interface SequenceModelProtoOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:tribuo.core.SequenceModelProto)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>int32 version = 1;</code>
+   * @return The version.
+   */
+  int getVersion();
+
+  /**
+   * <code>string class_name = 2;</code>
+   * @return The className.
+   */
+  java.lang.String getClassName();
+  /**
+   * <code>string class_name = 2;</code>
+   * @return The bytes for className.
+   */
+  com.google.protobuf.ByteString
+      getClassNameBytes();
+
+  /**
+   * <code>.google.protobuf.Any serialized_data = 3;</code>
+   * @return Whether the serializedData field is set.
+   */
+  boolean hasSerializedData();
+  /**
+   * <code>.google.protobuf.Any serialized_data = 3;</code>
+   * @return The serializedData.
+   */
+  com.google.protobuf.Any getSerializedData();
+  /**
+   * <code>.google.protobuf.Any serialized_data = 3;</code>
+   */
+  com.google.protobuf.AnyOrBuilder getSerializedDataOrBuilder();
+}
diff --git a/Core/src/main/java/org/tribuo/protos/core/TribuoCore.java b/Core/src/main/java/org/tribuo/protos/core/TribuoCore.java
index 86721e925..e24629c26 100644
--- a/Core/src/main/java/org/tribuo/protos/core/TribuoCore.java
+++ b/Core/src/main/java/org/tribuo/protos/core/TribuoCore.java
@@ -19,6 +19,11 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_tribuo_core_ModelProto_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_tribuo_core_SequenceModelProto_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_tribuo_core_SequenceModelProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_tribuo_core_ModelDataProto_descriptor;
   static final 
@@ -127,69 +132,71 @@ public static void registerAllExtensions(
       "/protobuf/any.proto\032\021olcut_proto.proto\"`" +
       "\n\nModelProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_n" +
       "ame\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.goo" +
-      "gle.protobuf.Any\"\366\001\n\016ModelDataProto\022\014\n\004n" +
-      "ame\030\001 \001(\t\022.\n\nprovenance\030\002 \001(\0132\032.olcut.Ro" +
-      "otProvenanceProto\022\036\n\026generate_probabilit" +
-      "ies\030\003 \001(\010\0227\n\016feature_domain\030\004 \001(\0132\037.trib" +
-      "uo.core.FeatureDomainProto\0225\n\routput_dom" +
-      "ain\030\005 \001(\0132\036.tribuo.core.OutputDomainProt" +
-      "o\022\026\n\016tribuo_version\030\006 \001(\t\"h\n\022OutputFacto" +
-      "ryProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002" +
-      " \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.google.p" +
-      "rotobuf.Any\"h\n\022FeatureDomainProto\022\017\n\007ver" +
+      "gle.protobuf.Any\"h\n\022SequenceModelProto\022\017" +
+      "\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017s" +
+      "erialized_data\030\003 \001(\0132\024.google.protobuf.A" +
+      "ny\"\366\001\n\016ModelDataProto\022\014\n\004name\030\001 \001(\t\022.\n\np" +
+      "rovenance\030\002 \001(\0132\032.olcut.RootProvenancePr" +
+      "oto\022\036\n\026generate_probabilities\030\003 \001(\010\0227\n\016f" +
+      "eature_domain\030\004 \001(\0132\037.tribuo.core.Featur" +
+      "eDomainProto\0225\n\routput_domain\030\005 \001(\0132\036.tr" +
+      "ibuo.core.OutputDomainProto\022\026\n\016tribuo_ve" +
+      "rsion\030\006 \001(\t\"h\n\022OutputFactoryProto\022\017\n\007ver" +
       "sion\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serial" +
-      "ized_data\030\003 \001(\0132\024.google.protobuf.Any\"g\n" +
-      "\021VariableInfoProto\022\017\n\007version\030\001 \001(\005\022\022\n\nc" +
-      "lass_name\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\013" +
-      "2\024.google.protobuf.Any\"g\n\021OutputDomainPr" +
-      "oto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t" +
-      "\022-\n\017serialized_data\030\003 \001(\0132\024.google.proto" +
-      "buf.Any\"a\n\013OutputProto\022\017\n\007version\030\001 \001(\005\022" +
-      "\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_data\030\003" +
-      " \001(\0132\024.google.protobuf.Any\"b\n\014ExamplePro" +
-      "to\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022" +
-      "-\n\017serialized_data\030\003 \001(\0132\024.google.protob" +
-      "uf.Any\"b\n\014DatasetProto\022\017\n\007version\030\001 \001(\005\022" +
-      "\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_data\030\003" +
-      " \001(\0132\024.google.protobuf.Any\"j\n\024SequenceEx" +
-      "ampleProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_nam" +
-      "e\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.googl" +
-      "e.protobuf.Any\"j\n\024SequenceDatasetProto\022\017" +
+      "ized_data\030\003 \001(\0132\024.google.protobuf.Any\"h\n" +
+      "\022FeatureDomainProto\022\017\n\007version\030\001 \001(\005\022\022\n\n" +
+      "class_name\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(" +
+      "\0132\024.google.protobuf.Any\"g\n\021VariableInfoP" +
+      "roto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(" +
+      "\t\022-\n\017serialized_data\030\003 \001(\0132\024.google.prot" +
+      "obuf.Any\"g\n\021OutputDomainProto\022\017\n\007version" +
+      "\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized" +
+      "_data\030\003 \001(\0132\024.google.protobuf.Any\"a\n\013Out" +
+      "putProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030" +
+      "\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.google." +
+      "protobuf.Any\"b\n\014ExampleProto\022\017\n\007version\030" +
+      "\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_" +
+      "data\030\003 \001(\0132\024.google.protobuf.Any\"b\n\014Data" +
+      "setProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030" +
+      "\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.google." +
+      "protobuf.Any\"j\n\024SequenceExampleProto\022\017\n\007" +
+      "version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017ser" +
+      "ialized_data\030\003 \001(\0132\024.google.protobuf.Any" +
+      "\"j\n\024SequenceDatasetProto\022\017\n\007version\030\001 \001(" +
+      "\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_data" +
+      "\030\003 \001(\0132\024.google.protobuf.Any\"\275\002\n\020Dataset" +
+      "DataProto\022.\n\nprovenance\030\001 \001(\0132\032.olcut.Ro" +
+      "otProvenanceProto\0227\n\016feature_domain\030\002 \001(" +
+      "\0132\037.tribuo.core.FeatureDomainProto\0225\n\rou" +
+      "tput_domain\030\003 \001(\0132\036.tribuo.core.OutputDo" +
+      "mainProto\0228\n\024transform_provenance\030\004 \003(\0132" +
+      "\032.olcut.RootProvenanceProto\0227\n\016output_fa" +
+      "ctory\030\005 \001(\0132\037.tribuo.core.OutputFactoryP" +
+      "roto\022\026\n\016tribuo_version\030\006 \001(\t\"e\n\017Predicti" +
+      "onProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002" +
+      " \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.google.p" +
+      "rotobuf.Any\"k\n\025EnsembleCombinerProto\022\017\n\007" +
+      "version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017ser" +
+      "ialized_data\030\003 \001(\0132\024.google.protobuf.Any" +
+      "\"f\n\020TransformerProto\022\017\n\007version\030\001 \001(\005\022\022\n" +
+      "\nclass_name\030\002 \001(\t\022-\n\017serialized_data\030\003 \001" +
+      "(\0132\024.google.protobuf.Any\"J\n\024TransformerL" +
+      "istProto\0222\n\013transformer\030\001 \003(\0132\035.tribuo.c" +
+      "ore.TransformerProto\"\300\002\n\023TransformerMapP" +
+      "roto\022\017\n\007version\030\001 \001(\005\022H\n\014transformers\030\002 " +
+      "\003(\01322.tribuo.core.TransformerMapProto.Tr" +
+      "ansformersEntry\0225\n\021datasetProvenance\030\003 \001" +
+      "(\0132\032.olcut.RootProvenanceProto\022?\n\033transf" +
+      "ormationMapProvenance\030\004 \001(\0132\032.olcut.Root" +
+      "ProvenanceProto\032V\n\021TransformersEntry\022\013\n\003" +
+      "key\030\001 \001(\t\0220\n\005value\030\002 \001(\0132!.tribuo.core.T" +
+      "ransformerListProto:\0028\001\"a\n\013HasherProto\022\017" +
       "\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017s" +
       "erialized_data\030\003 \001(\0132\024.google.protobuf.A" +
-      "ny\"\275\002\n\020DatasetDataProto\022.\n\nprovenance\030\001 " +
-      "\001(\0132\032.olcut.RootProvenanceProto\0227\n\016featu" +
-      "re_domain\030\002 \001(\0132\037.tribuo.core.FeatureDom" +
-      "ainProto\0225\n\routput_domain\030\003 \001(\0132\036.tribuo" +
-      ".core.OutputDomainProto\0228\n\024transform_pro" +
-      "venance\030\004 \003(\0132\032.olcut.RootProvenanceProt" +
-      "o\0227\n\016output_factory\030\005 \001(\0132\037.tribuo.core." +
-      "OutputFactoryProto\022\026\n\016tribuo_version\030\006 \001" +
-      "(\t\"e\n\017PredictionProto\022\017\n\007version\030\001 \001(\005\022\022" +
-      "\n\nclass_name\030\002 \001(\t\022-\n\017serialized_data\030\003 " +
-      "\001(\0132\024.google.protobuf.Any\"k\n\025EnsembleCom" +
-      "binerProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_nam" +
-      "e\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.googl" +
-      "e.protobuf.Any\"f\n\020TransformerProto\022\017\n\007ve" +
-      "rsion\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017seria" +
-      "lized_data\030\003 \001(\0132\024.google.protobuf.Any\"J" +
-      "\n\024TransformerListProto\0222\n\013transformer\030\001 " +
-      "\003(\0132\035.tribuo.core.TransformerProto\"\300\002\n\023T" +
-      "ransformerMapProto\022\017\n\007version\030\001 \001(\005\022H\n\014t" +
-      "ransformers\030\002 \003(\01322.tribuo.core.Transfor" +
-      "merMapProto.TransformersEntry\0225\n\021dataset" +
-      "Provenance\030\003 \001(\0132\032.olcut.RootProvenanceP" +
-      "roto\022?\n\033transformationMapProvenance\030\004 \001(" +
-      "\0132\032.olcut.RootProvenanceProto\032V\n\021Transfo" +
-      "rmersEntry\022\013\n\003key\030\001 \001(\t\0220\n\005value\030\002 \001(\0132!" +
-      ".tribuo.core.TransformerListProto:\0028\001\"a\n" +
-      "\013HasherProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_n" +
-      "ame\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.goo" +
-      "gle.protobuf.Any\"o\n\021MeanVarianceProto\022\017\n" +
-      "\007version\030\001 \001(\005\022\013\n\003max\030\002 \001(\001\022\013\n\003min\030\003 \001(\001" +
-      "\022\014\n\004mean\030\004 \001(\001\022\022\n\nsumSquares\030\005 \001(\001\022\r\n\005co" +
-      "unt\030\006 \001(\003B\032\n\026org.tribuo.protos.coreP\001b\006p" +
-      "roto3"
+      "ny\"o\n\021MeanVarianceProto\022\017\n\007version\030\001 \001(\005" +
+      "\022\013\n\003max\030\002 \001(\001\022\013\n\003min\030\003 \001(\001\022\014\n\004mean\030\004 \001(\001" +
+      "\022\022\n\nsumSquares\030\005 \001(\001\022\r\n\005count\030\006 \001(\003B\032\n\026o" +
+      "rg.tribuo.protos.coreP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -203,98 +210,104 @@ public static void registerAllExtensions(
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_ModelProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
-    internal_static_tribuo_core_ModelDataProto_descriptor =
+    internal_static_tribuo_core_SequenceModelProto_descriptor =
       getDescriptor().getMessageTypes().get(1);
+    internal_static_tribuo_core_SequenceModelProto_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_tribuo_core_SequenceModelProto_descriptor,
+        new java.lang.String[] { "Version", "ClassName", "SerializedData", });
+    internal_static_tribuo_core_ModelDataProto_descriptor =
+      getDescriptor().getMessageTypes().get(2);
     internal_static_tribuo_core_ModelDataProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_ModelDataProto_descriptor,
         new java.lang.String[] { "Name", "Provenance", "GenerateProbabilities", "FeatureDomain", "OutputDomain", "TribuoVersion", });
     internal_static_tribuo_core_OutputFactoryProto_descriptor =
-      getDescriptor().getMessageTypes().get(2);
+      getDescriptor().getMessageTypes().get(3);
     internal_static_tribuo_core_OutputFactoryProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_OutputFactoryProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_FeatureDomainProto_descriptor =
-      getDescriptor().getMessageTypes().get(3);
+      getDescriptor().getMessageTypes().get(4);
     internal_static_tribuo_core_FeatureDomainProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_FeatureDomainProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_VariableInfoProto_descriptor =
-      getDescriptor().getMessageTypes().get(4);
+      getDescriptor().getMessageTypes().get(5);
     internal_static_tribuo_core_VariableInfoProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_VariableInfoProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_OutputDomainProto_descriptor =
-      getDescriptor().getMessageTypes().get(5);
+      getDescriptor().getMessageTypes().get(6);
     internal_static_tribuo_core_OutputDomainProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_OutputDomainProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_OutputProto_descriptor =
-      getDescriptor().getMessageTypes().get(6);
+      getDescriptor().getMessageTypes().get(7);
     internal_static_tribuo_core_OutputProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_OutputProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_ExampleProto_descriptor =
-      getDescriptor().getMessageTypes().get(7);
+      getDescriptor().getMessageTypes().get(8);
     internal_static_tribuo_core_ExampleProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_ExampleProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_DatasetProto_descriptor =
-      getDescriptor().getMessageTypes().get(8);
+      getDescriptor().getMessageTypes().get(9);
     internal_static_tribuo_core_DatasetProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_DatasetProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_SequenceExampleProto_descriptor =
-      getDescriptor().getMessageTypes().get(9);
+      getDescriptor().getMessageTypes().get(10);
     internal_static_tribuo_core_SequenceExampleProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_SequenceExampleProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_SequenceDatasetProto_descriptor =
-      getDescriptor().getMessageTypes().get(10);
+      getDescriptor().getMessageTypes().get(11);
     internal_static_tribuo_core_SequenceDatasetProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_SequenceDatasetProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_DatasetDataProto_descriptor =
-      getDescriptor().getMessageTypes().get(11);
+      getDescriptor().getMessageTypes().get(12);
     internal_static_tribuo_core_DatasetDataProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_DatasetDataProto_descriptor,
         new java.lang.String[] { "Provenance", "FeatureDomain", "OutputDomain", "TransformProvenance", "OutputFactory", "TribuoVersion", });
     internal_static_tribuo_core_PredictionProto_descriptor =
-      getDescriptor().getMessageTypes().get(12);
+      getDescriptor().getMessageTypes().get(13);
     internal_static_tribuo_core_PredictionProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_PredictionProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_EnsembleCombinerProto_descriptor =
-      getDescriptor().getMessageTypes().get(13);
+      getDescriptor().getMessageTypes().get(14);
     internal_static_tribuo_core_EnsembleCombinerProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_EnsembleCombinerProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_TransformerProto_descriptor =
-      getDescriptor().getMessageTypes().get(14);
+      getDescriptor().getMessageTypes().get(15);
     internal_static_tribuo_core_TransformerProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_TransformerProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_TransformerListProto_descriptor =
-      getDescriptor().getMessageTypes().get(15);
+      getDescriptor().getMessageTypes().get(16);
     internal_static_tribuo_core_TransformerListProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_TransformerListProto_descriptor,
         new java.lang.String[] { "Transformer", });
     internal_static_tribuo_core_TransformerMapProto_descriptor =
-      getDescriptor().getMessageTypes().get(16);
+      getDescriptor().getMessageTypes().get(17);
     internal_static_tribuo_core_TransformerMapProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_TransformerMapProto_descriptor,
@@ -306,13 +319,13 @@ public static void registerAllExtensions(
         internal_static_tribuo_core_TransformerMapProto_TransformersEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     internal_static_tribuo_core_HasherProto_descriptor =
-      getDescriptor().getMessageTypes().get(17);
+      getDescriptor().getMessageTypes().get(18);
     internal_static_tribuo_core_HasherProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_HasherProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     internal_static_tribuo_core_MeanVarianceProto_descriptor =
-      getDescriptor().getMessageTypes().get(18);
+      getDescriptor().getMessageTypes().get(19);
     internal_static_tribuo_core_MeanVarianceProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_tribuo_core_MeanVarianceProto_descriptor,
diff --git a/Core/src/main/java/org/tribuo/sequence/SequenceModel.java b/Core/src/main/java/org/tribuo/sequence/SequenceModel.java
index 13bb492f8..7a4ed559f 100644
--- a/Core/src/main/java/org/tribuo/sequence/SequenceModel.java
+++ b/Core/src/main/java/org/tribuo/sequence/SequenceModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,9 @@
 import org.tribuo.ImmutableOutputInfo;
 import org.tribuo.Output;
 import org.tribuo.Prediction;
+import org.tribuo.impl.ModelDataCarrier;
+import org.tribuo.protos.ProtoSerializable;
+import org.tribuo.protos.core.SequenceModelProto;
 import org.tribuo.provenance.ModelProvenance;
 
 import java.io.Serializable;
@@ -35,7 +38,7 @@
  * A prediction model, which is used to predict outputs for unseen instances.
  * @param <T> the type of the outputs used to train the model.
  */
-public abstract class SequenceModel<T extends Output<T>> implements Provenancable<ModelProvenance>, Serializable {
+public abstract class SequenceModel<T extends Output<T>> implements ProtoSerializable<SequenceModelProto>, Provenancable<ModelProvenance>, Serializable {
     private static final long serialVersionUID = 1L;
 
     protected String name;
@@ -164,7 +167,20 @@ public List<List<Prediction<T>>> predict(SequenceDataset<T> examples) {
         }
         return predictions;
     }
-    
+
+    @Override
+    public SequenceModelProto serialize() {
+        throw new UnsupportedOperationException("The default implementation of SequenceModel.serialize() must be overridden to support protobuf serialization.");
+    }
+
+    /**
+     * Constructs the data carrier for serialization.
+     * @return The serialization data carrier.
+     */
+    protected ModelDataCarrier<T> createDataCarrier() {
+        return new ModelDataCarrier<>(name,provenance,featureIDMap,outputIDMap,false,provenance.getTribuoVersion());
+    }
+
     /**
      * Gets the top {@code n} features associated with this model.
      * <p>
@@ -175,7 +191,7 @@ public List<List<Prediction<T>>> predict(SequenceDataset<T> examples) {
      * If the model cannot describe it's top features then it returns {@link java.util.Collections#emptyMap}.
      * </p>
      * @param n the number of features to return. If this value is less than 0,
-     * all features should be returned for each class, unless the model cannot score it's features.
+     * all features should be returned for each class, unless the model cannot score its features.
      * @return a map from string outputs to an ordered list of pairs of
      * feature names and weights associated with that feature in the model
      */
diff --git a/Core/src/main/resources/protos/tribuo-core.proto b/Core/src/main/resources/protos/tribuo-core.proto
index 3529b8a2d..5e302b10b 100644
--- a/Core/src/main/resources/protos/tribuo-core.proto
+++ b/Core/src/main/resources/protos/tribuo-core.proto
@@ -39,6 +39,15 @@ message ModelProto {
   google.protobuf.Any serialized_data = 3;
 }
 
+/*
+SequenceModel redirect proto
+ */
+message SequenceModelProto {
+  int32 version = 1;
+  string class_name = 2;
+  google.protobuf.Any serialized_data = 3;
+}
+
 /*
 Model data proto containing shared model fields
  */
diff --git a/Core/src/test/java/org/tribuo/test/Helpers.java b/Core/src/test/java/org/tribuo/test/Helpers.java
index e17ff680f..4a3df7bd2 100644
--- a/Core/src/test/java/org/tribuo/test/Helpers.java
+++ b/Core/src/test/java/org/tribuo/test/Helpers.java
@@ -34,10 +34,12 @@
 import org.tribuo.Model;
 import org.tribuo.MutableFeatureMap;
 import org.tribuo.Output;
+import org.tribuo.Prediction;
 import org.tribuo.impl.ListExample;
 import org.tribuo.protos.ProtoSerializable;
 import org.tribuo.protos.ProtoUtil;
 import org.tribuo.protos.core.DatasetProto;
+import org.tribuo.protos.core.ModelProto;
 import org.tribuo.protos.core.SequenceDatasetProto;
 import org.tribuo.sequence.SequenceDataset;
 import org.tribuo.sequence.SequenceModel;
@@ -202,6 +204,35 @@ public static <U extends Message, T extends ProtoSerializable<U>> T testProtoSer
         return deser;
     }
 
+    public static <T extends Output<T>> Model<T> testModelProtoSerialization(Model<T> model, Class<T> outputClazz, Dataset<T> data) {
+        // test provenance marshalling
+        testProvenanceMarshalling(model.getProvenance());
+
+        // serialize to proto
+        ModelProto proto = model.serialize();
+
+        // deserialize from proto
+        Model<?> deserializedModel = Model.deserialize(proto);
+
+        // check provenance is equal
+        assertEquals(model.getProvenance(), deserializedModel.getProvenance());
+        // validate that the model is still of the right type
+        assertTrue(deserializedModel.validate(outputClazz));
+        Model<T> deserModel = deserializedModel.castModel(outputClazz);
+
+        // validate the predictions are the same
+        List<Prediction<T>> modelPreds = model.predict(data);
+        List<Prediction<T>> deserPreds = deserModel.predict(data);
+        assertEquals(modelPreds.size(),deserPreds.size());
+        for (int i = 0; i < modelPreds.size(); i++) {
+            Prediction<T> cur = modelPreds.get(i);
+            Prediction<T> other = deserPreds.get(i);
+            assertTrue(cur.distributionEquals(other));
+        }
+
+        return deserModel;
+    }
+
     public static <T extends Output<T>> void testModelSerialization(Model<T> model, Class<T> outputClazz) {
         // test provenance marshalling
         testProvenanceMarshalling(model.getProvenance());
diff --git a/Math/src/main/java/org/tribuo/math/la/DenseSparseMatrix.java b/Math/src/main/java/org/tribuo/math/la/DenseSparseMatrix.java
index 24cba1f54..0b13eb85f 100644
--- a/Math/src/main/java/org/tribuo/math/la/DenseSparseMatrix.java
+++ b/Math/src/main/java/org/tribuo/math/la/DenseSparseMatrix.java
@@ -220,11 +220,6 @@ public static DenseSparseMatrix deserializeFromProto(int version, String classNa
 
     @Override
     public TensorProto serialize() {
-        TensorProto.Builder builder = TensorProto.newBuilder();
-
-        builder.setVersion(CURRENT_VERSION);
-        builder.setClassName(DenseSparseMatrix.class.getName());
-
         SparseTensorProto.Builder dataBuilder = SparseTensorProto.newBuilder();
         dataBuilder.addAllDimensions(Arrays.stream(shape).boxed().collect(Collectors.toList()));
         int numNonZero = 0;
@@ -245,6 +240,11 @@ public TensorProto serialize() {
         dataBuilder.setIndices(ByteString.copyFrom(indicesBuffer));
         dataBuilder.setValues(ByteString.copyFrom(valuesBuffer));
         dataBuilder.setNumNonZero(numNonZero);
+
+        TensorProto.Builder builder = TensorProto.newBuilder();
+
+        builder.setVersion(CURRENT_VERSION);
+        builder.setClassName(DenseSparseMatrix.class.getName());
         builder.setSerializedData(Any.pack(dataBuilder.build()));
 
         return builder.build();
diff --git a/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProto.java b/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProto.java
index e480db2ba..40f6863fe 100644
--- a/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProto.java
@@ -10,11 +10,11 @@
  *endian double precision floats.
  * </pre>
  *
- * Protobuf type {@code tribuo.core.AdaGradRDADenseTensorProto}
+ * Protobuf type {@code tribuo.math.impl.AdaGradRDADenseTensorProto}
  */
 public final class AdaGradRDADenseTensorProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.AdaGradRDADenseTensorProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.AdaGradRDADenseTensorProto)
     AdaGradRDADenseTensorProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use AdaGradRDADenseTensorProto.newBuilder() to construct.
@@ -119,13 +119,13 @@ private AdaGradRDADenseTensorProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_AdaGradRDADenseTensorProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_AdaGradRDADenseTensorProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.AdaGradRDADenseTensorProto.class, org.tribuo.math.protos.AdaGradRDADenseTensorProto.Builder.class);
   }
@@ -133,7 +133,7 @@ private AdaGradRDADenseTensorProto(
   public static final int DATA_FIELD_NUMBER = 1;
   private org.tribuo.math.protos.DenseTensorProto data_;
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return Whether the data field is set.
    */
   @java.lang.Override
@@ -141,7 +141,7 @@ public boolean hasData() {
     return data_ != null;
   }
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return The data.
    */
   @java.lang.Override
@@ -149,7 +149,7 @@ public org.tribuo.math.protos.DenseTensorProto getData() {
     return data_ == null ? org.tribuo.math.protos.DenseTensorProto.getDefaultInstance() : data_;
   }
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    */
   @java.lang.Override
   public org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder() {
@@ -463,21 +463,21 @@ protected Builder newBuilderForType(
    *endian double precision floats.
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.AdaGradRDADenseTensorProto}
+   * Protobuf type {@code tribuo.math.impl.AdaGradRDADenseTensorProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.AdaGradRDADenseTensorProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.AdaGradRDADenseTensorProto)
       org.tribuo.math.protos.AdaGradRDADenseTensorProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_AdaGradRDADenseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_AdaGradRDADenseTensorProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.AdaGradRDADenseTensorProto.class, org.tribuo.math.protos.AdaGradRDADenseTensorProto.Builder.class);
     }
@@ -524,7 +524,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_AdaGradRDADenseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_descriptor;
     }
 
     @java.lang.Override
@@ -657,14 +657,14 @@ public Builder mergeFrom(
     private com.google.protobuf.SingleFieldBuilderV3<
         org.tribuo.math.protos.DenseTensorProto, org.tribuo.math.protos.DenseTensorProto.Builder, org.tribuo.math.protos.DenseTensorProtoOrBuilder> dataBuilder_;
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      * @return Whether the data field is set.
      */
     public boolean hasData() {
       return dataBuilder_ != null || data_ != null;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      * @return The data.
      */
     public org.tribuo.math.protos.DenseTensorProto getData() {
@@ -675,7 +675,7 @@ public org.tribuo.math.protos.DenseTensorProto getData() {
       }
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder setData(org.tribuo.math.protos.DenseTensorProto value) {
       if (dataBuilder_ == null) {
@@ -691,7 +691,7 @@ public Builder setData(org.tribuo.math.protos.DenseTensorProto value) {
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder setData(
         org.tribuo.math.protos.DenseTensorProto.Builder builderForValue) {
@@ -705,7 +705,7 @@ public Builder setData(
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder mergeData(org.tribuo.math.protos.DenseTensorProto value) {
       if (dataBuilder_ == null) {
@@ -723,7 +723,7 @@ public Builder mergeData(org.tribuo.math.protos.DenseTensorProto value) {
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder clearData() {
       if (dataBuilder_ == null) {
@@ -737,7 +737,7 @@ public Builder clearData() {
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public org.tribuo.math.protos.DenseTensorProto.Builder getDataBuilder() {
       
@@ -745,7 +745,7 @@ public org.tribuo.math.protos.DenseTensorProto.Builder getDataBuilder() {
       return getDataFieldBuilder().getBuilder();
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder() {
       if (dataBuilder_ != null) {
@@ -756,7 +756,7 @@ public org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder() {
       }
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         org.tribuo.math.protos.DenseTensorProto, org.tribuo.math.protos.DenseTensorProto.Builder, org.tribuo.math.protos.DenseTensorProtoOrBuilder> 
@@ -973,10 +973,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.AdaGradRDADenseTensorProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.AdaGradRDADenseTensorProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.AdaGradRDADenseTensorProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.AdaGradRDADenseTensorProto)
   private static final org.tribuo.math.protos.AdaGradRDADenseTensorProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.AdaGradRDADenseTensorProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProtoOrBuilder.java
index 5e57cffb3..0c8a76aa8 100644
--- a/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/AdaGradRDADenseTensorProtoOrBuilder.java
@@ -4,21 +4,21 @@
 package org.tribuo.math.protos;
 
 public interface AdaGradRDADenseTensorProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.AdaGradRDADenseTensorProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.AdaGradRDADenseTensorProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return Whether the data field is set.
    */
   boolean hasData();
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return The data.
    */
   org.tribuo.math.protos.DenseTensorProto getData();
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    */
   org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder();
 
diff --git a/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProto.java b/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProto.java
index da70b436d..5adabe3cb 100644
--- a/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProto.java
@@ -8,11 +8,11 @@
  *NeighboursBruteForceFactory proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.BruteForceFactoryProto}
+ * Protobuf type {@code tribuo.math.impl.BruteForceFactoryProto}
  */
 public final class BruteForceFactoryProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.BruteForceFactoryProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.BruteForceFactoryProto)
     BruteForceFactoryProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use BruteForceFactoryProto.newBuilder() to construct.
@@ -85,13 +85,13 @@ private BruteForceFactoryProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_BruteForceFactoryProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_BruteForceFactoryProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_BruteForceFactoryProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_BruteForceFactoryProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.BruteForceFactoryProto.class, org.tribuo.math.protos.BruteForceFactoryProto.Builder.class);
   }
@@ -315,21 +315,21 @@ protected Builder newBuilderForType(
    *NeighboursBruteForceFactory proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.BruteForceFactoryProto}
+   * Protobuf type {@code tribuo.math.impl.BruteForceFactoryProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.BruteForceFactoryProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.BruteForceFactoryProto)
       org.tribuo.math.protos.BruteForceFactoryProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_BruteForceFactoryProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_BruteForceFactoryProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_BruteForceFactoryProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_BruteForceFactoryProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.BruteForceFactoryProto.class, org.tribuo.math.protos.BruteForceFactoryProto.Builder.class);
     }
@@ -362,7 +362,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_BruteForceFactoryProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_BruteForceFactoryProto_descriptor;
     }
 
     @java.lang.Override
@@ -587,10 +587,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.BruteForceFactoryProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.BruteForceFactoryProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.BruteForceFactoryProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.BruteForceFactoryProto)
   private static final org.tribuo.math.protos.BruteForceFactoryProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.BruteForceFactoryProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProtoOrBuilder.java
index b5d17d540..051ac502b 100644
--- a/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/BruteForceFactoryProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface BruteForceFactoryProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.BruteForceFactoryProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.BruteForceFactoryProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/DenseTensorProto.java b/Math/src/main/java/org/tribuo/math/protos/DenseTensorProto.java
index 50d29e553..3a2b7216b 100644
--- a/Math/src/main/java/org/tribuo/math/protos/DenseTensorProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/DenseTensorProto.java
@@ -10,11 +10,11 @@
  *endian double precision floats.
  * </pre>
  *
- * Protobuf type {@code tribuo.core.DenseTensorProto}
+ * Protobuf type {@code tribuo.math.impl.DenseTensorProto}
  */
 public final class DenseTensorProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.DenseTensorProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.DenseTensorProto)
     DenseTensorProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use DenseTensorProto.newBuilder() to construct.
@@ -107,13 +107,13 @@ private DenseTensorProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_DenseTensorProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_DenseTensorProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_DenseTensorProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_DenseTensorProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.DenseTensorProto.class, org.tribuo.math.protos.DenseTensorProto.Builder.class);
   }
@@ -347,21 +347,21 @@ protected Builder newBuilderForType(
    *endian double precision floats.
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.DenseTensorProto}
+   * Protobuf type {@code tribuo.math.impl.DenseTensorProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.DenseTensorProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.DenseTensorProto)
       org.tribuo.math.protos.DenseTensorProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_DenseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_DenseTensorProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_DenseTensorProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_DenseTensorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.DenseTensorProto.class, org.tribuo.math.protos.DenseTensorProto.Builder.class);
     }
@@ -394,7 +394,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_DenseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_DenseTensorProto_descriptor;
     }
 
     @java.lang.Override
@@ -637,10 +637,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.DenseTensorProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.DenseTensorProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.DenseTensorProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.DenseTensorProto)
   private static final org.tribuo.math.protos.DenseTensorProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.DenseTensorProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/DenseTensorProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/DenseTensorProtoOrBuilder.java
index a0e05a3ab..43a0b3756 100644
--- a/Math/src/main/java/org/tribuo/math/protos/DenseTensorProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/DenseTensorProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface DenseTensorProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.DenseTensorProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.DenseTensorProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProto.java b/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProto.java
index d3343bc08..69e4084fc 100644
--- a/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProto.java
@@ -8,11 +8,11 @@
  *KDTreeFactory proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.KDTreeFactoryProto}
+ * Protobuf type {@code tribuo.math.impl.KDTreeFactoryProto}
  */
 public final class KDTreeFactoryProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.KDTreeFactoryProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.KDTreeFactoryProto)
     KDTreeFactoryProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use KDTreeFactoryProto.newBuilder() to construct.
@@ -85,13 +85,13 @@ private KDTreeFactoryProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_KDTreeFactoryProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_KDTreeFactoryProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_KDTreeFactoryProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_KDTreeFactoryProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.KDTreeFactoryProto.class, org.tribuo.math.protos.KDTreeFactoryProto.Builder.class);
   }
@@ -315,21 +315,21 @@ protected Builder newBuilderForType(
    *KDTreeFactory proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.KDTreeFactoryProto}
+   * Protobuf type {@code tribuo.math.impl.KDTreeFactoryProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.KDTreeFactoryProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.KDTreeFactoryProto)
       org.tribuo.math.protos.KDTreeFactoryProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_KDTreeFactoryProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_KDTreeFactoryProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_KDTreeFactoryProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_KDTreeFactoryProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.KDTreeFactoryProto.class, org.tribuo.math.protos.KDTreeFactoryProto.Builder.class);
     }
@@ -362,7 +362,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_KDTreeFactoryProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_KDTreeFactoryProto_descriptor;
     }
 
     @java.lang.Override
@@ -587,10 +587,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.KDTreeFactoryProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.KDTreeFactoryProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.KDTreeFactoryProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.KDTreeFactoryProto)
   private static final org.tribuo.math.protos.KDTreeFactoryProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.KDTreeFactoryProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProtoOrBuilder.java
index cc2eaac12..d769bd2f4 100644
--- a/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/KDTreeFactoryProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface KDTreeFactoryProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.KDTreeFactoryProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.KDTreeFactoryProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/KernelProto.java b/Math/src/main/java/org/tribuo/math/protos/KernelProto.java
index 6ed9d3c4e..efe075a22 100644
--- a/Math/src/main/java/org/tribuo/math/protos/KernelProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/KernelProto.java
@@ -8,11 +8,11 @@
  *Kernel redirection proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.KernelProto}
+ * Protobuf type {@code tribuo.math.KernelProto}
  */
 public final class KernelProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.KernelProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.KernelProto)
     KernelProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use KernelProto.newBuilder() to construct.
@@ -98,13 +98,13 @@ private KernelProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_KernelProto_descriptor;
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_KernelProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_KernelProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_KernelProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.KernelProto.class, org.tribuo.math.protos.KernelProto.Builder.class);
   }
@@ -370,21 +370,21 @@ protected Builder newBuilderForType(
    *Kernel redirection proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.KernelProto}
+   * Protobuf type {@code tribuo.math.KernelProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.KernelProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.KernelProto)
       org.tribuo.math.protos.KernelProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_KernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_KernelProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_KernelProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_KernelProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.KernelProto.class, org.tribuo.math.protos.KernelProto.Builder.class);
     }
@@ -423,7 +423,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_KernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_KernelProto_descriptor;
     }
 
     @java.lang.Override
@@ -775,10 +775,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.KernelProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.KernelProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.KernelProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.KernelProto)
   private static final org.tribuo.math.protos.KernelProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.KernelProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/KernelProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/KernelProtoOrBuilder.java
index 1035d8d86..02345f98e 100644
--- a/Math/src/main/java/org/tribuo/math/protos/KernelProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/KernelProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface KernelProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.KernelProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.KernelProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/LinearParametersProto.java b/Math/src/main/java/org/tribuo/math/protos/LinearParametersProto.java
index ed12441ba..f3194da26 100644
--- a/Math/src/main/java/org/tribuo/math/protos/LinearParametersProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/LinearParametersProto.java
@@ -8,11 +8,11 @@
  *LinearParameters proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.LinearParametersProto}
+ * Protobuf type {@code tribuo.math.impl.LinearParametersProto}
  */
 public final class LinearParametersProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.LinearParametersProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.LinearParametersProto)
     LinearParametersProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use LinearParametersProto.newBuilder() to construct.
@@ -86,13 +86,13 @@ private LinearParametersProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_LinearParametersProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_LinearParametersProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_LinearParametersProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_LinearParametersProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.LinearParametersProto.class, org.tribuo.math.protos.LinearParametersProto.Builder.class);
   }
@@ -100,7 +100,7 @@ private LinearParametersProto(
   public static final int WEIGHTMATRIX_FIELD_NUMBER = 1;
   private org.tribuo.math.protos.TensorProto weightMatrix_;
   /**
-   * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+   * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
    * @return Whether the weightMatrix field is set.
    */
   @java.lang.Override
@@ -108,7 +108,7 @@ public boolean hasWeightMatrix() {
     return weightMatrix_ != null;
   }
   /**
-   * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+   * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
    * @return The weightMatrix.
    */
   @java.lang.Override
@@ -116,7 +116,7 @@ public org.tribuo.math.protos.TensorProto getWeightMatrix() {
     return weightMatrix_ == null ? org.tribuo.math.protos.TensorProto.getDefaultInstance() : weightMatrix_;
   }
   /**
-   * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+   * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
    */
   @java.lang.Override
   public org.tribuo.math.protos.TensorProtoOrBuilder getWeightMatrixOrBuilder() {
@@ -288,21 +288,21 @@ protected Builder newBuilderForType(
    *LinearParameters proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.LinearParametersProto}
+   * Protobuf type {@code tribuo.math.impl.LinearParametersProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.LinearParametersProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.LinearParametersProto)
       org.tribuo.math.protos.LinearParametersProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_LinearParametersProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_LinearParametersProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_LinearParametersProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_LinearParametersProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.LinearParametersProto.class, org.tribuo.math.protos.LinearParametersProto.Builder.class);
     }
@@ -337,7 +337,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_LinearParametersProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_LinearParametersProto_descriptor;
     }
 
     @java.lang.Override
@@ -446,14 +446,14 @@ public Builder mergeFrom(
     private com.google.protobuf.SingleFieldBuilderV3<
         org.tribuo.math.protos.TensorProto, org.tribuo.math.protos.TensorProto.Builder, org.tribuo.math.protos.TensorProtoOrBuilder> weightMatrixBuilder_;
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      * @return Whether the weightMatrix field is set.
      */
     public boolean hasWeightMatrix() {
       return weightMatrixBuilder_ != null || weightMatrix_ != null;
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      * @return The weightMatrix.
      */
     public org.tribuo.math.protos.TensorProto getWeightMatrix() {
@@ -464,7 +464,7 @@ public org.tribuo.math.protos.TensorProto getWeightMatrix() {
       }
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     public Builder setWeightMatrix(org.tribuo.math.protos.TensorProto value) {
       if (weightMatrixBuilder_ == null) {
@@ -480,7 +480,7 @@ public Builder setWeightMatrix(org.tribuo.math.protos.TensorProto value) {
       return this;
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     public Builder setWeightMatrix(
         org.tribuo.math.protos.TensorProto.Builder builderForValue) {
@@ -494,7 +494,7 @@ public Builder setWeightMatrix(
       return this;
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     public Builder mergeWeightMatrix(org.tribuo.math.protos.TensorProto value) {
       if (weightMatrixBuilder_ == null) {
@@ -512,7 +512,7 @@ public Builder mergeWeightMatrix(org.tribuo.math.protos.TensorProto value) {
       return this;
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     public Builder clearWeightMatrix() {
       if (weightMatrixBuilder_ == null) {
@@ -526,7 +526,7 @@ public Builder clearWeightMatrix() {
       return this;
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     public org.tribuo.math.protos.TensorProto.Builder getWeightMatrixBuilder() {
       
@@ -534,7 +534,7 @@ public org.tribuo.math.protos.TensorProto.Builder getWeightMatrixBuilder() {
       return getWeightMatrixFieldBuilder().getBuilder();
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     public org.tribuo.math.protos.TensorProtoOrBuilder getWeightMatrixOrBuilder() {
       if (weightMatrixBuilder_ != null) {
@@ -545,7 +545,7 @@ public org.tribuo.math.protos.TensorProtoOrBuilder getWeightMatrixOrBuilder() {
       }
     }
     /**
-     * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+     * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         org.tribuo.math.protos.TensorProto, org.tribuo.math.protos.TensorProto.Builder, org.tribuo.math.protos.TensorProtoOrBuilder> 
@@ -573,10 +573,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.LinearParametersProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.LinearParametersProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.LinearParametersProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.LinearParametersProto)
   private static final org.tribuo.math.protos.LinearParametersProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.LinearParametersProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/LinearParametersProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/LinearParametersProtoOrBuilder.java
index 834d34710..e8569db83 100644
--- a/Math/src/main/java/org/tribuo/math/protos/LinearParametersProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/LinearParametersProtoOrBuilder.java
@@ -4,21 +4,21 @@
 package org.tribuo.math.protos;
 
 public interface LinearParametersProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.LinearParametersProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.LinearParametersProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+   * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
    * @return Whether the weightMatrix field is set.
    */
   boolean hasWeightMatrix();
   /**
-   * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+   * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
    * @return The weightMatrix.
    */
   org.tribuo.math.protos.TensorProto getWeightMatrix();
   /**
-   * <code>.tribuo.core.TensorProto weightMatrix = 1;</code>
+   * <code>.tribuo.math.TensorProto weightMatrix = 1;</code>
    */
   org.tribuo.math.protos.TensorProtoOrBuilder getWeightMatrixOrBuilder();
 }
diff --git a/Math/src/main/java/org/tribuo/math/protos/MergerProto.java b/Math/src/main/java/org/tribuo/math/protos/MergerProto.java
index 191af2ea6..a7e061477 100644
--- a/Math/src/main/java/org/tribuo/math/protos/MergerProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/MergerProto.java
@@ -8,11 +8,11 @@
  *Merger redirection proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.MergerProto}
+ * Protobuf type {@code tribuo.math.MergerProto}
  */
 public final class MergerProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.MergerProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.MergerProto)
     MergerProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use MergerProto.newBuilder() to construct.
@@ -98,13 +98,13 @@ private MergerProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_MergerProto_descriptor;
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_MergerProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_MergerProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_MergerProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.MergerProto.class, org.tribuo.math.protos.MergerProto.Builder.class);
   }
@@ -370,21 +370,21 @@ protected Builder newBuilderForType(
    *Merger redirection proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.MergerProto}
+   * Protobuf type {@code tribuo.math.MergerProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.MergerProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.MergerProto)
       org.tribuo.math.protos.MergerProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_MergerProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_MergerProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_MergerProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_MergerProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.MergerProto.class, org.tribuo.math.protos.MergerProto.Builder.class);
     }
@@ -423,7 +423,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_MergerProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_MergerProto_descriptor;
     }
 
     @java.lang.Override
@@ -775,10 +775,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.MergerProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.MergerProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.MergerProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.MergerProto)
   private static final org.tribuo.math.protos.MergerProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.MergerProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/MergerProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/MergerProtoOrBuilder.java
index 38b47cae4..afb219ccf 100644
--- a/Math/src/main/java/org/tribuo/math/protos/MergerProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/MergerProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface MergerProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.MergerProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.MergerProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProto.java b/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProto.java
index c3c702a4d..3444f4795 100644
--- a/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProto.java
@@ -9,11 +9,11 @@
  *NeighboursQueryFactory redirection proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.NeighbourFactoryProto}
+ * Protobuf type {@code tribuo.math.NeighbourFactoryProto}
  */
 public final class NeighbourFactoryProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.NeighbourFactoryProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.NeighbourFactoryProto)
     NeighbourFactoryProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use NeighbourFactoryProto.newBuilder() to construct.
@@ -99,13 +99,13 @@ private NeighbourFactoryProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NeighbourFactoryProto_descriptor;
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NeighbourFactoryProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NeighbourFactoryProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NeighbourFactoryProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.NeighbourFactoryProto.class, org.tribuo.math.protos.NeighbourFactoryProto.Builder.class);
   }
@@ -372,21 +372,21 @@ protected Builder newBuilderForType(
    *NeighboursQueryFactory redirection proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.NeighbourFactoryProto}
+   * Protobuf type {@code tribuo.math.NeighbourFactoryProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.NeighbourFactoryProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.NeighbourFactoryProto)
       org.tribuo.math.protos.NeighbourFactoryProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NeighbourFactoryProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NeighbourFactoryProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NeighbourFactoryProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NeighbourFactoryProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.NeighbourFactoryProto.class, org.tribuo.math.protos.NeighbourFactoryProto.Builder.class);
     }
@@ -425,7 +425,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NeighbourFactoryProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NeighbourFactoryProto_descriptor;
     }
 
     @java.lang.Override
@@ -777,10 +777,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.NeighbourFactoryProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.NeighbourFactoryProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.NeighbourFactoryProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.NeighbourFactoryProto)
   private static final org.tribuo.math.protos.NeighbourFactoryProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.NeighbourFactoryProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProtoOrBuilder.java
index fba31e358..f7b403aa7 100644
--- a/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/NeighbourFactoryProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface NeighbourFactoryProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.NeighbourFactoryProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.NeighbourFactoryProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/NormalizerProto.java b/Math/src/main/java/org/tribuo/math/protos/NormalizerProto.java
index b4a8558fc..7892e60ff 100644
--- a/Math/src/main/java/org/tribuo/math/protos/NormalizerProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/NormalizerProto.java
@@ -8,11 +8,11 @@
  *VectorNormalizer redirection proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.NormalizerProto}
+ * Protobuf type {@code tribuo.math.NormalizerProto}
  */
 public final class NormalizerProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.NormalizerProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.NormalizerProto)
     NormalizerProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use NormalizerProto.newBuilder() to construct.
@@ -98,13 +98,13 @@ private NormalizerProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NormalizerProto_descriptor;
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NormalizerProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NormalizerProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NormalizerProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.NormalizerProto.class, org.tribuo.math.protos.NormalizerProto.Builder.class);
   }
@@ -370,21 +370,21 @@ protected Builder newBuilderForType(
    *VectorNormalizer redirection proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.NormalizerProto}
+   * Protobuf type {@code tribuo.math.NormalizerProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.NormalizerProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.NormalizerProto)
       org.tribuo.math.protos.NormalizerProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NormalizerProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NormalizerProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NormalizerProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NormalizerProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.NormalizerProto.class, org.tribuo.math.protos.NormalizerProto.Builder.class);
     }
@@ -423,7 +423,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_NormalizerProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_NormalizerProto_descriptor;
     }
 
     @java.lang.Override
@@ -775,10 +775,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.NormalizerProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.NormalizerProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.NormalizerProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.NormalizerProto)
   private static final org.tribuo.math.protos.NormalizerProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.NormalizerProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/NormalizerProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/NormalizerProtoOrBuilder.java
index d9341648d..c4cf5faae 100644
--- a/Math/src/main/java/org/tribuo/math/protos/NormalizerProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/NormalizerProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface NormalizerProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.NormalizerProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.NormalizerProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/ParametersProto.java b/Math/src/main/java/org/tribuo/math/protos/ParametersProto.java
index fba486ed5..4e34905e0 100644
--- a/Math/src/main/java/org/tribuo/math/protos/ParametersProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/ParametersProto.java
@@ -8,11 +8,11 @@
  *Parameters redirection proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.ParametersProto}
+ * Protobuf type {@code tribuo.math.ParametersProto}
  */
 public final class ParametersProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.ParametersProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.ParametersProto)
     ParametersProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use ParametersProto.newBuilder() to construct.
@@ -98,13 +98,13 @@ private ParametersProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_ParametersProto_descriptor;
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_ParametersProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_ParametersProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_ParametersProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.ParametersProto.class, org.tribuo.math.protos.ParametersProto.Builder.class);
   }
@@ -370,21 +370,21 @@ protected Builder newBuilderForType(
    *Parameters redirection proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.ParametersProto}
+   * Protobuf type {@code tribuo.math.ParametersProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.ParametersProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.ParametersProto)
       org.tribuo.math.protos.ParametersProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_ParametersProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_ParametersProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_ParametersProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_ParametersProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.ParametersProto.class, org.tribuo.math.protos.ParametersProto.Builder.class);
     }
@@ -423,7 +423,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_ParametersProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_ParametersProto_descriptor;
     }
 
     @java.lang.Override
@@ -775,10 +775,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.ParametersProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.ParametersProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.ParametersProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.ParametersProto)
   private static final org.tribuo.math.protos.ParametersProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.ParametersProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/ParametersProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/ParametersProtoOrBuilder.java
index efba2317d..daa02e237 100644
--- a/Math/src/main/java/org/tribuo/math/protos/ParametersProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/ParametersProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface ParametersProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.ParametersProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.ParametersProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProto.java b/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProto.java
index 615a1c3a5..a0e4e908c 100644
--- a/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProto.java
@@ -8,11 +8,11 @@
  *Polynomial kernel proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.PolynomialKernelProto}
+ * Protobuf type {@code tribuo.math.impl.PolynomialKernelProto}
  */
 public final class PolynomialKernelProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.PolynomialKernelProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.PolynomialKernelProto)
     PolynomialKernelProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use PolynomialKernelProto.newBuilder() to construct.
@@ -88,13 +88,13 @@ private PolynomialKernelProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_PolynomialKernelProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_PolynomialKernelProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_PolynomialKernelProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_PolynomialKernelProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.PolynomialKernelProto.class, org.tribuo.math.protos.PolynomialKernelProto.Builder.class);
   }
@@ -320,21 +320,21 @@ protected Builder newBuilderForType(
    *Polynomial kernel proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.PolynomialKernelProto}
+   * Protobuf type {@code tribuo.math.impl.PolynomialKernelProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.PolynomialKernelProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.PolynomialKernelProto)
       org.tribuo.math.protos.PolynomialKernelProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_PolynomialKernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_PolynomialKernelProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_PolynomialKernelProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_PolynomialKernelProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.PolynomialKernelProto.class, org.tribuo.math.protos.PolynomialKernelProto.Builder.class);
     }
@@ -369,7 +369,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_PolynomialKernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_PolynomialKernelProto_descriptor;
     }
 
     @java.lang.Override
@@ -583,10 +583,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.PolynomialKernelProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.PolynomialKernelProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.PolynomialKernelProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.PolynomialKernelProto)
   private static final org.tribuo.math.protos.PolynomialKernelProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.PolynomialKernelProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProtoOrBuilder.java
index dda8cf790..941457fcc 100644
--- a/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/PolynomialKernelProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface PolynomialKernelProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.PolynomialKernelProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.PolynomialKernelProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/RBFKernelProto.java b/Math/src/main/java/org/tribuo/math/protos/RBFKernelProto.java
index 066083488..302ed6a66 100644
--- a/Math/src/main/java/org/tribuo/math/protos/RBFKernelProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/RBFKernelProto.java
@@ -8,11 +8,11 @@
  *RBF kernel proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.RBFKernelProto}
+ * Protobuf type {@code tribuo.math.impl.RBFKernelProto}
  */
 public final class RBFKernelProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.RBFKernelProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.RBFKernelProto)
     RBFKernelProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use RBFKernelProto.newBuilder() to construct.
@@ -78,13 +78,13 @@ private RBFKernelProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_RBFKernelProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_RBFKernelProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_RBFKernelProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_RBFKernelProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.RBFKernelProto.class, org.tribuo.math.protos.RBFKernelProto.Builder.class);
   }
@@ -262,21 +262,21 @@ protected Builder newBuilderForType(
    *RBF kernel proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.RBFKernelProto}
+   * Protobuf type {@code tribuo.math.impl.RBFKernelProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.RBFKernelProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.RBFKernelProto)
       org.tribuo.math.protos.RBFKernelProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_RBFKernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_RBFKernelProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_RBFKernelProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_RBFKernelProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.RBFKernelProto.class, org.tribuo.math.protos.RBFKernelProto.Builder.class);
     }
@@ -307,7 +307,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_RBFKernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_RBFKernelProto_descriptor;
     }
 
     @java.lang.Override
@@ -451,10 +451,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.RBFKernelProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.RBFKernelProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.RBFKernelProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.RBFKernelProto)
   private static final org.tribuo.math.protos.RBFKernelProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.RBFKernelProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/RBFKernelProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/RBFKernelProtoOrBuilder.java
index f214ce109..5864a95ce 100644
--- a/Math/src/main/java/org/tribuo/math/protos/RBFKernelProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/RBFKernelProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface RBFKernelProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.RBFKernelProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.RBFKernelProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProto.java b/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProto.java
index b25e87c69..d83af1f5b 100644
--- a/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProto.java
@@ -8,11 +8,11 @@
  *ShrinkingTensor Proto, uses dense tensors.
  * </pre>
  *
- * Protobuf type {@code tribuo.core.ShrinkingDenseTensorProto}
+ * Protobuf type {@code tribuo.math.impl.ShrinkingDenseTensorProto}
  */
 public final class ShrinkingDenseTensorProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.ShrinkingDenseTensorProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.ShrinkingDenseTensorProto)
     ShrinkingDenseTensorProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use ShrinkingDenseTensorProto.newBuilder() to construct.
@@ -121,13 +121,13 @@ private ShrinkingDenseTensorProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_ShrinkingDenseTensorProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_ShrinkingDenseTensorProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.ShrinkingDenseTensorProto.class, org.tribuo.math.protos.ShrinkingDenseTensorProto.Builder.class);
   }
@@ -135,7 +135,7 @@ private ShrinkingDenseTensorProto(
   public static final int DATA_FIELD_NUMBER = 1;
   private org.tribuo.math.protos.DenseTensorProto data_;
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return Whether the data field is set.
    */
   @java.lang.Override
@@ -143,7 +143,7 @@ public boolean hasData() {
     return data_ != null;
   }
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return The data.
    */
   @java.lang.Override
@@ -151,7 +151,7 @@ public org.tribuo.math.protos.DenseTensorProto getData() {
     return data_ == null ? org.tribuo.math.protos.DenseTensorProto.getDefaultInstance() : data_;
   }
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    */
   @java.lang.Override
   public org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder() {
@@ -487,21 +487,21 @@ protected Builder newBuilderForType(
    *ShrinkingTensor Proto, uses dense tensors.
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.ShrinkingDenseTensorProto}
+   * Protobuf type {@code tribuo.math.impl.ShrinkingDenseTensorProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.ShrinkingDenseTensorProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.ShrinkingDenseTensorProto)
       org.tribuo.math.protos.ShrinkingDenseTensorProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_ShrinkingDenseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_ShrinkingDenseTensorProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.ShrinkingDenseTensorProto.class, org.tribuo.math.protos.ShrinkingDenseTensorProto.Builder.class);
     }
@@ -550,7 +550,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_ShrinkingDenseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_descriptor;
     }
 
     @java.lang.Override
@@ -687,14 +687,14 @@ public Builder mergeFrom(
     private com.google.protobuf.SingleFieldBuilderV3<
         org.tribuo.math.protos.DenseTensorProto, org.tribuo.math.protos.DenseTensorProto.Builder, org.tribuo.math.protos.DenseTensorProtoOrBuilder> dataBuilder_;
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      * @return Whether the data field is set.
      */
     public boolean hasData() {
       return dataBuilder_ != null || data_ != null;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      * @return The data.
      */
     public org.tribuo.math.protos.DenseTensorProto getData() {
@@ -705,7 +705,7 @@ public org.tribuo.math.protos.DenseTensorProto getData() {
       }
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder setData(org.tribuo.math.protos.DenseTensorProto value) {
       if (dataBuilder_ == null) {
@@ -721,7 +721,7 @@ public Builder setData(org.tribuo.math.protos.DenseTensorProto value) {
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder setData(
         org.tribuo.math.protos.DenseTensorProto.Builder builderForValue) {
@@ -735,7 +735,7 @@ public Builder setData(
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder mergeData(org.tribuo.math.protos.DenseTensorProto value) {
       if (dataBuilder_ == null) {
@@ -753,7 +753,7 @@ public Builder mergeData(org.tribuo.math.protos.DenseTensorProto value) {
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public Builder clearData() {
       if (dataBuilder_ == null) {
@@ -767,7 +767,7 @@ public Builder clearData() {
       return this;
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public org.tribuo.math.protos.DenseTensorProto.Builder getDataBuilder() {
       
@@ -775,7 +775,7 @@ public org.tribuo.math.protos.DenseTensorProto.Builder getDataBuilder() {
       return getDataFieldBuilder().getBuilder();
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     public org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder() {
       if (dataBuilder_ != null) {
@@ -786,7 +786,7 @@ public org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder() {
       }
     }
     /**
-     * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+     * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
         org.tribuo.math.protos.DenseTensorProto, org.tribuo.math.protos.DenseTensorProto.Builder, org.tribuo.math.protos.DenseTensorProtoOrBuilder> 
@@ -1031,10 +1031,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.ShrinkingDenseTensorProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.ShrinkingDenseTensorProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.ShrinkingDenseTensorProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.ShrinkingDenseTensorProto)
   private static final org.tribuo.math.protos.ShrinkingDenseTensorProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.ShrinkingDenseTensorProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProtoOrBuilder.java
index 7b56d62cb..636735e85 100644
--- a/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/ShrinkingDenseTensorProtoOrBuilder.java
@@ -4,21 +4,21 @@
 package org.tribuo.math.protos;
 
 public interface ShrinkingDenseTensorProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.ShrinkingDenseTensorProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.ShrinkingDenseTensorProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return Whether the data field is set.
    */
   boolean hasData();
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    * @return The data.
    */
   org.tribuo.math.protos.DenseTensorProto getData();
   /**
-   * <code>.tribuo.core.DenseTensorProto data = 1;</code>
+   * <code>.tribuo.math.impl.DenseTensorProto data = 1;</code>
    */
   org.tribuo.math.protos.DenseTensorProtoOrBuilder getDataOrBuilder();
 
diff --git a/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProto.java b/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProto.java
index 6bf77e0fd..1b0e22688 100644
--- a/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProto.java
@@ -8,11 +8,11 @@
  *Sigmoid kernel proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.SigmoidKernelProto}
+ * Protobuf type {@code tribuo.math.impl.SigmoidKernelProto}
  */
 public final class SigmoidKernelProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.SigmoidKernelProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.SigmoidKernelProto)
     SigmoidKernelProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use SigmoidKernelProto.newBuilder() to construct.
@@ -83,13 +83,13 @@ private SigmoidKernelProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SigmoidKernelProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SigmoidKernelProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SigmoidKernelProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SigmoidKernelProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.SigmoidKernelProto.class, org.tribuo.math.protos.SigmoidKernelProto.Builder.class);
   }
@@ -291,21 +291,21 @@ protected Builder newBuilderForType(
    *Sigmoid kernel proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.SigmoidKernelProto}
+   * Protobuf type {@code tribuo.math.impl.SigmoidKernelProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.SigmoidKernelProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.SigmoidKernelProto)
       org.tribuo.math.protos.SigmoidKernelProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SigmoidKernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SigmoidKernelProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SigmoidKernelProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SigmoidKernelProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.SigmoidKernelProto.class, org.tribuo.math.protos.SigmoidKernelProto.Builder.class);
     }
@@ -338,7 +338,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SigmoidKernelProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SigmoidKernelProto_descriptor;
     }
 
     @java.lang.Override
@@ -517,10 +517,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.SigmoidKernelProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.SigmoidKernelProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.SigmoidKernelProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.SigmoidKernelProto)
   private static final org.tribuo.math.protos.SigmoidKernelProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.SigmoidKernelProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProtoOrBuilder.java
index 4c19c062f..2b31cafe2 100644
--- a/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/SigmoidKernelProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface SigmoidKernelProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.SigmoidKernelProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.SigmoidKernelProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/SparseTensorProto.java b/Math/src/main/java/org/tribuo/math/protos/SparseTensorProto.java
index 2333dafbf..49827561d 100644
--- a/Math/src/main/java/org/tribuo/math/protos/SparseTensorProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/SparseTensorProto.java
@@ -10,11 +10,11 @@
  *endian double precision floats for values and little endian ints for indices.
  * </pre>
  *
- * Protobuf type {@code tribuo.core.SparseTensorProto}
+ * Protobuf type {@code tribuo.math.impl.SparseTensorProto}
  */
 public final class SparseTensorProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.SparseTensorProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.impl.SparseTensorProto)
     SparseTensorProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use SparseTensorProto.newBuilder() to construct.
@@ -118,13 +118,13 @@ private SparseTensorProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SparseTensorProto_descriptor;
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SparseTensorProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SparseTensorProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SparseTensorProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.SparseTensorProto.class, org.tribuo.math.protos.SparseTensorProto.Builder.class);
   }
@@ -402,21 +402,21 @@ protected Builder newBuilderForType(
    *endian double precision floats for values and little endian ints for indices.
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.SparseTensorProto}
+   * Protobuf type {@code tribuo.math.impl.SparseTensorProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.SparseTensorProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.impl.SparseTensorProto)
       org.tribuo.math.protos.SparseTensorProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SparseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SparseTensorProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SparseTensorProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SparseTensorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.SparseTensorProto.class, org.tribuo.math.protos.SparseTensorProto.Builder.class);
     }
@@ -453,7 +453,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_core_SparseTensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMathImpl.internal_static_tribuo_math_impl_SparseTensorProto_descriptor;
     }
 
     @java.lang.Override
@@ -769,10 +769,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.SparseTensorProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.impl.SparseTensorProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.SparseTensorProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.impl.SparseTensorProto)
   private static final org.tribuo.math.protos.SparseTensorProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.SparseTensorProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/SparseTensorProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/SparseTensorProtoOrBuilder.java
index 3322ba20c..bbb6051b8 100644
--- a/Math/src/main/java/org/tribuo/math/protos/SparseTensorProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/SparseTensorProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface SparseTensorProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.SparseTensorProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.impl.SparseTensorProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/TensorProto.java b/Math/src/main/java/org/tribuo/math/protos/TensorProto.java
index fa08a9e0e..298979e16 100644
--- a/Math/src/main/java/org/tribuo/math/protos/TensorProto.java
+++ b/Math/src/main/java/org/tribuo/math/protos/TensorProto.java
@@ -8,11 +8,11 @@
  *Tensor redirection proto
  * </pre>
  *
- * Protobuf type {@code tribuo.core.TensorProto}
+ * Protobuf type {@code tribuo.math.TensorProto}
  */
 public final class TensorProto extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:tribuo.core.TensorProto)
+    // @@protoc_insertion_point(message_implements:tribuo.math.TensorProto)
     TensorProtoOrBuilder {
 private static final long serialVersionUID = 0L;
   // Use TensorProto.newBuilder() to construct.
@@ -98,13 +98,13 @@ private TensorProto(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_TensorProto_descriptor;
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_TensorProto_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_TensorProto_fieldAccessorTable
+    return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_TensorProto_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             org.tribuo.math.protos.TensorProto.class, org.tribuo.math.protos.TensorProto.Builder.class);
   }
@@ -370,21 +370,21 @@ protected Builder newBuilderForType(
    *Tensor redirection proto
    * </pre>
    *
-   * Protobuf type {@code tribuo.core.TensorProto}
+   * Protobuf type {@code tribuo.math.TensorProto}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:tribuo.core.TensorProto)
+      // @@protoc_insertion_point(builder_implements:tribuo.math.TensorProto)
       org.tribuo.math.protos.TensorProtoOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_TensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_TensorProto_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_TensorProto_fieldAccessorTable
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_TensorProto_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.tribuo.math.protos.TensorProto.class, org.tribuo.math.protos.TensorProto.Builder.class);
     }
@@ -423,7 +423,7 @@ public Builder clear() {
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_core_TensorProto_descriptor;
+      return org.tribuo.math.protos.TribuoMath.internal_static_tribuo_math_TensorProto_descriptor;
     }
 
     @java.lang.Override
@@ -775,10 +775,10 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:tribuo.core.TensorProto)
+    // @@protoc_insertion_point(builder_scope:tribuo.math.TensorProto)
   }
 
-  // @@protoc_insertion_point(class_scope:tribuo.core.TensorProto)
+  // @@protoc_insertion_point(class_scope:tribuo.math.TensorProto)
   private static final org.tribuo.math.protos.TensorProto DEFAULT_INSTANCE;
   static {
     DEFAULT_INSTANCE = new org.tribuo.math.protos.TensorProto();
diff --git a/Math/src/main/java/org/tribuo/math/protos/TensorProtoOrBuilder.java b/Math/src/main/java/org/tribuo/math/protos/TensorProtoOrBuilder.java
index 4eb6db8b0..93adcd939 100644
--- a/Math/src/main/java/org/tribuo/math/protos/TensorProtoOrBuilder.java
+++ b/Math/src/main/java/org/tribuo/math/protos/TensorProtoOrBuilder.java
@@ -4,7 +4,7 @@
 package org.tribuo.math.protos;
 
 public interface TensorProtoOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:tribuo.core.TensorProto)
+    // @@protoc_insertion_point(interface_extends:tribuo.math.TensorProto)
     com.google.protobuf.MessageOrBuilder {
 
   /**
diff --git a/Math/src/main/java/org/tribuo/math/protos/TribuoMath.java b/Math/src/main/java/org/tribuo/math/protos/TribuoMath.java
index db92f0b05..d8c4545cb 100644
--- a/Math/src/main/java/org/tribuo/math/protos/TribuoMath.java
+++ b/Math/src/main/java/org/tribuo/math/protos/TribuoMath.java
@@ -15,35 +15,35 @@ public static void registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_KernelProto_descriptor;
+    internal_static_tribuo_math_KernelProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_KernelProto_fieldAccessorTable;
+      internal_static_tribuo_math_KernelProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_MergerProto_descriptor;
+    internal_static_tribuo_math_MergerProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_MergerProto_fieldAccessorTable;
+      internal_static_tribuo_math_MergerProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_NeighbourFactoryProto_descriptor;
+    internal_static_tribuo_math_NeighbourFactoryProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_NeighbourFactoryProto_fieldAccessorTable;
+      internal_static_tribuo_math_NeighbourFactoryProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_NormalizerProto_descriptor;
+    internal_static_tribuo_math_NormalizerProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_NormalizerProto_fieldAccessorTable;
+      internal_static_tribuo_math_NormalizerProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_ParametersProto_descriptor;
+    internal_static_tribuo_math_ParametersProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_ParametersProto_fieldAccessorTable;
+      internal_static_tribuo_math_ParametersProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_TensorProto_descriptor;
+    internal_static_tribuo_math_TensorProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_TensorProto_fieldAccessorTable;
+      internal_static_tribuo_math_TensorProto_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -53,72 +53,67 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021tribuo-math.proto\022\013tribuo.core\032\031google" +
-      "/protobuf/any.proto\032\021tribuo-core.proto\032\021" +
-      "olcut_proto.proto\"a\n\013KernelProto\022\017\n\007vers" +
-      "ion\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017seriali" +
-      "zed_data\030\003 \001(\0132\024.google.protobuf.Any\"a\n\013" +
-      "MergerProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_na" +
-      "me\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.goog" +
-      "le.protobuf.Any\"k\n\025NeighbourFactoryProto" +
-      "\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n" +
-      "\017serialized_data\030\003 \001(\0132\024.google.protobuf" +
-      ".Any\"e\n\017NormalizerProto\022\017\n\007version\030\001 \001(\005" +
-      "\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_data\030" +
-      "\003 \001(\0132\024.google.protobuf.Any\"e\n\017Parameter" +
-      "sProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 " +
-      "\001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.google.pr" +
-      "otobuf.Any\"a\n\013TensorProto\022\017\n\007version\030\001 \001" +
+      "\n\021tribuo-math.proto\022\013tribuo.math\032\031google" +
+      "/protobuf/any.proto\"a\n\013KernelProto\022\017\n\007ve" +
+      "rsion\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017seria" +
+      "lized_data\030\003 \001(\0132\024.google.protobuf.Any\"a" +
+      "\n\013MergerProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_" +
+      "name\030\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.go" +
+      "ogle.protobuf.Any\"k\n\025NeighbourFactoryPro" +
+      "to\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030\002 \001(\t\022" +
+      "-\n\017serialized_data\030\003 \001(\0132\024.google.protob" +
+      "uf.Any\"e\n\017NormalizerProto\022\017\n\007version\030\001 \001" +
       "(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_dat" +
-      "a\030\003 \001(\0132\024.google.protobuf.AnyB\032\n\026org.tri" +
-      "buo.math.protosP\001b\006proto3"
+      "a\030\003 \001(\0132\024.google.protobuf.Any\"e\n\017Paramet" +
+      "ersProto\022\017\n\007version\030\001 \001(\005\022\022\n\nclass_name\030" +
+      "\002 \001(\t\022-\n\017serialized_data\030\003 \001(\0132\024.google." +
+      "protobuf.Any\"a\n\013TensorProto\022\017\n\007version\030\001" +
+      " \001(\005\022\022\n\nclass_name\030\002 \001(\t\022-\n\017serialized_d" +
+      "ata\030\003 \001(\0132\024.google.protobuf.AnyB\032\n\026org.t" +
+      "ribuo.math.protosP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           com.google.protobuf.AnyProto.getDescriptor(),
-          org.tribuo.protos.core.TribuoCore.getDescriptor(),
-          com.oracle.labs.mlrg.olcut.config.protobuf.protos.OlcutProto.getDescriptor(),
         });
-    internal_static_tribuo_core_KernelProto_descriptor =
+    internal_static_tribuo_math_KernelProto_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_tribuo_core_KernelProto_fieldAccessorTable = new
+    internal_static_tribuo_math_KernelProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_KernelProto_descriptor,
+        internal_static_tribuo_math_KernelProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
-    internal_static_tribuo_core_MergerProto_descriptor =
+    internal_static_tribuo_math_MergerProto_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_tribuo_core_MergerProto_fieldAccessorTable = new
+    internal_static_tribuo_math_MergerProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_MergerProto_descriptor,
+        internal_static_tribuo_math_MergerProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
-    internal_static_tribuo_core_NeighbourFactoryProto_descriptor =
+    internal_static_tribuo_math_NeighbourFactoryProto_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_tribuo_core_NeighbourFactoryProto_fieldAccessorTable = new
+    internal_static_tribuo_math_NeighbourFactoryProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_NeighbourFactoryProto_descriptor,
+        internal_static_tribuo_math_NeighbourFactoryProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
-    internal_static_tribuo_core_NormalizerProto_descriptor =
+    internal_static_tribuo_math_NormalizerProto_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_tribuo_core_NormalizerProto_fieldAccessorTable = new
+    internal_static_tribuo_math_NormalizerProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_NormalizerProto_descriptor,
+        internal_static_tribuo_math_NormalizerProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
-    internal_static_tribuo_core_ParametersProto_descriptor =
+    internal_static_tribuo_math_ParametersProto_descriptor =
       getDescriptor().getMessageTypes().get(4);
-    internal_static_tribuo_core_ParametersProto_fieldAccessorTable = new
+    internal_static_tribuo_math_ParametersProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_ParametersProto_descriptor,
+        internal_static_tribuo_math_ParametersProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
-    internal_static_tribuo_core_TensorProto_descriptor =
+    internal_static_tribuo_math_TensorProto_descriptor =
       getDescriptor().getMessageTypes().get(5);
-    internal_static_tribuo_core_TensorProto_fieldAccessorTable = new
+    internal_static_tribuo_math_TensorProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_TensorProto_descriptor,
+        internal_static_tribuo_math_TensorProto_descriptor,
         new java.lang.String[] { "Version", "ClassName", "SerializedData", });
     com.google.protobuf.AnyProto.getDescriptor();
-    org.tribuo.protos.core.TribuoCore.getDescriptor();
-    com.oracle.labs.mlrg.olcut.config.protobuf.protos.OlcutProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/Math/src/main/java/org/tribuo/math/protos/TribuoMathImpl.java b/Math/src/main/java/org/tribuo/math/protos/TribuoMathImpl.java
index 32fe593ba..fa62d2ac7 100644
--- a/Math/src/main/java/org/tribuo/math/protos/TribuoMathImpl.java
+++ b/Math/src/main/java/org/tribuo/math/protos/TribuoMathImpl.java
@@ -15,55 +15,55 @@ public static void registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_DenseTensorProto_descriptor;
+    internal_static_tribuo_math_impl_DenseTensorProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_DenseTensorProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_DenseTensorProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_SparseTensorProto_descriptor;
+    internal_static_tribuo_math_impl_SparseTensorProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_SparseTensorProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_SparseTensorProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_LinearParametersProto_descriptor;
+    internal_static_tribuo_math_impl_LinearParametersProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_LinearParametersProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_LinearParametersProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_ShrinkingDenseTensorProto_descriptor;
+    internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_ShrinkingDenseTensorProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_AdaGradRDADenseTensorProto_descriptor;
+    internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_AdaGradRDADenseTensorProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_PolynomialKernelProto_descriptor;
+    internal_static_tribuo_math_impl_PolynomialKernelProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_PolynomialKernelProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_PolynomialKernelProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_RBFKernelProto_descriptor;
+    internal_static_tribuo_math_impl_RBFKernelProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_RBFKernelProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_RBFKernelProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_SigmoidKernelProto_descriptor;
+    internal_static_tribuo_math_impl_SigmoidKernelProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_SigmoidKernelProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_SigmoidKernelProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_BruteForceFactoryProto_descriptor;
+    internal_static_tribuo_math_impl_BruteForceFactoryProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_BruteForceFactoryProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_BruteForceFactoryProto_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_tribuo_core_KDTreeFactoryProto_descriptor;
+    internal_static_tribuo_math_impl_KDTreeFactoryProto_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_tribuo_core_KDTreeFactoryProto_fieldAccessorTable;
+      internal_static_tribuo_math_impl_KDTreeFactoryProto_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -73,97 +73,97 @@ public static void registerAllExtensions(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026tribuo-math-impl.proto\022\013tribuo.core\032\021t" +
-      "ribuo-math.proto\"6\n\020DenseTensorProto\022\022\n\n" +
-      "dimensions\030\001 \003(\005\022\016\n\006values\030\002 \001(\014\"\\\n\021Spar" +
-      "seTensorProto\022\022\n\ndimensions\030\001 \003(\005\022\022\n\nnum" +
-      "NonZero\030\002 \001(\005\022\017\n\007indices\030\003 \001(\014\022\016\n\006values" +
-      "\030\004 \001(\014\"G\n\025LinearParametersProto\022.\n\014weigh" +
-      "tMatrix\030\001 \001(\0132\030.tribuo.core.TensorProto\"" +
-      "\330\001\n\031ShrinkingDenseTensorProto\022+\n\004data\030\001 " +
-      "\001(\0132\035.tribuo.core.DenseTensorProto\022\020\n\010ba" +
-      "seRate\030\002 \001(\001\022\022\n\nlambdaSqrt\030\003 \001(\001\022\026\n\016scal" +
-      "eShrinking\030\004 \001(\010\022\021\n\treproject\030\005 \001(\010\022\026\n\016s" +
-      "quaredTwoNorm\030\006 \001(\001\022\021\n\titeration\030\007 \001(\005\022\022" +
-      "\n\nmultiplier\030\010 \001(\001\"\256\001\n\032AdaGradRDADenseTe" +
-      "nsorProto\022+\n\004data\030\001 \001(\0132\035.tribuo.core.De" +
-      "nseTensorProto\022\024\n\014learningRate\030\002 \001(\001\022\017\n\007" +
-      "epsilon\030\003 \001(\001\022\n\n\002l1\030\004 \001(\001\022\n\n\002l2\030\005 \001(\001\022\021\n" +
-      "\tgradNorms\030\006 \001(\014\022\021\n\titeration\030\007 \001(\005\"I\n\025P" +
-      "olynomialKernelProto\022\r\n\005gamma\030\001 \001(\001\022\021\n\ti" +
-      "ntercept\030\002 \001(\001\022\016\n\006degree\030\003 \001(\001\"\037\n\016RBFKer" +
-      "nelProto\022\r\n\005gamma\030\001 \001(\001\"6\n\022SigmoidKernel" +
-      "Proto\022\r\n\005gamma\030\001 \001(\001\022\021\n\tintercept\030\002 \001(\001\"" +
-      "B\n\026BruteForceFactoryProto\022\022\n\nnumThreads\030" +
-      "\001 \001(\005\022\024\n\014distanceType\030\002 \001(\t\">\n\022KDTreeFac" +
-      "toryProto\022\022\n\nnumThreads\030\001 \001(\005\022\024\n\014distanc" +
-      "eType\030\002 \001(\tB\032\n\026org.tribuo.math.protosP\001b" +
-      "\006proto3"
+      "\n\026tribuo-math-impl.proto\022\020tribuo.math.im" +
+      "pl\032\021tribuo-math.proto\"6\n\020DenseTensorProt" +
+      "o\022\022\n\ndimensions\030\001 \003(\005\022\016\n\006values\030\002 \001(\014\"\\\n" +
+      "\021SparseTensorProto\022\022\n\ndimensions\030\001 \003(\005\022\022" +
+      "\n\nnumNonZero\030\002 \001(\005\022\017\n\007indices\030\003 \001(\014\022\016\n\006v" +
+      "alues\030\004 \001(\014\"G\n\025LinearParametersProto\022.\n\014" +
+      "weightMatrix\030\001 \001(\0132\030.tribuo.math.TensorP" +
+      "roto\"\335\001\n\031ShrinkingDenseTensorProto\0220\n\004da" +
+      "ta\030\001 \001(\0132\".tribuo.math.impl.DenseTensorP" +
+      "roto\022\020\n\010baseRate\030\002 \001(\001\022\022\n\nlambdaSqrt\030\003 \001" +
+      "(\001\022\026\n\016scaleShrinking\030\004 \001(\010\022\021\n\treproject\030" +
+      "\005 \001(\010\022\026\n\016squaredTwoNorm\030\006 \001(\001\022\021\n\titerati" +
+      "on\030\007 \001(\005\022\022\n\nmultiplier\030\010 \001(\001\"\263\001\n\032AdaGrad" +
+      "RDADenseTensorProto\0220\n\004data\030\001 \001(\0132\".trib" +
+      "uo.math.impl.DenseTensorProto\022\024\n\014learnin" +
+      "gRate\030\002 \001(\001\022\017\n\007epsilon\030\003 \001(\001\022\n\n\002l1\030\004 \001(\001" +
+      "\022\n\n\002l2\030\005 \001(\001\022\021\n\tgradNorms\030\006 \001(\014\022\021\n\titera" +
+      "tion\030\007 \001(\005\"I\n\025PolynomialKernelProto\022\r\n\005g" +
+      "amma\030\001 \001(\001\022\021\n\tintercept\030\002 \001(\001\022\016\n\006degree\030" +
+      "\003 \001(\001\"\037\n\016RBFKernelProto\022\r\n\005gamma\030\001 \001(\001\"6" +
+      "\n\022SigmoidKernelProto\022\r\n\005gamma\030\001 \001(\001\022\021\n\ti" +
+      "ntercept\030\002 \001(\001\"B\n\026BruteForceFactoryProto" +
+      "\022\022\n\nnumThreads\030\001 \001(\005\022\024\n\014distanceType\030\002 \001" +
+      "(\t\">\n\022KDTreeFactoryProto\022\022\n\nnumThreads\030\001" +
+      " \001(\005\022\024\n\014distanceType\030\002 \001(\tB\032\n\026org.tribuo" +
+      ".math.protosP\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.tribuo.math.protos.TribuoMath.getDescriptor(),
         });
-    internal_static_tribuo_core_DenseTensorProto_descriptor =
+    internal_static_tribuo_math_impl_DenseTensorProto_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_tribuo_core_DenseTensorProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_DenseTensorProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_DenseTensorProto_descriptor,
+        internal_static_tribuo_math_impl_DenseTensorProto_descriptor,
         new java.lang.String[] { "Dimensions", "Values", });
-    internal_static_tribuo_core_SparseTensorProto_descriptor =
+    internal_static_tribuo_math_impl_SparseTensorProto_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_tribuo_core_SparseTensorProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_SparseTensorProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_SparseTensorProto_descriptor,
+        internal_static_tribuo_math_impl_SparseTensorProto_descriptor,
         new java.lang.String[] { "Dimensions", "NumNonZero", "Indices", "Values", });
-    internal_static_tribuo_core_LinearParametersProto_descriptor =
+    internal_static_tribuo_math_impl_LinearParametersProto_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_tribuo_core_LinearParametersProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_LinearParametersProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_LinearParametersProto_descriptor,
+        internal_static_tribuo_math_impl_LinearParametersProto_descriptor,
         new java.lang.String[] { "WeightMatrix", });
-    internal_static_tribuo_core_ShrinkingDenseTensorProto_descriptor =
+    internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_tribuo_core_ShrinkingDenseTensorProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_ShrinkingDenseTensorProto_descriptor,
+        internal_static_tribuo_math_impl_ShrinkingDenseTensorProto_descriptor,
         new java.lang.String[] { "Data", "BaseRate", "LambdaSqrt", "ScaleShrinking", "Reproject", "SquaredTwoNorm", "Iteration", "Multiplier", });
-    internal_static_tribuo_core_AdaGradRDADenseTensorProto_descriptor =
+    internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_descriptor =
       getDescriptor().getMessageTypes().get(4);
-    internal_static_tribuo_core_AdaGradRDADenseTensorProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_AdaGradRDADenseTensorProto_descriptor,
+        internal_static_tribuo_math_impl_AdaGradRDADenseTensorProto_descriptor,
         new java.lang.String[] { "Data", "LearningRate", "Epsilon", "L1", "L2", "GradNorms", "Iteration", });
-    internal_static_tribuo_core_PolynomialKernelProto_descriptor =
+    internal_static_tribuo_math_impl_PolynomialKernelProto_descriptor =
       getDescriptor().getMessageTypes().get(5);
-    internal_static_tribuo_core_PolynomialKernelProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_PolynomialKernelProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_PolynomialKernelProto_descriptor,
+        internal_static_tribuo_math_impl_PolynomialKernelProto_descriptor,
         new java.lang.String[] { "Gamma", "Intercept", "Degree", });
-    internal_static_tribuo_core_RBFKernelProto_descriptor =
+    internal_static_tribuo_math_impl_RBFKernelProto_descriptor =
       getDescriptor().getMessageTypes().get(6);
-    internal_static_tribuo_core_RBFKernelProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_RBFKernelProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_RBFKernelProto_descriptor,
+        internal_static_tribuo_math_impl_RBFKernelProto_descriptor,
         new java.lang.String[] { "Gamma", });
-    internal_static_tribuo_core_SigmoidKernelProto_descriptor =
+    internal_static_tribuo_math_impl_SigmoidKernelProto_descriptor =
       getDescriptor().getMessageTypes().get(7);
-    internal_static_tribuo_core_SigmoidKernelProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_SigmoidKernelProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_SigmoidKernelProto_descriptor,
+        internal_static_tribuo_math_impl_SigmoidKernelProto_descriptor,
         new java.lang.String[] { "Gamma", "Intercept", });
-    internal_static_tribuo_core_BruteForceFactoryProto_descriptor =
+    internal_static_tribuo_math_impl_BruteForceFactoryProto_descriptor =
       getDescriptor().getMessageTypes().get(8);
-    internal_static_tribuo_core_BruteForceFactoryProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_BruteForceFactoryProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_BruteForceFactoryProto_descriptor,
+        internal_static_tribuo_math_impl_BruteForceFactoryProto_descriptor,
         new java.lang.String[] { "NumThreads", "DistanceType", });
-    internal_static_tribuo_core_KDTreeFactoryProto_descriptor =
+    internal_static_tribuo_math_impl_KDTreeFactoryProto_descriptor =
       getDescriptor().getMessageTypes().get(9);
-    internal_static_tribuo_core_KDTreeFactoryProto_fieldAccessorTable = new
+    internal_static_tribuo_math_impl_KDTreeFactoryProto_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_tribuo_core_KDTreeFactoryProto_descriptor,
+        internal_static_tribuo_math_impl_KDTreeFactoryProto_descriptor,
         new java.lang.String[] { "NumThreads", "DistanceType", });
     org.tribuo.math.protos.TribuoMath.getDescriptor();
   }
diff --git a/Math/src/main/resources/protos/tribuo-math-impl.proto b/Math/src/main/resources/protos/tribuo-math-impl.proto
index eadf25c43..2487ffff0 100644
--- a/Math/src/main/resources/protos/tribuo-math-impl.proto
+++ b/Math/src/main/resources/protos/tribuo-math-impl.proto
@@ -55,7 +55,7 @@ message SparseTensorProto {
 LinearParameters proto
  */
 message LinearParametersProto {
-  TensorProto weightMatrix = 1;
+  tribuo.math.TensorProto weightMatrix = 1;
 }
 
 /*
diff --git a/Math/src/main/resources/protos/tribuo-math.proto b/Math/src/main/resources/protos/tribuo-math.proto
index 9f474387f..13a10ad81 100644
--- a/Math/src/main/resources/protos/tribuo-math.proto
+++ b/Math/src/main/resources/protos/tribuo-math.proto
@@ -24,15 +24,9 @@ package tribuo.math;
 option java_multiple_files = true;
 option java_package = "org.tribuo.math.protos";
 
-// We use any to encode polymorphism in feature domains, output domains, and model values
+// We use any to encode polymorphism
 import "google/protobuf/any.proto";
 
-// Import Tribuo's core protos
-import "tribuo-core.proto";
-
-// Import OLCUT's provenance proto
-import "olcut_proto.proto";
-
 /*
 Kernel redirection proto
  */