Repository: spacetelescope/rad (language: python)

Issue:
Fix TVAC & RPS Archive Cat Destinations
With the splintering off of TVAC and FPS into their own schemas, the archive catalog destinations from both their original schemas and their new schemas need updating. 


Discussion / hints:
_This issue is tracked on JIRA as [RAD-170](https://jira.stsci.edu/browse/RAD-170)._

Fix patch:
diff --git a/CHANGES.rst b/CHANGES.rst
index da8b1e86..955fccd3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,8 @@
 
 - Separated TVAC and FPS schemas into their own suite of files. [#414]
 
+- Fixed the TVAC & FPS archive catalog destinations. [#424]
+
 - Added statistics schemas to both FPS and TVAC. [#423]
 
 - Removed filepath_level_pnt5 from TVAC/FPS database. [#422]
diff --git a/src/rad/resources/schemas/fps/cal_step-1.0.0.yaml b/src/rad/resources/schemas/fps/cal_step-1.0.0.yaml
index 52b4db1e..e6d5ed7d 100644
--- a/src/rad/resources/schemas/fps/cal_step-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/cal_step-1.0.0.yaml
@@ -15,7 +15,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs, WFICommon.s_assign_wcs]
+      destination: [WFICommon.s_assign_wcs]
   flat_field:
     title: Flat Fielding Step
     descroption: |
@@ -27,7 +27,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_flat_field, GuideWindow.s_flat_field, WFICommon.s_flat_field]
+      destination: [WFICommon.s_flat_field]
   dark:
     title: Dark Current Subtraction Step
     description: |
@@ -37,7 +37,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_dark, GuideWindow.s_dark, WFICommon.s_dark]
+      destination: [WFICommon.s_dark]
   dq_init:
     title: Initialization of the Data Quality Extension Step
     description: |
@@ -47,7 +47,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init, WFICommon.s_dq_init]
+      destination: [WFICommon.s_dq_init]
   flux:
     title: Flux Scale Application Step
     description: |
@@ -57,7 +57,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFICommon.s_flux]
+      destination: [WFICommon.s_flux]
   jump:
     title: Cosmic Rays and Jump Detection Step
     description: |
@@ -67,7 +67,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_jump, GuideWindow.s_jump, WFICommon.s_jump]
+      destination: [WFICommon.s_jump]
   linearity:
     title: Linearity Correction Step
     description: |
@@ -77,7 +77,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_linearity, GuideWindow.s_linearity, WFICommon.s_linearity]
+      destination: [WFICommon.s_linearity]
   photom:
     title: Photometric Calibration Step
     description: |
@@ -87,7 +87,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_photom, GuideWindow.s_photom, WFICommon.s_photom]
+      destination: [WFICommon.s_photom]
   source_detection:
     title: Source Detection Step
     description: |
@@ -96,7 +96,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_source_detection, GuideWindow.s_source_detection, WFICommon.s_source_detection]
+      destination: [WFICommon.s_source_detection]
   ramp_fit:
     title: Ramp Fit Step
     description: |
@@ -106,7 +106,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_ramp_fit, GuideWindow.s_ramp_fit, WFICommon.s_ramp_fit]
+      destination: [WFICommon.s_ramp_fit]
   refpix:
     title: Reference Pixel Correction Step
     description: |
@@ -116,7 +116,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_refpix, GuideWindow.s_refpix, WFICommon.s_refpix]
+      destination: [WFICommon.s_refpix]
   saturation:
     title: Saturation Identification Step
     description: |
@@ -127,7 +127,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_saturation, GuideWindow.s_saturation, WFICommon.s_saturation]
+      destination: [WFICommon.s_saturation]
   outlier_detection:
     title: Outlier Detection Step
     description: |
@@ -136,7 +136,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFICommon.s_outlier_detection]
+      destination: [WFICommon.s_outlier_detection]
   tweakreg:
     title: Tweakreg step
     description: |
@@ -147,7 +147,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_tweakreg, GuideWindow.s_tweakreg, WFICommon.s_tweakreg]
+      destination: [WFICommon.s_tweakreg]
   skymatch:
     title: Sky Matching for Combining Overlapping Images Step
     description: |
@@ -157,7 +157,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch]
+      destination: [WFICommon.s_skymatch]
 propertyOrder: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, photom, source_detection,
                 outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
 flowStyle: block
diff --git a/src/rad/resources/schemas/fps/exposure-1.0.0.yaml b/src/rad/resources/schemas/fps/exposure-1.0.0.yaml
index 20b389ef..15c613d5 100644
--- a/src/rad/resources/schemas/fps/exposure-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/exposure-1.0.0.yaml
@@ -17,7 +17,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(25)
-      destination: [WFIExposure.exposure_type, GuideWindow.exposure_type, WFICommon.exposure_type]
+      destination: [WFICommon.exposure_type]
   start_time:
     title: Exposure Start Time (UTC)
     description: |
