diff --git a/ADCore/asynNDArrayDriver.pvi.device.yaml b/ADCore/asynNDArrayDriver.pvi.device.yaml
index c8624d3..cecdef8 100644
--- a/ADCore/asynNDArrayDriver.pvi.device.yaml
+++ b/ADCore/asynNDArrayDriver.pvi.device.yaml
@@ -1,187 +1,7 @@
-# yaml-language-server: $schema=/repos/pvi/schemas/pvi.device.schema.json
+# yaml-language-server: $schema=/workspaces/pvi/schemas/pvi.device.schema.json
 
 label: AsynNDArrayDriver
 children:
-  - type: Group
-    name: NDFileBase
-    layout:
-      type: Grid
-    children:
-      - type: SignalR
-        name: FilePathExists
-        pv: FilePathExists_RBV
-        widget:
-          type: LED
-
-      - type: SignalRW
-        name: FilePath
-        pv: FilePath
-        widget:
-          type: TextWrite
-          format: 4
-        read_pv: FilePath_RBV
-        read_widget:
-          format: 4
-          type: TextRead
-
-      - type: SignalRW
-        name: CreateDirectory
-        pv: CreateDirectory
-        widget:
-          type: CheckBox
-        read_pv: CreateDirectory_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalRW
-        name: FileName
-        pv: FileName
-        widget:
-          type: TextWrite
-          format: 4
-        read_pv: FileName_RBV
-        read_widget:
-          type: TextRead
-          format: 4
-
-      - type: SignalRW
-        name: FileNumber
-        pv: FileNumber
-        widget:
-          type: TextWrite
-        read_pv: FileNumber_RBV
-        read_widget:
-          type: TextRead
-
-      - type: SignalRW
-        name: TempSuffix
-        pv: TempSuffix
-        widget:
-          type: TextWrite
-          format: 4
-        read_pv: TempSuffix_RBV
-        read_widget:
-          type: TextRead
-          format: 4
-
-      - type: SignalRW
-        name: LazyOpen
-        pv: LazyOpen
-        widget:
-          type: CheckBox
-        read_pv: LazyOpen_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalRW
-        name: AutoIncrement
-        pv: AutoIncrement
-        widget:
-          type: CheckBox
-        read_pv: AutoIncrement_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalRW
-        name: FileTemplate
-        pv: FileTemplate
-        widget:
-          type: TextWrite
-          format: 4
-        read_pv: FileTemplate_RBV
-        read_widget:
-          type: TextRead
-          format: 4
-
-      - type: SignalR
-        name: FullFileName
-        pv: FullFileName_RBV
-        widget:
-          type: TextRead
-          format: 4
-
-      - type: SignalRW
-        name: WriteFile
-        pv: WriteFile
-        widget:
-          type: CheckBox
-        read_pv: WriteFile_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalRW
-        name: ReadFile
-        pv: ReadFile
-        widget:
-          type: CheckBox
-        read_pv: ReadFile_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalRW
-        name: AutoSave
-        pv: AutoSave
-        widget:
-          type: CheckBox
-        read_pv: AutoSave_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalR
-        name: NumCaptured
-        pv: NumCaptured_RBV
-        widget:
-          type: TextRead
-
-      - type: SignalRW
-        name: FileWriteMode
-        pv: FileWriteMode
-        widget:
-          type: ComboBox
-        read_pv: FileWriteMode_RBV
-        read_widget:
-          type: TextRead
-
-      - type: SignalRW
-        name: NumCapture
-        pv: NumCapture
-        widget:
-          type: TextWrite
-        read_pv: NumCapture_RBV
-        read_widget:
-          type: TextRead
-
-      - type: SignalRW
-        name: Capture
-        pv: Capture
-        widget:
-          type: CheckBox
-        read_pv: Capture_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalRW
-        name: DeleteDriverFile
-        pv: DeleteDriverFile
-        widget:
-          type: CheckBox
-        read_pv: DeleteDriverFile_RBV
-        read_widget:
-          type: LED
-
-      - type: SignalR
-        name: WriteStatus
-        pv: WriteStatus
-        widget:
-          type: LED
-
-      - type: SignalR
-        name: WriteMessage
-        pv: WriteMessage
-        widget:
-          type: TextRead
-          format: 4
-
   - type: Group
     name: ADSetup
     layout:
@@ -344,22 +164,6 @@ children:
         pv: NDAttributesStatus
         widget:
           type: TextRead
-
-  - type: Group
-    name: NDFile
-    layout:
-      type: Grid
-    children:
-      - type: SignalRW
-        name: FileFormat
-        pv: FileFormat
-        widget:
-          type: ComboBox
-        read_pv: FileFormat_RBV
-        read_widget:
-          type: TextRead
-          format: 4
-
   - type: Group
     name: AsynNDArrayDriverMisc
     layout:
diff --git a/ADSimDetector/ADSimDetector.ibek.support.yaml b/ADSimDetector/ADSimDetector.ibek.support.yaml
index dfe8756..ac37ebe 100644
--- a/ADSimDetector/ADSimDetector.ibek.support.yaml
+++ b/ADSimDetector/ADSimDetector.ibek.support.yaml
@@ -62,3 +62,8 @@ defs:
         value: |
           # simDetectorConfig(portName, maxSizeX, maxSizeY, dataType, maxBuffers, maxMemory)
           simDetectorConfig("{{PORT}}", {{WIDTH}}, {{HEIGHT}}, {{DATATYPE}}, {{BUFFERS}}, {{MEMORY}})
+
+    pvi:
+      yaml_path: ADDriver.pvi.device.yaml
+      prefix: "{{ P }}{{ R }}"
+      pva_template: true