diff --git a/MODULE.bazel b/MODULE.bazel
index 62c41a795..01d6aec9e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -38,10 +38,10 @@ maven.install(
     name = "maven",
     artifacts = [
         "org.slf4j:slf4j-api:2.0.17",
-        "io.joern:flatgraph-core_3:0.1.34",
-        "io.joern:flatgraph-help_3:0.1.34",
-        "io.joern:flatgraph-domain-classes-generator_3:0.1.34",
-        "io.joern:flatgraph-odb-convert_3:0.1.34",
+        "io.joern:flatgraph-core_3:0.1.35",
+        "io.joern:flatgraph-help_3:0.1.35",
+        "io.joern:flatgraph-domain-classes-generator_3:0.1.35",
+        "io.joern:flatgraph-odb-convert_3:0.1.35",
         "net.sf.trove4j:core:3.1.0",
         "com.google.protobuf:protobuf-java:4.34.1",
         "org.json4s:json4s-native_3:4.0.3",
diff --git a/build.sbt b/build.sbt
index f3177dcf1..0d1391f3c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 name := "codepropertygraph"
 
 // parsed by project/Versions.scala, updated by updateDependencies.sh
-val flatgraphVersion = "0.1.34"
+val flatgraphVersion = "0.1.35"
 
 inThisBuild(
   List(
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala
index 3049dee43..29e0009f7 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Annotation.scala
@@ -31,6 +31,19 @@ trait AnnotationBase extends AbstractNode with ExpressionBase with StaticType[An
 
 object Annotation {
   val Label = "ANNOTATION"
+  def unapply(node: AnnotationBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    fullName = node.fullName,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala
index c43225682..3ca42f4b1 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationLiteral.scala
@@ -30,6 +30,18 @@ trait AnnotationLiteralBase extends AbstractNode with ExpressionBase with Static
 
 object AnnotationLiteral {
   val Label = "ANNOTATION_LITERAL"
+  def unapply(node: AnnotationLiteralBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala
index b934f7522..019714615 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameter.scala
@@ -26,6 +26,14 @@ trait AnnotationParameterBase extends AbstractNode with AstNodeBase with StaticT
 
 object AnnotationParameter {
   val Label = "ANNOTATION_PARAMETER"
+  def unapply(node: AnnotationParameterBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala
index 07bea3aec..47f0fc44b 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/AnnotationParameterAssign.scala
@@ -29,6 +29,14 @@ trait AnnotationParameterAssignBase
 
 object AnnotationParameterAssign {
   val Label = "ANNOTATION_PARAMETER_ASSIGN"
+  def unapply(node: AnnotationParameterAssignBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala
index 004df72d8..2018e25fe 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ArrayInitializer.scala
@@ -29,6 +29,17 @@ trait ArrayInitializerBase extends AbstractNode with ExpressionBase with StaticT
 
 object ArrayInitializer {
   val Label = "ARRAY_INITIALIZER"
+  def unapply(node: ArrayInitializerBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Binding.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Binding.scala
index 3ad20847f..061d634a7 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Binding.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Binding.scala
@@ -22,7 +22,8 @@ trait BindingBase extends AbstractNode with StaticType[BindingEMT] {
 }
 
 object Binding {
-  val Label = "BINDING"
+  val Label                      = "BINDING"
+  def unapply(node: BindingBase) = (methodFullName = node.methodFullName, name = node.name, signature = node.signature)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala
index cd684dfc3..430f7f3e9 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Block.scala
@@ -39,6 +39,20 @@ trait BlockBase extends AbstractNode with ExpressionBase with StaticType[BlockEM
 
 object Block {
   val Label = "BLOCK"
+  def unapply(node: BlockBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala
index 6bb993bad..8e8e430ee 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Call.scala
@@ -48,6 +48,25 @@ trait CallBase extends AbstractNode with CallReprBase with ExpressionBase with S
 
 object Call {
   val Label = "CALL"
+  def unapply(node: CallBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dispatchType = node.dispatchType,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    methodFullName = node.methodFullName,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    signature = node.signature,
+    staticReceiver = node.staticReceiver,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala
index abca93ac1..f3b5a3b57 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ClosureBinding.scala
@@ -22,6 +22,8 @@ trait ClosureBindingBase extends AbstractNode with StaticType[ClosureBindingEMT]
 
 object ClosureBinding {
   val Label = "CLOSURE_BINDING"
+  def unapply(node: ClosureBindingBase) =
+    (closureBindingId = node.closureBindingId, evaluationStrategy = node.evaluationStrategy)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala
index 9f2528bb3..5307e1166 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Comment.scala
@@ -27,6 +27,15 @@ trait CommentBase extends AbstractNode with AstNodeBase with StaticType[CommentE
 
 object Comment {
   val Label = "COMMENT"
+  def unapply(node: CommentBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    filename = node.filename,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ConfigFile.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ConfigFile.scala
index 2679849dd..8e1453f7f 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ConfigFile.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ConfigFile.scala
@@ -21,7 +21,8 @@ trait ConfigFileBase extends AbstractNode with StaticType[ConfigFileEMT] {
 }
 
 object ConfigFile {
-  val Label = "CONFIG_FILE"
+  val Label                         = "CONFIG_FILE"
+  def unapply(node: ConfigFileBase) = (content = node.content, name = node.name)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala
index 94cf13147..9bf69b304 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/ControlStructure.scala
@@ -31,6 +31,19 @@ trait ControlStructureBase extends AbstractNode with ExpressionBase with StaticT
 
 object ControlStructure {
   val Label = "CONTROL_STRUCTURE"
+  def unapply(node: ControlStructureBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    controlStructureType = node.controlStructureType,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    parserTypeName = node.parserTypeName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala
index 50f36f31f..7c5061636 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Dependency.scala
@@ -23,6 +23,8 @@ trait DependencyBase extends AbstractNode with StaticType[DependencyEMT] {
 
 object Dependency {
   val Label = "DEPENDENCY"
+  def unapply(node: DependencyBase) =
+    (dependencyGroupId = node.dependencyGroupId, name = node.name, version = node.version)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala
index 9651ff7bb..7288596c1 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/FieldIdentifier.scala
@@ -30,6 +30,18 @@ trait FieldIdentifierBase extends AbstractNode with ExpressionBase with StaticTy
 
 object FieldIdentifier {
   val Label = "FIELD_IDENTIFIER"
+  def unapply(node: FieldIdentifierBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    canonicalName = node.canonicalName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala
index e178e6080..f3cc7409c 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/File.scala
@@ -29,6 +29,17 @@ trait FileBase extends AbstractNode with AstNodeBase with StaticType[FileEMT] {
 
 object File {
   val Label = "FILE"
+  def unapply(node: FileBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    content = node.content,
+    hash = node.hash,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Finding.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Finding.scala
index 50ab32de7..feca5eee8 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Finding.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Finding.scala
@@ -25,6 +25,8 @@ trait FindingBase extends AbstractNode with StaticType[FindingEMT] {
 
 object Finding {
   val Label = "FINDING"
+  def unapply(node: FindingBase) =
+    (evidenceDescription = node.evidenceDescription, evidence = node.evidence, keyValuePairs = node.keyValuePairs)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala
index f77b8e085..eba854d5b 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Identifier.scala
@@ -41,6 +41,21 @@ trait IdentifierBase extends AbstractNode with ExpressionBase with StaticType[Id
 
 object Identifier {
   val Label = "IDENTIFIER"
+  def unapply(node: IdentifierBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala
index 75db14110..85af9ca37 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Import.scala
@@ -40,6 +40,20 @@ trait ImportBase extends AbstractNode with AstNodeBase with StaticType[ImportEMT
 
 object Import {
   val Label = "IMPORT"
+  def unapply(node: ImportBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    explicitAs = node.explicitAs,
+    importedAs = node.importedAs,
+    importedEntity = node.importedEntity,
+    isExplicit = node.isExplicit,
+    isModuleImport = node.isModuleImport,
+    isWildcard = node.isWildcard,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala
index 6333aff7e..48017758a 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpLabel.scala
@@ -28,6 +28,16 @@ trait JumpLabelBase extends AbstractNode with AstNodeBase with StaticType[JumpLa
 
 object JumpLabel {
   val Label = "JUMP_LABEL"
+  def unapply(node: JumpLabelBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    parserTypeName = node.parserTypeName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala
index b6195471c..7108e7570 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/JumpTarget.scala
@@ -29,6 +29,17 @@ trait JumpTargetBase extends AbstractNode with CfgNodeBase with StaticType[JumpT
 
 object JumpTarget {
   val Label = "JUMP_TARGET"
+  def unapply(node: JumpTargetBase) = (
+    argumentIndex = node.argumentIndex,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    parserTypeName = node.parserTypeName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/KeyValuePair.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/KeyValuePair.scala
index cb65383d2..fdf527775 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/KeyValuePair.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/KeyValuePair.scala
@@ -21,7 +21,8 @@ trait KeyValuePairBase extends AbstractNode with StaticType[KeyValuePairEMT] {
 }
 
 object KeyValuePair {
-  val Label = "KEY_VALUE_PAIR"
+  val Label                           = "KEY_VALUE_PAIR"
+  def unapply(node: KeyValuePairBase) = (key = node.key, value = node.value)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala
index 792532153..24254961e 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Literal.scala
@@ -39,6 +39,20 @@ trait LiteralBase extends AbstractNode with ExpressionBase with StaticType[Liter
 
 object Literal {
   val Label = "LITERAL"
+  def unapply(node: LiteralBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala
index bba98802e..9161ac91f 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Local.scala
@@ -42,6 +42,20 @@ trait LocalBase extends AbstractNode with AstNodeBase with DeclarationBase with
 
 object Local {
   val Label = "LOCAL"
+  def unapply(node: LocalBase) = (
+    closureBindingId = node.closureBindingId,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    genericSignature = node.genericSignature,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala
index e14bc3f51..4b7ca7988 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Member.scala
@@ -44,6 +44,21 @@ trait MemberBase extends AbstractNode with AstNodeBase with DeclarationBase with
 
 object Member {
   val Label = "MEMBER"
+  def unapply(node: MemberBase) = (
+    astParentFullName = node.astParentFullName,
+    astParentType = node.astParentType,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    genericSignature = node.genericSignature,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala
index 4904220c5..607f9a47f 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MetaData.scala
@@ -31,6 +31,8 @@ trait MetaDataBase extends AbstractNode with StaticType[MetaDataEMT] {
 
 object MetaData {
   val Label = "META_DATA"
+  def unapply(node: MetaDataBase) =
+    (hash = node.hash, language = node.language, overlays = node.overlays, root = node.root, version = node.version)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala
index 0a7b3f605..cb834ae38 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Method.scala
@@ -50,6 +50,25 @@ trait MethodBase extends AbstractNode with CfgNodeBase with DeclarationBase with
 
 object Method {
   val Label = "METHOD"
+  def unapply(node: MethodBase) = (
+    astParentFullName = node.astParentFullName,
+    astParentType = node.astParentType,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    columnNumberEnd = node.columnNumberEnd,
+    filename = node.filename,
+    fullName = node.fullName,
+    genericSignature = node.genericSignature,
+    hash = node.hash,
+    isExternal = node.isExternal,
+    lineNumber = node.lineNumber,
+    lineNumberEnd = node.lineNumberEnd,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    signature = node.signature
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala
index d7f8945ef..08b52b83d 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterIn.scala
@@ -50,6 +50,22 @@ trait MethodParameterInBase
 
 object MethodParameterIn {
   val Label = "METHOD_PARAMETER_IN"
+  def unapply(node: MethodParameterInBase) = (
+    closureBindingId = node.closureBindingId,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    evaluationStrategy = node.evaluationStrategy,
+    index = node.index,
+    isVariadic = node.isVariadic,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala
index 462e08824..c5f7d5da2 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodParameterOut.scala
@@ -42,6 +42,19 @@ trait MethodParameterOutBase
 
 object MethodParameterOut {
   val Label = "METHOD_PARAMETER_OUT"
+  def unapply(node: MethodParameterOutBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    evaluationStrategy = node.evaluationStrategy,
+    index = node.index,
+    isVariadic = node.isVariadic,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala
index acc4c1035..b86ac2415 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodRef.scala
@@ -41,6 +41,21 @@ trait MethodRefBase extends AbstractNode with ExpressionBase with StaticType[Met
 
 object MethodRef {
   val Label = "METHOD_REF"
+  def unapply(node: MethodRefBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    methodFullName = node.methodFullName,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala
index 07d1ff15c..a6e37e264 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/MethodReturn.scala
@@ -38,6 +38,18 @@ trait MethodReturnBase extends AbstractNode with CfgNodeBase with StaticType[Met
 
 object MethodReturn {
   val Label = "METHOD_RETURN"
+  def unapply(node: MethodReturnBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    evaluationStrategy = node.evaluationStrategy,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala
index bd8d52bbb..6ffb37233 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Modifier.scala
@@ -27,6 +27,15 @@ trait ModifierBase extends AbstractNode with AstNodeBase with StaticType[Modifie
 
 object Modifier {
   val Label = "MODIFIER"
+  def unapply(node: ModifierBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    modifierType = node.modifierType,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala
index 36083bba2..0fbae482f 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Namespace.scala
@@ -27,6 +27,15 @@ trait NamespaceBase extends AbstractNode with AstNodeBase with StaticType[Namesp
 
 object Namespace {
   val Label = "NAMESPACE"
+  def unapply(node: NamespaceBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala
index a425de006..75bb16cb9 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NamespaceBlock.scala
@@ -29,6 +29,17 @@ trait NamespaceBlockBase extends AbstractNode with AstNodeBase with StaticType[N
 
 object NamespaceBlock {
   val Label = "NAMESPACE_BLOCK"
+  def unapply(node: NamespaceBlockBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    filename = node.filename,
+    fullName = node.fullName,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala
index fba8be9d6..5c32df5e5 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Return.scala
@@ -29,6 +29,17 @@ trait ReturnBase extends AbstractNode with ExpressionBase with StaticType[Return
 
 object Return {
   val Label = "RETURN"
+  def unapply(node: ReturnBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Tag.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Tag.scala
index 1aa76f36a..08ce23b2b 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Tag.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Tag.scala
@@ -21,7 +21,8 @@ trait TagBase extends AbstractNode with StaticType[TagEMT] {
 }
 
 object Tag {
-  val Label = "TAG"
+  val Label                  = "TAG"
+  def unapply(node: TagBase) = (name = node.name, value = node.value)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TagNodePair.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TagNodePair.scala
index 105d11508..e883068d0 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TagNodePair.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TagNodePair.scala
@@ -22,7 +22,8 @@ trait TagNodePairBase extends AbstractNode with StaticType[TagNodePairEMT] {
 }
 
 object TagNodePair {
-  val Label = "TAG_NODE_PAIR"
+  val Label                          = "TAG_NODE_PAIR"
+  def unapply(node: TagNodePairBase) = (node = node.node, tag = node.tag)
 }
 
 /** * CONTAINED NODES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala
index e958ef60c..e3782b4cf 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TemplateDom.scala
@@ -30,6 +30,18 @@ trait TemplateDomBase extends AbstractNode with ExpressionBase with StaticType[T
 
 object TemplateDom {
   val Label = "TEMPLATE_DOM"
+  def unapply(node: TemplateDomBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Type.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Type.scala
index bad83ed7a..4d4e821ed 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Type.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Type.scala
@@ -22,7 +22,8 @@ trait TypeBase extends AbstractNode with StaticType[TypeEMT] {
 }
 
 object Type {
-  val Label = "TYPE"
+  val Label                   = "TYPE"
+  def unapply(node: TypeBase) = (fullName = node.fullName, name = node.name, typeDeclFullName = node.typeDeclFullName)
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala
index 3b2ac3788..47807f13a 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeArgument.scala
@@ -26,6 +26,14 @@ trait TypeArgumentBase extends AbstractNode with AstNodeBase with StaticType[Typ
 
 object TypeArgument {
   val Label = "TYPE_ARGUMENT"
+  def unapply(node: TypeArgumentBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala
index b3bc27256..52c63bd48 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeDecl.scala
@@ -47,6 +47,23 @@ trait TypeDeclBase extends AbstractNode with AstNodeBase with StaticType[TypeDec
 
 object TypeDecl {
   val Label = "TYPE_DECL"
+  def unapply(node: TypeDeclBase) = (
+    aliasTypeFullName = node.aliasTypeFullName,
+    astParentFullName = node.astParentFullName,
+    astParentType = node.astParentType,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    filename = node.filename,
+    fullName = node.fullName,
+    genericSignature = node.genericSignature,
+    inheritsFromTypeFullName = node.inheritsFromTypeFullName,
+    isExternal = node.isExternal,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala
index 965bafbeb..cc1a63112 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeParameter.scala
@@ -27,6 +27,15 @@ trait TypeParameterBase extends AbstractNode with AstNodeBase with StaticType[Ty
 
 object TypeParameter {
   val Label = "TYPE_PARAMETER"
+  def unapply(node: TypeParameterBase) = (
+    code = node.code,
+    columnNumber = node.columnNumber,
+    lineNumber = node.lineNumber,
+    name = node.name,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala
index efb9e8ff0..a82e10a07 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/TypeRef.scala
@@ -39,6 +39,20 @@ trait TypeRefBase extends AbstractNode with ExpressionBase with StaticType[TypeR
 
 object TypeRef {
   val Label = "TYPE_REF"
+  def unapply(node: TypeRefBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala
index 3d678e131..4c7961edf 100644
--- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala
+++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/Unknown.scala
@@ -43,6 +43,22 @@ trait UnknownBase extends AbstractNode with ExpressionBase with StaticType[Unkno
 
 object Unknown {
   val Label = "UNKNOWN"
+  def unapply(node: UnknownBase) = (
+    argumentIndex = node.argumentIndex,
+    argumentLabel = node.argumentLabel,
+    argumentName = node.argumentName,
+    code = node.code,
+    columnNumber = node.columnNumber,
+    containedRef = node.containedRef,
+    dynamicTypeHintFullName = node.dynamicTypeHintFullName,
+    lineNumber = node.lineNumber,
+    offset = node.offset,
+    offsetEnd = node.offsetEnd,
+    order = node.order,
+    parserTypeName = node.parserTypeName,
+    possibleTypes = node.possibleTypes,
+    typeFullName = node.typeFullName
+  )
 }
 
 /** * NODE PROPERTIES:
diff --git a/maven_install.json b/maven_install.json
index 6d1aa4eea..77ab3e18d 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -8,10 +8,10 @@
     "com.google.j2objc:j2objc-annotations": 2003271689,
     "com.google.protobuf:protobuf-java": 1237026331,
     "com.lihaoyi:os-lib_3": 899915638,
-    "io.joern:flatgraph-core_3": -1427372425,
-    "io.joern:flatgraph-domain-classes-generator_3": -86659973,
-    "io.joern:flatgraph-help_3": 1669225497,
-    "io.joern:flatgraph-odb-convert_3": -527729915,
+    "io.joern:flatgraph-core_3": 1060140408,
+    "io.joern:flatgraph-domain-classes-generator_3": -1894114436,
+    "io.joern:flatgraph-help_3": -138228966,
+    "io.joern:flatgraph-odb-convert_3": 1959782918,
     "net.sf.trove4j:core": 1808260229,
     "org.json4s:json4s-native_3": 1421532977,
     "org.scala-lang:scala-library": 1230160761,
@@ -45,24 +45,24 @@
     "com.lihaoyi:geny_3:jar:sources": 1575781288,
     "com.lihaoyi:os-lib_3": 695712032,
     "com.lihaoyi:os-lib_3:jar:sources": 1732147675,
-    "com.lihaoyi:ujson_3": 1749570655,
-    "com.lihaoyi:ujson_3:jar:sources": 195752142,
-    "com.lihaoyi:upickle-core_3": 918154501,
-    "com.lihaoyi:upickle-core_3:jar:sources": 174541473,
+    "com.lihaoyi:ujson_3": 126745168,
+    "com.lihaoyi:ujson_3:jar:sources": 1676340764,
+    "com.lihaoyi:upickle-core_3": 911572118,
+    "com.lihaoyi:upickle-core_3:jar:sources": 1793823939,
     "com.thoughtworks.paranamer:paranamer": 216030769,
     "com.thoughtworks.paranamer:paranamer:jar:sources": 1185138559,
     "com.typesafe:config": 1422037420,
     "com.typesafe:config:jar:sources": 1794326800,
     "io.get-coursier:interface": 1635041630,
     "io.get-coursier:interface:jar:sources": -37171318,
-    "io.joern:flatgraph-core_3": -2129334140,
-    "io.joern:flatgraph-core_3:jar:sources": 1584220606,
-    "io.joern:flatgraph-domain-classes-generator_3": -902397633,
-    "io.joern:flatgraph-domain-classes-generator_3:jar:sources": -1946518416,
-    "io.joern:flatgraph-help_3": 692790954,
-    "io.joern:flatgraph-help_3:jar:sources": -444523173,
-    "io.joern:flatgraph-odb-convert_3": 1755290238,
-    "io.joern:flatgraph-odb-convert_3:jar:sources": -1249652390,
+    "io.joern:flatgraph-core_3": 839026010,
+    "io.joern:flatgraph-core_3:jar:sources": 575284637,
+    "io.joern:flatgraph-domain-classes-generator_3": 170340065,
+    "io.joern:flatgraph-domain-classes-generator_3:jar:sources": -123490520,
+    "io.joern:flatgraph-help_3": -1132428533,
+    "io.joern:flatgraph-help_3:jar:sources": -1476209185,
+    "io.joern:flatgraph-odb-convert_3": -1972259056,
+    "io.joern:flatgraph-odb-convert_3:jar:sources": 1706697962,
     "io.shiftleft:overflowdb-core_3": -1655377345,
     "io.shiftleft:overflowdb-core_3:jar:sources": 422126785,
     "net.oneandone.reflections8:reflections8": -362476393,
@@ -194,17 +194,17 @@
     },
     "com.lihaoyi:ujson_3": {
       "shasums": {
-        "jar": "6a6fc2c9c8643cedb0ebd02e957b4c50dc09d1aef6573ca1e15a8a424c4fa535",
-        "sources": "cd5678e036a158768090491edefa2f8d532d7aaa01bb691667ed4b35ccd6a410"
+        "jar": "dd4109dc66963a3552154f59f20858e2907c13bc1a9410ae46573cdfa94e7517",
+        "sources": "082f8d8759a6f6db5bbed0bd13e274c404000eabb4777ff5e14a7232964d78d8"
       },
-      "version": "4.1.0"
+      "version": "4.4.1"
     },
     "com.lihaoyi:upickle-core_3": {
       "shasums": {
-        "jar": "3d4dbd23edca088a83d722998472c1c5c27678bd01f13572c36627d7061cf596",
-        "sources": "4b34cc2c27bc1abfa4161d157f8be1185ebb6bfe501a544e9650b555f4d2bdda"
+        "jar": "4b7566695c789c9a031167a296c67f08b06107124edfbb58e6e187caaa2dc592",
+        "sources": "ae95168d863b4df5d6f6e2c64caf02fb1da99a50b08d6d2f51b3c4ed10080a76"
       },
-      "version": "4.1.0"
+      "version": "4.4.1"
     },
     "com.thoughtworks.paranamer:paranamer": {
       "shasums": {
@@ -229,31 +229,31 @@
     },
     "io.joern:flatgraph-core_3": {
       "shasums": {
-        "jar": "c14dd8e8510f6762078005d747ae8b5e87047db74f94d51bfd18c158a9623699",
-        "sources": "283034a39afd10d88985cdc8c7c11ebda0bcd7604e61c3dde3ced502cf0ce786"
+        "jar": "00437da45d6636049b316b5308c3e578b776680077e6d3bdad3c3df776c036b6",
+        "sources": "72f6932954e33412d790a7b3737c428163110a2e99cf3f398f0c8865fe73a845"
       },
-      "version": "0.1.34"
+      "version": "0.1.35"
     },
     "io.joern:flatgraph-domain-classes-generator_3": {
       "shasums": {
-        "jar": "32a10cb32e154c6b6a6c1e77590d0200199474bb24d7edd7e204bd9c5a1ba53d",
-        "sources": "e86feedf36b139e74d0e7b9ee4d29c4e6a0ac2d8837fa9f5a0b552ace993854d"
+        "jar": "a64f8ea84a0ced62e3a4d5702ff87959bf0fb3cfe55d8856d82779d550d59d33",
+        "sources": "81632035a3c029f0de74c7a477c24b576056c5573371ed95206ac6f6f8a30217"
       },
-      "version": "0.1.34"
+      "version": "0.1.35"
     },
     "io.joern:flatgraph-help_3": {
       "shasums": {
-        "jar": "9b50d84a9959bbc739ae3d7a2d423c97f6b862705831ce04c9bcc6096450b596",
-        "sources": "074a0ba8ba70d1acd8d69e165fff2990862dc53909241f6ac7cf7cffb2fadcc3"
+        "jar": "10bc62d8815dcfa333b3a48088c8f3301a4380c7d6691a9eed791f44a8df6dca",
+        "sources": "8c7698fc70274487e265f61472154be0fee88a18cf24f05dc3cf11e998b4986b"
       },
-      "version": "0.1.34"
+      "version": "0.1.35"
     },
     "io.joern:flatgraph-odb-convert_3": {
       "shasums": {
-        "jar": "6cc159d5a4714b353ebb7325c3af1807cacaeaca18393ccbd1b1b5fd511ad966",
-        "sources": "da5131ec07dfa4687695fdeb1c246abc1e09e14a06e45cfcb73879a7eaa8100f"
+        "jar": "9ba916f4cf9eecd93b56198479fc94d59638d08d84fb05f6c5eb8e968540077a",
+        "sources": "79afe55a3ac89f48698d429d565c37ad35865a788a7839e747d5bba73880e354"
       },
-      "version": "0.1.34"
+      "version": "0.1.35"
     },
     "io.shiftleft:overflowdb-core_3": {
       "shasums": {
diff --git a/schema/BUILD b/schema/BUILD
index c8c4ed88a..7ca917ae8 100644
--- a/schema/BUILD
+++ b/schema/BUILD
@@ -27,7 +27,7 @@ genrule(
     name = "run_codegen",
     outs = ["generated_classes.srcjar"],
     cmd = """
-  $(location :codegen) -c 'io.shiftleft.codepropertygraph.schema.CpgSchema$$' -f instance -o $(RULEDIR)/generated_classes
+  $(location :codegen) --scala3 -c 'io.shiftleft.codepropertygraph.schema.CpgSchema$$' -f instance -o $(RULEDIR)/generated_classes
   $(JAVABASE)/bin/jar --create --file $@ -C $(RULEDIR)/generated_classes .
   """,
     toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
diff --git a/schema/build.sbt b/schema/build.sbt
index 5917f00a1..e6221c658 100644
--- a/schema/build.sbt
+++ b/schema/build.sbt
@@ -7,6 +7,8 @@ enablePlugins(FlatgraphCodegenSbtPlugin)
 generateDomainClasses/classWithSchema := "io.shiftleft.codepropertygraph.schema.CpgSchema$"
 generateDomainClasses/fieldName       := "instance"
 generateDomainClasses/outputDir       := (Projects.domainClasses / generatedSrcDir).value
+generateDomainClasses/scala3          := true
+generateDomainClassesCheck/scala3     := true
 
 val generateProtobuf = taskKey[File]("generate protobuf definitions: cpg.proto")
 generateProtobuf := Def.taskDyn {