@@ -29,7 +29,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: datetime2
-      destination: [WFIExposure.exposure_start_time, GuideWindow.exposure_start_time, WFICommon.exposure_start_time]
+      destination: [WFICommon.exposure_start_time]
   ngroups:
     title: Number of Resultants
     description: |
@@ -42,7 +42,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_ngroups, GuideWindow.exposure_ngroups, WFICommon.exposure_ngroups]
+      destination: [WFICommon.exposure_ngroups]
   nframes:
     title: Number of Reads
     description: |
@@ -54,7 +54,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_nframes, GuideWindow.exposure_nframes, WFICommon.exposure_nframes]
+      destination: [WFICommon.exposure_nframes]
   data_problem:
     title: Data Problem
     description: |
@@ -66,7 +66,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nchar(1)
-      destination: [WFIExposure.exposure_data_problem, GuideWindow.exposure_data_problem, WFICommon.exposure_data_problem]
+      destination: [WFICommon.exposure_data_problem]
   frame_divisor:
     title: Frame Divisor
     description: |
@@ -79,7 +79,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_frame_divisor, GuideWindow.exposure_frame_divisor, WFICommon.exposure_frame_divisor]
+      destination: [WFICommon.exposure_frame_divisor]
   groupgap:
     title: Number of Frames Dropped Between Resultants
     description:
@@ -92,7 +92,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_groupgap, GuideWindow.exposure_groupgap, WFICommon.exposure_groupgap]
+      destination: [WFICommon.exposure_groupgap]
   frame_time:
     title: Time Between Reads (s)
     description: |
@@ -105,7 +105,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.exposure_frame_time, GuideWindow.exposure_frame_time, WFICommon.exposure_frame_time]
+      destination: [WFICommon.exposure_frame_time]
   group_time:
     title: Time Between Resultants (s)
     description: |
@@ -118,7 +118,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.exposure_group_time, GuideWindow.exposure_group_time, WFICommon.exposure_group_time]
+      destination: [WFICommon.exposure_group_time]
   exposure_time:
     title: Exposure Time (s)
     description: |
@@ -132,7 +132,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.exposure_time, GuideWindow.exposure_time, WFICommon.exposure_time]
+      destination: [WFICommon.exposure_time]
   ma_table_name:
     title: MA Table Name
     description: |
@@ -145,7 +145,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(50)
-      destination: [WFIExposure.ma_table_name, GuideWindow.ma_table_name, WFICommon.ma_table_name]
+      destination: [WFICommon.ma_table_name]
   ma_table_number:
     title: MA Table Number
     description: |
@@ -158,7 +158,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: smallint
-      destination: [WFIExposure.ma_table_number, GuideWindow.ma_table_number, WFICommon.ma_table_number]
+      destination: [WFICommon.ma_table_number]
   read_pattern:
     title: Read Pattern
     description: |
@@ -175,7 +175,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(3500)
-      destination: [WFIExposure.read_pattern, GuideWindow.read_pattern, WFICommon.read_pattern]
+      destination: [WFICommon.read_pattern]
 propertyOrder: [type, start_time,
            ngroups, nframes, data_problem,
            frame_divisor, groupgap, frame_time, group_time, exposure_time,
diff --git a/src/rad/resources/schemas/fps/guidestar-1.0.0.yaml b/src/rad/resources/schemas/fps/guidestar-1.0.0.yaml
index ef6b89fa..dfcdf6de 100644
--- a/src/rad/resources/schemas/fps/guidestar-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/guidestar-1.0.0.yaml
@@ -17,7 +17,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(20)
-      destination: [WFIExposure.gw_id, GuideWindow.gw_id, WFICommon.gw_id]
+      destination: [WFICommon.gw_id]
   gw_fgs_mode:
     $ref: guidewindow_modes-1.0.0
     sdf:
@@ -26,7 +26,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(18)
-      destination: [WFIExposure.gw_fgs_mode, GuideWindow.gw_fgs_mode, WFICommon.gw_fgs_mode]
+      destination: [WFICommon.gw_fgs_mode]
   data_start:
     title: Guide Data Start Time (MJD)
     description: |
@@ -39,7 +39,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.data_start, GuideWindow.data_start, WFICommon.data_start]
+      destination: [WFICommon.data_start]
   data_end:
     title: Guide Data End Time (MJD)
     description: |
@@ -52,7 +52,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.data_end, GuideWindow.data_end, WFICommon.data_end]
+      destination: [WFICommon.data_end]
   gw_window_xstart:
     title: Guide Window X Start Position (pixels)
     description: |
@@ -65,7 +65,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_xstart, WFICommon.gw_window_xstart]
+      destination: [WFICommon.gw_window_xstart]
   gw_window_ystart:
     title: Guide Window Y Start Position (pixels)
     description: |
