diff --git a/api/node.proto b/api/node.proto
index 1d046ff..3fa7a79 100644
--- a/api/node.proto
+++ b/api/node.proto
@@ -32,7 +32,6 @@ message NodeOptions {
     ElectricalStimOptions electrical_stim = 4;
     OpticalBroadbandOptions optical_broadband = 5;
     OpticalStimOptions optical_stim = 6;
-    SpikeDetectOptions spike_detect = 7;
   }
 }
 
diff --git a/api/nodes/spike_detect.proto b/api/nodes/spike_detect.proto
index c31a968..de079a4 100644
--- a/api/nodes/spike_detect.proto
+++ b/api/nodes/spike_detect.proto
@@ -2,20 +2,18 @@ syntax = "proto3";
 
 package synapse;
 
-message SpikeDetectOptions {
-  enum SpikeDetectMode {
-    kThreshold = 0;
-    kTemplate = 1;
-    kWavelet = 2;
-  }
+message TemplateMatcher {
+  repeated uint32 template_uV = 1;
+}
 
-  repeated SpikeDetectMode mode = 1;
+message Thresholder {
+  uint32 threshold_uV = 1;
 }
 
 message SpikeDetectConfig {
-  SpikeDetectOptions.SpikeDetectMode mode = 1;
-  uint32 threshold_uV = 2;
-  repeated uint32 template_uV = 3;
-  bool sort = 4;
+  oneof config {
+    Thresholder thresholder = 1;
+    TemplateMatcher template_matcher = 2;
+  }
   uint32 bin_size_ms = 5;
 }