diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/EnumConstantDeclaration.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/EnumConstantDeclaration.kt
index 66afa071d51..3b2b8c78486 100644
--- a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/EnumConstantDeclaration.kt
+++ b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/EnumConstantDeclaration.kt
@@ -25,6 +25,7 @@
  */
 package de.fraunhofer.aisec.cpg.graph.declarations
 
+import de.fraunhofer.aisec.cpg.graph.AST
 import de.fraunhofer.aisec.cpg.graph.HasInitializer
 import de.fraunhofer.aisec.cpg.graph.statements.expressions.Expression
 
@@ -33,6 +34,5 @@ import de.fraunhofer.aisec.cpg.graph.statements.expressions.Expression
  * explicit initializer value.
  */
 class EnumConstantDeclaration : ValueDeclaration(), HasInitializer {
-
-    override var initializer: Expression? = null
+    @AST override var initializer: Expression? = null
 }
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/FunctionTemplateDeclaration.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/FunctionTemplateDeclaration.kt
index ee452931cc7..3ebaa16e330 100644
--- a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/FunctionTemplateDeclaration.kt
+++ b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/declarations/FunctionTemplateDeclaration.kt
@@ -25,6 +25,7 @@
  */
 package de.fraunhofer.aisec.cpg.graph.declarations
 
+import de.fraunhofer.aisec.cpg.graph.AST
 import de.fraunhofer.aisec.cpg.graph.edge.Properties
 import de.fraunhofer.aisec.cpg.graph.edge.PropertyEdge
 import de.fraunhofer.aisec.cpg.graph.edge.PropertyEdge.Companion.propertyEqualsList
@@ -40,6 +41,7 @@ class FunctionTemplateDeclaration : TemplateDeclaration() {
      * expansion pass for each instantiation of the FunctionTemplate there will be a realization
      */
     @Relationship(value = "REALIZATION", direction = Relationship.Direction.OUTGOING)
+    @AST
     private val realizationEdges: MutableList<PropertyEdge<FunctionDeclaration>> = ArrayList()
 
     val realization: List<FunctionDeclaration> by
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/expressions/RangeExpression.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/expressions/RangeExpression.kt
index 7fb5c2e839b..5a56ec71238 100644
--- a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/expressions/RangeExpression.kt
+++ b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/statements/expressions/RangeExpression.kt
@@ -25,6 +25,7 @@
  */
 package de.fraunhofer.aisec.cpg.graph.statements.expressions
 
+import de.fraunhofer.aisec.cpg.graph.AST
 import java.util.*
 
 /**
@@ -54,17 +55,17 @@ import java.util.*
 class RangeExpression : Expression() {
 
     /** The lower bound ("floor") of the range. This index is usually *inclusive*. */
-    var floor: Expression? = null
+    @AST var floor: Expression? = null
 
     /** The upper bound ("ceiling") of the range. This index is usually *exclusive*. */
-    var ceiling: Expression? = null
+    @AST var ceiling: Expression? = null
 
     /**
      * Some languages offer a third value. The meaning depends completely on the language. For
      * example, Python allows specifying a step, while Go allows to control the underlying array's
      * capacity (not length).
      */
-    var third: Expression? = null
+    @AST var third: Expression? = null
 
     /** The operator code that separates the range elements. Common cases are `:` or `...` */
     var operatorCode = ":"