@@ -78,7 +78,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_ystart, WFICommon.gw_window_ystart]
+      destination: [WFICommon.gw_window_ystart]
   gw_window_xstop:
     title: Guide Window X Stop Position (pixels)
     description: |
@@ -91,7 +91,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_xstop, WFICommon.gw_window_xstop]
+      destination: [WFICommon.gw_window_xstop]
   gw_window_ystop:
     title: Guide Window Y Stop Position (pixels)
     description: |
@@ -104,7 +104,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_ystop, WFICommon.gw_window_ystop]
+      destination: [WFICommon.gw_window_ystop]
   gw_window_xsize:
     title: Guide Window Size in the X Direction (pixels)
     description: |
@@ -117,7 +117,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_xsize, WFICommon.gw_window_xsize]
+      destination: [WFICommon.gw_window_xsize]
   gw_window_ysize:
     title: Guide Window Size in the Y Direction (pixels)
     description: |
@@ -130,7 +130,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_ysize, WFICommon.gw_window_ysize]
+      destination: [WFICommon.gw_window_ysize]
 
 propertyOrder: [gw_id, gw_fgs_mode,
                data_start, data_end, gw_window_xstart,
diff --git a/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml b/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml
index 31a42c53..31e25f4d 100644
--- a/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/ref_file-1.0.0.yaml
@@ -23,8 +23,7 @@ properties:
             origin: TBD
         archive_catalog:
           datatype: nvarchar(120)
-          destination: [WFIExposure.crds_software_version, WFIMosaic.crds_software_version,
-                        GuideWindow.crds_software_version, WFICommon.crds_software_version]
+          destination: [WFICommon.crds_software_version]
 
       context_used:
         title: CRDS Context
@@ -37,8 +36,7 @@ properties:
             origin: TBD
         archive_catalog:
           datatype: nvarchar(120)
-          destination: [WFIExposure.crds_context_used, WFIMosaic.crds_context_used,
-                        GuideWindow.crds_context_used, WFICommon.crds_context_used]
+          destination: [WFICommon.crds_context_used]
   dark:
     title: Dark Reference File Information
     description: |
@@ -47,7 +45,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_dark, GuideWindow.r_dark, WFICommon.r_dark]
+      destination: [WFICommon.r_dark]
   distortion:
     title: Distortion Reference File Information
     description: |
@@ -56,7 +54,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_distortion, GuideWindow.r_distortion, WFICommon.r_distortion]
+      destination: [WFICommon.r_distortion]
   mask:
     title: Mask Reference File Information
     description: |
@@ -64,7 +62,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_mask, GuideWindow.r_mask, WFICommon.r_mask]
+      destination: [WFICommon.r_mask]
   flat:
     title: Flat Reference File Information
     description: |
@@ -72,7 +70,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_flat, GuideWindow.r_flat, WFICommon.r_flat]
+      destination: [WFICommon.r_flat]
   gain:
     title: Gain Reference Rile Information
     description: |
@@ -80,7 +78,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_gain, GuideWindow.r_gain, WFICommon.r_gain]
+      destination: [WFICommon.r_gain]
   readnoise:
     title: Read Noise Reference Rile Information
     description: |
@@ -89,7 +87,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_readnoise, GuideWindow.r_readnoise, WFICommon.r_readnoise]
+      destination: [WFICommon.r_readnoise]
   linearity:
     title: Linearity Reference File Information
     description: |
@@ -97,7 +95,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_linearity, GuideWindow.r_linearity, WFICommon.r_linearity]
+      destination: [WFICommon.r_linearity]
   photom:
     title: Photometry Reference File Information
     description: |
@@ -106,7 +104,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_photom, GuideWindow.r_photom, WFICommon.r_photom]
+      destination: [WFICommon.r_photom]
   area:
     title: Area Reference File Information
     description: |
@@ -114,7 +112,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_area, GuideWindow.r_area, WFICommon.r_area]
+      destination: [WFICommon.r_area]
   saturation:
     title: Saturation Reference File Information
     description: |
