diff --git a/spec/ndx-ophys-devices.extensions.yaml b/spec/ndx-ophys-devices.extensions.yaml
index 919a2d3..60bc549 100644
--- a/spec/ndx-ophys-devices.extensions.yaml
+++ b/spec/ndx-ophys-devices.extensions.yaml
@@ -8,9 +8,15 @@ groups:
         doc: Model of the device.
         required: false
   - neurodata_type_def: Indicator
-    neurodata_type_inc: Device
-    doc: Extends Device to hold metadata on the Indicator.
+    neurodata_type_inc: NWBContainer
+    doc: An NWBContainer to hold metadata on the Indicator.
     attributes:
+      - name: description
+        dtype: text
+        doc: Indicator description.
+      - name: manufacturer
+        dtype: text
+        doc: Indicator manufacturer.
       - name: label
         dtype: text
         doc: Indicator standard notation.
@@ -180,9 +186,15 @@ groups:
         doc: The magnification of the lens as specified by the manufacturer, i.e. '60.0' is a 60X lens.
         required: false
   - neurodata_type_def: Effector
-    neurodata_type_inc: Device
-    doc: Extends Device to hold metadata on the Effector or Opsin.
+    neurodata_type_inc: NWBContainer
+    doc: An NWBContainer to hold metadata on the Effector or Opsin.
     attributes:
+      - name: description
+        dtype: text
+        doc: Effector description.
+      - name: manufacturer
+        dtype: text
+        doc: Effector manufacturer.
       - name: label
         dtype: text
         doc: Effector standard notation.