diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/TranslationResult.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/TranslationResult.kt
index cbb8a386378..6cd4c4b2114 100644
--- a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/TranslationResult.kt
+++ b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/TranslationResult.kt
@@ -84,6 +84,10 @@ class TranslationResult(
     /** A free-for-use HashMap where passes can store whatever they want. */
     val scratch: MutableMap<String, Any> = ConcurrentHashMap()
 
+    @Transient
+    @PopulatedByPass(ImportResolver::class)
+    var importDependencies = ImportDependencies(mutableListOf())
+
     /**
      * A free-for-use collection of unique nodes. Nodes stored here will be exported to Neo4j, too.
      */
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/SymbolResolver.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/SymbolResolver.kt
index 3fec8cbb780..8759d299c72 100644
--- a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/SymbolResolver.kt
+++ b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/SymbolResolver.kt
@@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory
 @DependsOn(TypeHierarchyResolver::class)
 @DependsOn(EvaluationOrderGraphPass::class)
 @DependsOn(ImportResolver::class)
-open class SymbolResolver(ctx: TranslationContext) : ComponentPass(ctx) {
+open class SymbolResolver(ctx: TranslationContext) : TranslationResultPass(ctx) {
 
     /** Configuration for the [SymbolResolver]. */
     class Configuration(
@@ -122,8 +122,8 @@ open class SymbolResolver(ctx: TranslationContext) : ComponentPass(ctx) {
             null
         }
 
-    override fun accept(component: Component) {
-        ctx.currentComponent = component
+    override fun accept(component: TranslationResult) {
+        //        ctx.currentComponent = component
         walker = ScopedWalker(scopeManager)
 
         cacheTemplates(component)