@@ -123,7 +121,6 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_saturation, GuideWindow.r_saturation, WFICommon.r_saturation]
-
+      destination: [WFICommon.r_saturation]
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/calibration_software_version-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/calibration_software_version-1.0.0.yaml
index f5896421..253788a4 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/calibration_software_version-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/calibration_software_version-1.0.0.yaml
@@ -11,9 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.calibration_software_version, GuideWindow.calibration_software_version,
-                WFICommon.calibration_software_version, WFIMosaic.calibration_software_version,
-                SourceCatalog.calibration_software_version, SegmentationMap.calibration_software_version]
+  destination: [WFICommon.calibration_software_version]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/file_date-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/file_date-1.0.0.yaml
index 91037fe9..5ea3c9d7 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/file_date-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/file_date-1.0.0.yaml
@@ -14,8 +14,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: datetime2
-  destination: [WFIExposure.filedate, GuideWindow.filedate, WFICommon.filedate, WFIMosaic.filedate,
-                SourceCatalog.filedate, SegmentationMap.filedate]
+  destination: [WFICommon.filedate]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/filename-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/filename-1.0.0.yaml
index 59324c38..2841cfa2 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/filename-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/filename-1.0.0.yaml
@@ -11,8 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.filename, WFIMosaic.filename, GuideWindow.filename, WFICommon.filename,
-                SourceCatalog.filename, SegmentationMap.filename]
+  destination: [WFICommon.filename]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/model_type-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/model_type-1.0.0.yaml
index a9866ec4..7a75f7d2 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/model_type-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/model_type-1.0.0.yaml
@@ -11,8 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(50)
-  destination: [WFIExposure.model_type, GuideWindow.model_type, WFICommon.model_type, WFIMosaic.model_type,
-                SourceCatalog.model_type, SegmentationMap.model_type]
+  destination: [WFICommon.model_type]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/origin-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/origin-1.0.0.yaml
index b3ae3a20..ef5aebde 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/origin-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/origin-1.0.0.yaml
@@ -14,8 +14,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(15)
-  destination: [WFIExposure.origin, GuideWindow.origin, WFICommon.origin, WFIMosaic.origin,
-                SourceCatalog.origin, SegmentationMap.origin]
+  destination: [WFICommon.origin]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/prd_software_version-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/prd_software_version-1.0.0.yaml
index 0fc65956..53a00f1e 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/prd_software_version-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/prd_software_version-1.0.0.yaml
@@ -11,9 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.prd_software_version, GuideWindow.prd_software_version,
-                WFICommon.prd_software_version, WFIMosaic.prd_software_version,
-                SourceCatalog.prd_software_version, SegmentationMap.prd_software_version]
+  destination: [WFICommon.prd_software_version]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/sdf_software_version-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/sdf_software_version-1.0.0.yaml
index 325e22f1..fb44a0de 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/sdf_software_version-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/sdf_software_version-1.0.0.yaml
@@ -11,9 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.sdf_software_version, GuideWindow.sdf_software_version,
-                WFICommon.sdf_software_version, WFIMosaic.sdf_software_version,
-                SourceCatalog.sdf_software_version, SegmentationMap.sdf_software_version]
+  destination: [WFICommon.sdf_software_version]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/tagged_scalars/telescope-1.0.0.yaml b/src/rad/resources/schemas/fps/tagged_scalars/telescope-1.0.0.yaml
index 880521a3..d6baf253 100644
--- a/src/rad/resources/schemas/fps/tagged_scalars/telescope-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/tagged_scalars/telescope-1.0.0.yaml
@@ -10,8 +10,7 @@ enum: [ROMAN]
 
 archive_catalog:
   datatype: nvarchar(5)
-  destination: [WFIExposure.telescope, WFIMosaic.telescope, GuideWindow.telescope, WFICommon.telescope,
-                SourceCatalog.telescope, SegmentationMap.telescope]
+  destination: [WFICommon.telescopes]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/fps/wfi_mode-1.0.0.yaml b/src/rad/resources/schemas/fps/wfi_mode-1.0.0.yaml
index a07f5c77..f961b756 100644
--- a/src/rad/resources/schemas/fps/wfi_mode-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/wfi_mode-1.0.0.yaml
@@ -19,7 +19,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(5)
-      destination: [WFIExposure.instrument_name, GuideWindow.instrument_name, WFICommon.instrument_name]
+      destination: [WFICommon.instrument_name]
   detector:
     title: WFI Detector
     description: |
@@ -31,7 +31,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(10)
-      destination: [WFIExposure.detector, GuideWindow.detector, WFICommon.detector]
+      destination: [WFICommon.detector]
   optical_element:
     title: WFI Optical Element
     description: |
@@ -43,7 +43,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(20)
-      destination: [WFIExposure.optical_element, GuideWindow.optical_element, WFICommon.optical_element]
+      destination: [WFICommon.optical_element]
 propertyOrder: [detector, optical_element, name]
 flowStyle: block
 required: [detector, optical_element, name]
diff --git a/src/rad/resources/schemas/tvac/cal_step-1.0.0.yaml b/src/rad/resources/schemas/tvac/cal_step-1.0.0.yaml
index 167cad76..056fe452 100644
--- a/src/rad/resources/schemas/tvac/cal_step-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/cal_step-1.0.0.yaml
@@ -15,7 +15,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs, WFICommon.s_assign_wcs]
+      destination: [WFICommon.s_assign_wcs]
   flat_field:
     title: Flat Fielding Step
     descroption: |
