diff --git a/src/VstsSyncMigrator.Core/Execution/MigrationContext/TestPlansAndSuitesMigrationContext.cs b/src/VstsSyncMigrator.Core/Execution/MigrationContext/TestPlansAndSuitesMigrationContext.cs
index 17e559dc7..c3ff9e526 100644
--- a/src/VstsSyncMigrator.Core/Execution/MigrationContext/TestPlansAndSuitesMigrationContext.cs
+++ b/src/VstsSyncMigrator.Core/Execution/MigrationContext/TestPlansAndSuitesMigrationContext.cs
@@ -75,11 +75,7 @@ public override void Configure(IProcessorConfig config)
         {
             _config = (TestPlansAndSuitesMigrationConfig)config;
 
-
-                var nodeStructureOptions =
-                    _engineConfig.CommonEnrichersConfig.OfType<TfsNodeStructureOptions>().FirstOrDefault()
-                    ?? throw new InvalidOperationException("Cannot use common node structure because it is not found.");
-                _nodeStructureEnricher.Configure(nodeStructureOptions);
+            PullCommonEnrichersConfig<TfsNodeStructure, TfsNodeStructureOptions>(_engineConfig.CommonEnrichersConfig, _nodeStructureEnricher);
             
         }