diff --git a/frontend/src/lib/conduit/fhir/athena_client.ts b/frontend/src/lib/conduit/fhir/athena_client.ts
index 85a658b1..dcc3e304 100644
--- a/frontend/src/lib/conduit/fhir/athena_client.ts
+++ b/frontend/src/lib/conduit/fhir/athena_client.ts
@@ -16,28 +16,7 @@ export class AthenaClient  extends FHIR401Client implements IClient {
    * @constructor
    */
   async SyncAll(db: IDatabaseRepository): Promise<UpsertSummary> {
-    const supportedResources: string[] = [
-      "AllergyIntolerance",
-      //"Binary",
-      "CarePlan",
-      "CareTeam",
-      "Condition",
-      "Device",
-      "DiagnosticReport",
-      "DocumentReference",
-      "Encounter",
-      "Goal",
-      "Immunization",
-      //"Location",
-      //"Medication",
-      //"MedicationRequest",
-      "Observation",
-      //"Organization",
-      //"Patient",
-      //"Practitioner",
-      "Procedure",
-      //"Provenance",
-    ]
+    const supportedResources: string[] = this.usCoreResources
 
     return this.SyncAllByResourceName(db, supportedResources)
   }
diff --git a/frontend/src/lib/conduit/fhir/epic_client.ts b/frontend/src/lib/conduit/fhir/epic_client.ts
index 611b5cfc..ea91126b 100644
--- a/frontend/src/lib/conduit/fhir/epic_client.ts
+++ b/frontend/src/lib/conduit/fhir/epic_client.ts
@@ -18,23 +18,13 @@ export class EpicClient  extends FHIR401Client implements IClient {
    * @constructor
    */
   async SyncAll(db: IDatabaseRepository): Promise<UpsertSummary> {
-    const supportedResources: string[] = [
-      "AllergyIntolerance",
-      "CarePlan",
-      "CareTeam",
-      "Condition",
+    const supportedResources: string[] = this.usCoreResources.concat([
       "Consent",
-      "Device",
-      "Encounter",
       "FamilyMemberHistory",
-      "Goal",
-      "Immunization",
       "InsurancePlan",
       "MedicationRequest",
       "NutritionOrder",
-      "Observation",
       "Person",
-      "Procedure",
       "Provenance",
       "Questionnaire",
       "QuestionnaireResponse",
@@ -42,7 +32,7 @@ export class EpicClient  extends FHIR401Client implements IClient {
       "Schedule",
       "ServiceRequest",
       "Slot",
-    ]
+    ])
 
     return this.SyncAllByResourceName(db, supportedResources)
   }
diff --git a/frontend/src/lib/conduit/fhir/healthit_client.ts b/frontend/src/lib/conduit/fhir/healthit_client.ts
index 2b6a194c..7b23d14a 100644
--- a/frontend/src/lib/conduit/fhir/healthit_client.ts
+++ b/frontend/src/lib/conduit/fhir/healthit_client.ts
@@ -18,23 +18,13 @@ export class HealthITClient  extends FHIR401Client implements IClient {
    * @constructor
    */
   async SyncAll(db: IDatabaseRepository): Promise<UpsertSummary> {
-    const supportedResources: string[] = [
-      "AllergyIntolerance",
-      "CarePlan",
-      "CareTeam",
-      "Condition",
+    const supportedResources: string[] = this.usCoreResources.concat([
       "Consent",
-      "Device",
-      "Encounter",
       "FamilyMemberHistory",
-      "Goal",
-      "Immunization",
       "InsurancePlan",
       "MedicationRequest",
       "NutritionOrder",
-      "Observation",
       "Person",
-      "Procedure",
       "Provenance",
       "Questionnaire",
       "QuestionnaireResponse",
@@ -42,7 +32,7 @@ export class HealthITClient  extends FHIR401Client implements IClient {
       "Schedule",
       "ServiceRequest",
       "Slot",
-    ]
+    ])
 
     return this.SyncAllByResourceName(db, supportedResources)
   }