@@ -27,7 +27,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_flat_field, GuideWindow.s_flat_field, WFICommon.s_flat_field]
+      destination: [WFICommon.s_flat_field]
   dark:
     title: Dark Current Subtraction Step
     description: |
@@ -37,7 +37,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_dark, GuideWindow.s_dark, WFICommon.s_dark]
+      destination: [WFICommon.s_dark]
   dq_init:
     title: Initialization of the Data Quality Extension Step
     description: |
@@ -47,7 +47,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_dq_init, GuideWindow.s_dq_init, WFICommon.s_dq_init]
+      destination: [WFICommon.s_dq_init]
   flux:
     title: Flux Scale Application Step
     description: |
@@ -57,7 +57,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_flux, GuideWindow.s_flux, WFICommon.s_flux]
+      destination: [WFICommon.s_flux]
   jump:
     title: Cosmic Rays and Jump Detection Step
     description: |
@@ -67,7 +67,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_jump, GuideWindow.s_jump, WFICommon.s_jump]
+      destination: [WFICommon.s_jump]
   linearity:
     title: Linearity Correction Step
     description: |
@@ -77,7 +77,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_linearity, GuideWindow.s_linearity, WFICommon.s_linearity]
+      destination: [WFICommon.s_linearity]
   photom:
     title: Photometric Calibration Step
     description: |
@@ -87,7 +87,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_photom, GuideWindow.s_photom, WFICommon.s_photom]
+      destination: [WFICommon.s_photom]
   source_detection:
     title: Source Detection Step
     description: |
@@ -96,7 +96,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_source_detection, GuideWindow.s_source_detection, WFICommon.s_source_detection]
+      destination: [WFICommon.s_source_detection]
   ramp_fit:
     title: Ramp Fit Step
     description: |
@@ -106,7 +106,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_ramp_fit, GuideWindow.s_ramp_fit, WFICommon.s_ramp_fit]
+      destination: [WFICommon.s_ramp_fit]
   refpix:
     title: Reference Pixel Correction Step
     description: |
@@ -116,7 +116,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_refpix, GuideWindow.s_refpix, WFICommon.s_refpix]
+      destination: [WFICommon.s_refpix]
   saturation:
     title: Saturation Identification Step
     description: |
@@ -127,7 +127,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_saturation, GuideWindow.s_saturation, WFICommon.s_saturation]
+      destination: [WFICommon.s_saturation]
   outlier_detection:
     title: Outlier Detection Step
     description: |
@@ -136,7 +136,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_outlier_detection, GuideWindow.s_outlier_detection, WFICommon.s_outlier_detection]
+      destination: [WFICommon.s_outlier_detection]
   tweakreg:
     title: Tweakreg step
     description: |
@@ -147,7 +147,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_tweakreg, GuideWindow.s_tweakreg, WFICommon.s_tweakreg]
+      destination: [WFICommon.s_tweakreg]
   skymatch:
     title: Sky Matching for Combining Overlapping Images Step
     description: |
@@ -157,7 +157,7 @@ properties:
     enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
     archive_catalog:
       datatype: nvarchar(15)
-      destination: [ScienceRefData.s_skymatch, GuideWindow.s_skymatch, WFICommon.s_skymatch]
+      destination: [WFICommon.s_skymatch]
 propertyOrder: [assign_wcs, flat_field, flux, dark, dq_init, jump, linearity, photom, source_detection,
                 outlier_detection, ramp_fit, refpix, saturation, skymatch, tweakreg]
 flowStyle: block
diff --git a/src/rad/resources/schemas/tvac/exposure-1.0.0.yaml b/src/rad/resources/schemas/tvac/exposure-1.0.0.yaml
index 0584291c..42c11c44 100644
--- a/src/rad/resources/schemas/tvac/exposure-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/exposure-1.0.0.yaml
@@ -17,7 +17,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(25)
-      destination: [WFIExposure.exposure_type, GuideWindow.exposure_type, WFICommon.exposure_type]
+      destination: [WFICommon.exposure_type]
   start_time:
     title: Exposure Start Time (UTC)
     description: |
@@ -29,7 +29,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: datetime2
-      destination: [WFIExposure.exposure_start_time, GuideWindow.exposure_start_time, WFICommon.exposure_start_time]
+      destination: [WFICommon.exposure_start_time]
   ngroups:
     title: Number of Resultants
     description: |
@@ -42,7 +42,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_ngroups, GuideWindow.exposure_ngroups, WFICommon.exposure_ngroups]
+      destination: [WFICommon.exposure_ngroups]
   nframes:
     title: Number of Reads
     description: |
@@ -54,7 +54,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_nframes, GuideWindow.exposure_nframes, WFICommon.exposure_nframes]
+      destination: [WFICommon.exposure_nframes]
   data_problem:
     title: Data Problem
     description: |
@@ -66,7 +66,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nchar(1)
-      destination: [WFIExposure.exposure_data_problem, GuideWindow.exposure_data_problem, WFICommon.exposure_data_problem]
+      destination: [WFICommon.exposure_data_problem]
   frame_divisor:
     title: Frame Divisor
     description: |
@@ -79,7 +79,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_frame_divisor, GuideWindow.exposure_frame_divisor, WFICommon.exposure_frame_divisor]
+      destination: [WFICommon.exposure_frame_divisor]
   groupgap:
     title: Number of Frames Dropped Between Resultants
     description:
@@ -92,7 +92,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.exposure_groupgap, GuideWindow.exposure_groupgap, WFICommon.exposure_groupgap]
+      destination: [WFICommon.exposure_groupgap]
   frame_time:
     title: Time Between Reads (s)
     description: |
@@ -105,7 +105,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.exposure_frame_time, GuideWindow.exposure_frame_time, WFICommon.exposure_frame_time]
+      destination: [WFICommon.exposure_frame_time]
   group_time:
     title: Time Between Resultants (s)
     description: |
@@ -118,7 +118,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.exposure_group_time, GuideWindow.exposure_group_time, WFICommon.exposure_group_time]
+      destination: [WFICommon.exposure_group_time]
   exposure_time:
     title: Exposure Time (s)
     description: |
@@ -132,7 +132,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.exposure_time, GuideWindow.exposure_time, WFICommon.exposure_time]
+      destination: [WFICommon.exposure_time]
   ma_table_name:
     title: MA Table Name
     description: |
@@ -145,7 +145,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(50)
-      destination: [WFIExposure.ma_table_name, GuideWindow.ma_table_name, WFICommon.ma_table_name]
+      destination: [WFICommon.ma_table_name]
   ma_table_number:
     title: MA Table Number
     description: |
@@ -158,7 +158,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: smallint
-      destination: [WFIExposure.ma_table_number, GuideWindow.ma_table_number, WFICommon.ma_table_number]
+      destination: [WFICommon.ma_table_number]
   read_pattern:
     title: Read Pattern
     description: |
@@ -175,7 +175,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(3500)
-      destination: [WFIExposure.read_pattern, GuideWindow.read_pattern, WFICommon.read_pattern]
+      destination: [WFICommon.read_pattern]
 propertyOrder: [type, start_time,
            ngroups, nframes, data_problem,
            frame_divisor, groupgap, frame_time, group_time, exposure_time,
diff --git a/src/rad/resources/schemas/tvac/guidestar-1.0.0.yaml b/src/rad/resources/schemas/tvac/guidestar-1.0.0.yaml
index 5bbf89a1..859efbd5 100644
--- a/src/rad/resources/schemas/tvac/guidestar-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/guidestar-1.0.0.yaml
@@ -17,7 +17,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(20)
-      destination: [WFIExposure.gw_id, GuideWindow.gw_id, WFICommon.gw_id]
+      destination: [WFICommon.gw_id]
   gw_fgs_mode:
     $ref: guidewindow_modes-1.0.0
     sdf:
@@ -26,7 +26,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(18)
-      destination: [WFIExposure.gw_fgs_mode, GuideWindow.gw_fgs_mode, WFICommon.gw_fgs_mode]
+      destination: [WFICommon.gw_fgs_mode]
   data_start:
     title: Guide Data Start Time (MJD)
     description: |
@@ -39,7 +39,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.data_start, GuideWindow.data_start, WFICommon.data_start]
+      destination: [WFICommon.data_start]
   data_end:
     title: Guide Data End Time (MJD)
     description: |
@@ -52,7 +52,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: float
-      destination: [WFIExposure.data_end, GuideWindow.data_end, WFICommon.data_end]
+      destination: [WFICommon.data_end]
   gw_window_xstart:
     title: Guide Window X Start Position (pixels)
     description: |
@@ -65,7 +65,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_xstart, WFICommon.gw_window_xstart]
+      destination: [WFICommon.gw_window_xstart]
   gw_window_ystart:
     title: Guide Window Y Start Position (pixels)
     description: |
@@ -78,7 +78,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_ystart, WFICommon.gw_window_ystart]
+      destination: [WFICommon.gw_window_ystart]
   gw_window_xstop:
     title: Guide Window X Stop Position (pixels)
     description: |
@@ -91,7 +91,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_xstop, WFICommon.gw_window_xstop]
+      destination: [WFICommon.gw_window_xstop]
   gw_window_ystop:
     title: Guide Window Y Stop Position (pixels)
     description: |
@@ -104,7 +104,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_ystop, WFICommon.gw_window_ystop]
+      destination: [WFICommon.gw_window_ystop]
   gw_window_xsize:
     title: Guide Window Size in the X Direction (pixels)
     description: |
@@ -117,7 +117,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_xsize, WFICommon.gw_window_xsize]
+      destination: [WFICommon.gw_window_xsize]
   gw_window_ysize:
     title: Guide Window Size in the Y Direction (pixels)
     description: |
@@ -130,8 +130,7 @@ properties:
         origin: Science Data Formatting
     archive_catalog:
       datatype: int
-      destination: [WFIExposure.gw_window_ysize, WFICommon.gw_window_ysize]
-
+      destination: [WFICommon.gw_window_ysize]
 propertyOrder: [gw_id, gw_fgs_mode,
                data_start, data_end, gw_window_xstart,
                gw_window_ystart, gw_window_xstop, gw_window_ystop, gw_window_xsize,
diff --git a/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml b/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml
index 9afdb10f..42df1ee4 100644
--- a/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/ref_file-1.0.0.yaml
@@ -23,8 +23,7 @@ properties:
             origin: TBD
         archive_catalog:
           datatype: nvarchar(120)
-          destination: [WFIExposure.crds_software_version, WFIMosaic.crds_software_version,
-                        GuideWindow.crds_software_version, WFICommon.crds_software_version]
+          destination: [WFICommon.crds_software_version]
 
       context_used:
         title: CRDS Context
@@ -37,8 +36,7 @@ properties:
             origin: TBD
         archive_catalog:
           datatype: nvarchar(120)
-          destination: [WFIExposure.crds_context_used, WFIMosaic.crds_context_used,
-                        GuideWindow.crds_context_used, WFICommon.crds_context_used]
+          destination: [WFICommon.crds_context_used]
   dark:
     title: Dark Reference File Information
     description: |
@@ -47,7 +45,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_dark, GuideWindow.r_dark, WFICommon.r_dark]
+      destination: [WFICommon.r_dark]
   distortion:
     title: Distortion Reference File Information
     description: |
@@ -56,7 +54,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_distortion, GuideWindow.r_distortion, WFICommon.r_distortion]
+      destination: [WFICommon.r_distortion]
   mask:
     title: Mask Reference File Information
     description: |
@@ -64,7 +62,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_mask, GuideWindow.r_mask, WFICommon.r_mask]
+      destination: [WFICommon.r_mask]
   flat:
     title: Flat Reference File Information
     description: |
@@ -72,7 +70,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_flat, GuideWindow.r_flat, WFICommon.r_flat]
+      destination: [WFICommon.r_flat]
   gain:
     title: Gain Reference Rile Information
     description: |
@@ -80,7 +78,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_gain, GuideWindow.r_gain, WFICommon.r_gain]
+      destination: [WFICommon.r_gain]
   readnoise:
     title: Read Noise Reference Rile Information
     description: |
@@ -89,7 +87,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_readnoise, GuideWindow.r_readnoise, WFICommon.r_readnoise]
+      destination: [WFICommon.r_readnoise]
   linearity:
     title: Linearity Reference File Information
     description: |
@@ -97,7 +95,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_linearity, GuideWindow.r_linearity, WFICommon.r_linearity]
+      destination: [WFICommon.r_linearity]
   photom:
     title: Photometry Reference File Information
     description: |
@@ -106,7 +104,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_photom, GuideWindow.r_photom, WFICommon.r_photom]
+      destination: [WFICommon.r_photom]
   area:
     title: Area Reference File Information
     description: |
@@ -114,7 +112,7 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_area, GuideWindow.r_area, WFICommon.r_area]
+      destination: [WFICommon.r_area]
   saturation:
     title: Saturation Reference File Information
     description: |
@@ -123,7 +121,6 @@ properties:
     type: string
     archive_catalog:
       datatype: nvarchar(120)
-      destination: [ScienceRefData.r_saturation, GuideWindow.r_saturation, WFICommon.r_saturation]
-
+      destination: [WFICommon.r_saturation]
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/calibration_software_version-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/calibration_software_version-1.0.0.yaml
index 7809b289..65f18f46 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/calibration_software_version-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/calibration_software_version-1.0.0.yaml
@@ -11,9 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.calibration_software_version, GuideWindow.calibration_software_version,
-                WFICommon.calibration_software_version, WFIMosaic.calibration_software_version,
-                SourceCatalog.calibration_software_version, SegmentationMap.calibration_software_version]
+  destination: [WFICommon.calibration_software_version]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/file_date-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/file_date-1.0.0.yaml
index d9e742c9..a000987d 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/file_date-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/file_date-1.0.0.yaml
@@ -14,8 +14,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: datetime2
-  destination: [WFIExposure.filedate, GuideWindow.filedate, WFICommon.filedate, WFIMosaic.filedate,
-                SourceCatalog.filedate, SegmentationMap.filedate]
+  destination: [WFICommon.filedate]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/filename-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/filename-1.0.0.yaml
index 7b1204fc..914b437d 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/filename-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/filename-1.0.0.yaml
@@ -11,8 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.filename, WFIMosaic.filename, GuideWindow.filename, WFICommon.filename,
-                SourceCatalog.filename, SegmentationMap.filename]
+  destination: [WFICommon.filename]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/model_type-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/model_type-1.0.0.yaml
index e329bea5..f9b19a1b 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/model_type-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/model_type-1.0.0.yaml
@@ -11,8 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(50)
-  destination: [WFIExposure.model_type, GuideWindow.model_type, WFICommon.model_type, WFIMosaic.model_type,
-                SourceCatalog.model_type, SegmentationMap.model_type]
+  destination: [WFICommon.model_type]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/origin-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/origin-1.0.0.yaml
index 5861dfd1..f6bad44d 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/origin-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/origin-1.0.0.yaml
@@ -14,8 +14,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(15)
-  destination: [WFIExposure.origin, GuideWindow.origin, WFICommon.origin, WFIMosaic.origin,
-                SourceCatalog.origin, SegmentationMap.origin]
+  destination: [WFICommon.origin]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/prd_software_version-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/prd_software_version-1.0.0.yaml
index 4d3c38ab..362ffbaf 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/prd_software_version-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/prd_software_version-1.0.0.yaml
@@ -11,9 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.prd_software_version, GuideWindow.prd_software_version,
-                WFICommon.prd_software_version, WFIMosaic.prd_software_version,
-                SourceCatalog.prd_software_version, SegmentationMap.prd_software_version]
+  destination: [WFICommon.prd_software_version]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/sdf_software_version-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/sdf_software_version-1.0.0.yaml
index 4f8fe4dc..a6cfe652 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/sdf_software_version-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/sdf_software_version-1.0.0.yaml
@@ -11,9 +11,7 @@ sdf:
     origin: TBD
 archive_catalog:
   datatype: nvarchar(120)
-  destination: [WFIExposure.sdf_software_version, GuideWindow.sdf_software_version,
-                WFICommon.sdf_software_version, WFIMosaic.sdf_software_version,
-                SourceCatalog.sdf_software_version, SegmentationMap.sdf_software_version]
+  destination: [WFICommon.sdf_software_version]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/tagged_scalars/telescope-1.0.0.yaml b/src/rad/resources/schemas/tvac/tagged_scalars/telescope-1.0.0.yaml
index d4edbcd7..45748f36 100644
--- a/src/rad/resources/schemas/tvac/tagged_scalars/telescope-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/tagged_scalars/telescope-1.0.0.yaml
@@ -10,8 +10,7 @@ enum: [ROMAN]
 
 archive_catalog:
   datatype: nvarchar(5)
-  destination: [WFIExposure.telescope, WFIMosaic.telescope, GuideWindow.telescope, WFICommon.telescope,
-                SourceCatalog.telescope, SegmentationMap.telescope]
+  destination: [WFICommon.telescope]
 
 flowStyle: block
 ...
diff --git a/src/rad/resources/schemas/tvac/wfi_mode-1.0.0.yaml b/src/rad/resources/schemas/tvac/wfi_mode-1.0.0.yaml
index c2db90fc..ba975f23 100644
--- a/src/rad/resources/schemas/tvac/wfi_mode-1.0.0.yaml
+++ b/src/rad/resources/schemas/tvac/wfi_mode-1.0.0.yaml
@@ -19,7 +19,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(5)
-      destination: [WFIExposure.instrument_name, GuideWindow.instrument_name, WFICommon.instrument_name]
+      destination: [WFICommon.instrument_name]
   detector:
     title: WFI Detector
     description: |
@@ -31,7 +31,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(10)
-      destination: [WFIExposure.detector, GuideWindow.detector, WFICommon.detector]
+      destination: [WFICommon.detector]
   optical_element:
     title: WFI Optical Element
     description: |
@@ -43,7 +43,7 @@ properties:
         origin: TBD
     archive_catalog:
       datatype: nvarchar(20)
-      destination: [WFIExposure.optical_element, GuideWindow.optical_element, WFICommon.optical_element]
+      destination: [WFICommon.optical_element]
 propertyOrder: [detector, optical_element, name]
 flowStyle: block
 required: [detector, optical_element, name]


Test patch:
diff --git a/src/rad/resources/schemas/fps/groundtest-1.0.0.yaml b/src/rad/resources/schemas/fps/groundtest-1.0.0.yaml
index 24772339..c04685a4 100644
--- a/src/rad/resources/schemas/fps/groundtest-1.0.0.yaml
+++ b/src/rad/resources/schemas/fps/groundtest-1.0.0.yaml
@@ -117,7 +117,6 @@ properties:
     datatype: float64
     exact_datatype: true
     # needs ndim
-
 propertyOrder: [test_name, test_phase, test_environment, test_script,
                 product_date, product_version, conversion_date, conversion_version,
                 filename_pnt5, filepath_level_pnt5, filename_l1a, detector_id,