diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index ef743d4c..1538f87b 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -374,6 +374,9 @@
 			<macro>
 				<like>file</like>
 			</macro>
+			<annotation>
+				<like>file</like>
+			</annotation>
 
 			<access>
 				<fill>
@@ -508,9 +511,15 @@
 			<include>
 				<normal>#4E82F6</normal>
 			</include>
+			<import>
+				<normal>#4E82F6</normal>
+			</import>
 			<macro_use>
 				<normal>#4E82F6</normal>
 			</macro_use>
+			<annotation_use>
+				<normal>#4E82F6</normal>
+			</annotation_use>
 
 			<aggregation>
 				<normal>#666666</normal>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index a737369f..6df33d8b 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -357,6 +357,9 @@
 			<macro>
 				<like>file</like>
 			</macro>
+			<annotation>
+				<like>file</like>
+			</annotation>
 
 			<access>
 				<fill>
@@ -479,6 +482,19 @@
 				<like>template_argument</like>
 			</template_member_specialization>
 
+			<include>
+				<normal>#719660</normal>
+			</include>
+			<import>
+				<normal>#719660</normal>
+			</import>
+			<macro_use>
+				<normal>#719660</normal>
+			</macro_use>
+			<annotation_use>
+				<normal>#719660</normal>
+			</annotation_use>
+
 			<aggregation>
 				<normal>#DDD</normal>
 				<focus>#CCC</focus>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index c3590db2..7fbe57cd 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -360,6 +360,9 @@
 			<macro>
 				<like>file</like>
 			</macro>
+			<annotation>
+				<like>file</like>
+			</annotation>
 
 			<access>
 				<fill>
@@ -485,9 +488,15 @@
 			<include>
 				<normal>#247368</normal>
 			</include>
+			<import>
+				<normal>#247368</normal>
+			</import>
 			<macro_use>
 				<normal>#247368</normal>
 			</macro_use>
+			<annotation_use>
+				<normal>#247368</normal>
+			</annotation_use>
 
 			<aggregation>
 				<normal>#4D4D4D</normal>
diff --git a/bin/app/data/gui/graph_view/images/annotation.png b/bin/app/data/gui/graph_view/images/annotation.png
new file mode 100644
index 00000000..6d35387e
Binary files /dev/null and b/bin/app/data/gui/graph_view/images/annotation.png differ
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_DefaultVisitorAdapter.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_DefaultVisitorAdapter.txt
index 71c6e3b2..233c1c8a 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_DefaultVisitorAdapter.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_DefaultVisitorAdapter.txt
@@ -86,6 +86,7 @@ REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.javaparsermodel.Defau
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.CompilationUnit, java.lang.Boolean) [DefaultVisitorAdapter.java <16:5 <16:5  <17:17 17:21> 17:61> 19:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.CompilationUnit, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.CompilationUnit, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.CompilationUnit, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <17:17 17:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.CompilationUnit, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <16:6 16:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.CompilationUnit, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <17:12 17:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.CompilationUnit, java.lang.Boolean) -> com.github.javaparser.ast.CompilationUnit [DefaultVisitorAdapter.java <17:23 17:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <17:39 17:42>]
@@ -104,6 +105,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.PackageDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <21:5 <21:5  <22:17 22:21> 22:64> 24:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.PackageDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.PackageDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.PackageDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <22:17 22:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.PackageDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <21:6 21:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.PackageDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <22:12 22:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.PackageDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.PackageDeclaration [DefaultVisitorAdapter.java <22:23 22:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <22:42 22:45>]
@@ -119,6 +121,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.TypeParameter, java.lang.Boolean) [DefaultVisitorAdapter.java <26:5 <26:5  <27:17 27:21> 27:59> 29:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.TypeParameter, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.TypeParameter, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.TypeParameter, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <27:17 27:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.TypeParameter, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <26:6 26:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.TypeParameter, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <27:12 27:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.TypeParameter, java.lang.Boolean) -> com.github.javaparser.ast.type.TypeParameter [DefaultVisitorAdapter.java <27:23 27:35>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <27:37 27:40>]
@@ -134,6 +137,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.LineComment, java.lang.Boolean) [DefaultVisitorAdapter.java <31:5 <31:5  <32:17 32:21> 32:57> 34:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.comments.LineComment, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.LineComment, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.comments.LineComment, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <32:17 32:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.LineComment, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <31:6 31:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.LineComment, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <32:12 32:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.LineComment, java.lang.Boolean) -> com.github.javaparser.ast.comments.LineComment [DefaultVisitorAdapter.java <32:23 32:33>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <32:35 32:38>]
@@ -149,6 +153,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.BlockComment, java.lang.Boolean) [DefaultVisitorAdapter.java <36:5 <36:5  <37:17 37:21> 37:58> 39:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.comments.BlockComment, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.BlockComment, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.comments.BlockComment, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <37:17 37:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.BlockComment, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <36:6 36:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.BlockComment, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <37:12 37:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.BlockComment, java.lang.Boolean) -> com.github.javaparser.ast.comments.BlockComment [DefaultVisitorAdapter.java <37:23 37:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <37:36 37:39>]
@@ -164,6 +169,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <41:5 <41:5  <42:17 42:21> 42:73> 44:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <42:17 42:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <41:6 41:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <42:12 42:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.ClassOrInterfaceDeclaration [DefaultVisitorAdapter.java <42:23 42:49>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <42:51 42:54>]
@@ -179,6 +185,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <46:5 <46:5  <47:17 47:21> 47:61> 49:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.EnumDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.EnumDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <47:17 47:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <46:6 46:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <47:12 47:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.EnumDeclaration [DefaultVisitorAdapter.java <47:23 47:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <47:39 47:42>]
@@ -194,6 +201,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <51:5 <51:5  <52:17 52:21> 52:69> 54:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <52:17 52:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <52:12 52:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.EnumConstantDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.EnumConstantDeclaration [DefaultVisitorAdapter.java <52:23 52:45>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <52:47 52:50>]
@@ -209,6 +217,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <56:5 <56:5  <57:17 57:21> 57:67> 59:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.AnnotationDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.AnnotationDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <57:17 57:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <57:12 57:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.AnnotationDeclaration [DefaultVisitorAdapter.java <57:23 57:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <57:45 57:48>]
@@ -224,6 +233,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <61:5 <61:5  <62:17 62:21> 62:73> 64:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <62:17 62:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <62:12 62:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.AnnotationMemberDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.AnnotationMemberDeclaration [DefaultVisitorAdapter.java <62:23 62:49>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <62:51 62:54>]
@@ -239,6 +249,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.FieldDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <66:5 <66:5  <67:17 67:21> 67:62> 69:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.FieldDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.FieldDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.FieldDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <67:17 67:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.FieldDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.FieldDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <67:12 67:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.FieldDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.FieldDeclaration [DefaultVisitorAdapter.java <67:23 67:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <67:40 67:43>]
@@ -254,6 +265,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) [DefaultVisitorAdapter.java <71:5 <71:5  <72:17 72:21> 72:64> 74:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.VariableDeclarator, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.VariableDeclarator, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <72:17 72:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <72:12 72:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> com.github.javaparser.ast.body.VariableDeclarator [DefaultVisitorAdapter.java <72:23 72:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <72:42 72:45>]
@@ -269,6 +281,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ConstructorDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <76:5 <76:5  <77:17 77:21> 77:68> 79:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.ConstructorDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ConstructorDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.ConstructorDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <77:17 77:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ConstructorDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ConstructorDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <77:12 77:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.ConstructorDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.ConstructorDeclaration [DefaultVisitorAdapter.java <77:23 77:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <77:46 77:49>]
@@ -284,6 +297,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.MethodDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <81:5 <81:5  <82:17 82:21> 82:63> 84:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.MethodDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.MethodDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.MethodDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <82:17 82:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.MethodDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <81:6 81:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.MethodDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <82:12 82:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.MethodDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.MethodDeclaration [DefaultVisitorAdapter.java <82:23 82:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <82:41 82:44>]
@@ -299,6 +313,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) [DefaultVisitorAdapter.java <86:5 <86:5  <87:17 87:21> 87:55> 89:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.Parameter, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.Parameter, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <87:17 87:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <86:6 86:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <87:12 87:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> com.github.javaparser.ast.body.Parameter [DefaultVisitorAdapter.java <87:23 87:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <87:33 87:36>]
@@ -314,6 +329,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.InitializerDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <91:5 <91:5  <92:17 92:21> 92:68> 94:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.InitializerDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.InitializerDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.body.InitializerDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <92:17 92:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.InitializerDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <91:6 91:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.InitializerDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <92:12 92:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.InitializerDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.body.InitializerDeclaration [DefaultVisitorAdapter.java <92:23 92:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <92:46 92:49>]
@@ -329,6 +345,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.JavadocComment, java.lang.Boolean) [DefaultVisitorAdapter.java <96:5 <96:5  <97:17 97:21> 97:60> 99:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.comments.JavadocComment, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.JavadocComment, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.comments.JavadocComment, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <97:17 97:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.JavadocComment, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <96:6 96:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.JavadocComment, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <97:12 97:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.comments.JavadocComment, java.lang.Boolean) -> com.github.javaparser.ast.comments.JavadocComment [DefaultVisitorAdapter.java <97:23 97:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <97:38 97:41>]
@@ -344,6 +361,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, java.lang.Boolean) [DefaultVisitorAdapter.java <101:5 <101:5  <102:17 102:21> 102:66> 104:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <102:17 102:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <101:6 101:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <102:12 102:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ClassOrInterfaceType, java.lang.Boolean) -> com.github.javaparser.ast.type.ClassOrInterfaceType [DefaultVisitorAdapter.java <102:23 102:42>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <102:44 102:47>]
@@ -359,6 +377,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.PrimitiveType, java.lang.Boolean) [DefaultVisitorAdapter.java <106:5 <106:5  <107:17 107:21> 107:59> 109:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.PrimitiveType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.PrimitiveType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.PrimitiveType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <107:17 107:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.PrimitiveType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <106:6 106:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.PrimitiveType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <107:12 107:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.PrimitiveType, java.lang.Boolean) -> com.github.javaparser.ast.type.PrimitiveType [DefaultVisitorAdapter.java <107:23 107:35>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <107:37 107:40>]
@@ -374,6 +393,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ArrayType, java.lang.Boolean) [DefaultVisitorAdapter.java <111:5 <111:5  <112:17 112:21> 112:55> 114:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.ArrayType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ArrayType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.ArrayType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <112:17 112:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ArrayType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <111:6 111:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ArrayType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <112:12 112:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.ArrayType, java.lang.Boolean) -> com.github.javaparser.ast.type.ArrayType [DefaultVisitorAdapter.java <112:23 112:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <112:33 112:36>]
@@ -389,6 +409,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ArrayCreationLevel, java.lang.Boolean) [DefaultVisitorAdapter.java <116:5 <116:5  <117:17 117:21> 117:64> 119:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.ArrayCreationLevel, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ArrayCreationLevel, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.ArrayCreationLevel, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <117:17 117:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ArrayCreationLevel, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <116:6 116:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ArrayCreationLevel, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <117:12 117:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ArrayCreationLevel, java.lang.Boolean) -> com.github.javaparser.ast.ArrayCreationLevel [DefaultVisitorAdapter.java <117:23 117:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <117:42 117:45>]
@@ -404,6 +425,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.IntersectionType, java.lang.Boolean) [DefaultVisitorAdapter.java <121:5 <121:5  <122:17 122:21> 122:62> 124:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.IntersectionType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.IntersectionType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.IntersectionType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <122:17 122:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.IntersectionType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <121:6 121:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.IntersectionType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <122:12 122:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.IntersectionType, java.lang.Boolean) -> com.github.javaparser.ast.type.IntersectionType [DefaultVisitorAdapter.java <122:23 122:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <122:40 122:43>]
@@ -419,6 +441,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnionType, java.lang.Boolean) [DefaultVisitorAdapter.java <126:5 <126:5  <127:17 127:21> 127:55> 129:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.UnionType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnionType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.UnionType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <127:17 127:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnionType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <126:6 126:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnionType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <127:12 127:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnionType, java.lang.Boolean) -> com.github.javaparser.ast.type.UnionType [DefaultVisitorAdapter.java <127:23 127:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <127:33 127:36>]
@@ -434,6 +457,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.VoidType, java.lang.Boolean) [DefaultVisitorAdapter.java <131:5 <131:5  <132:17 132:21> 132:54> 134:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.VoidType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.VoidType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.VoidType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <132:17 132:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.VoidType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <131:6 131:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.VoidType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <132:12 132:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.VoidType, java.lang.Boolean) -> com.github.javaparser.ast.type.VoidType [DefaultVisitorAdapter.java <132:23 132:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <132:32 132:35>]
@@ -449,6 +473,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.WildcardType, java.lang.Boolean) [DefaultVisitorAdapter.java <136:5 <136:5  <137:17 137:21> 137:58> 139:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.WildcardType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.WildcardType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.WildcardType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <137:17 137:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.WildcardType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <136:6 136:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.WildcardType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <137:12 137:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.WildcardType, java.lang.Boolean) -> com.github.javaparser.ast.type.WildcardType [DefaultVisitorAdapter.java <137:23 137:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <137:36 137:39>]
@@ -464,6 +489,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnknownType, java.lang.Boolean) [DefaultVisitorAdapter.java <141:5 <141:5  <142:17 142:21> 142:57> 144:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.UnknownType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnknownType, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.type.UnknownType, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <142:17 142:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnknownType, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <141:6 141:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnknownType, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <142:12 142:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.type.UnknownType, java.lang.Boolean) -> com.github.javaparser.ast.type.UnknownType [DefaultVisitorAdapter.java <142:23 142:33>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <142:35 142:38>]
@@ -479,6 +505,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <146:5 <146:5  <147:17 147:21> 147:61> 149:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <147:17 147:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <146:6 146:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <147:12 147:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ArrayAccessExpr [DefaultVisitorAdapter.java <147:23 147:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <147:39 147:42>]
@@ -494,6 +521,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <151:5 <151:5  <152:17 152:21> 152:63> 154:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <152:17 152:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <151:6 151:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <152:12 152:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ArrayCreationExpr [DefaultVisitorAdapter.java <152:23 152:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <152:41 152:44>]
@@ -509,6 +537,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <156:5 <156:5  <157:17 157:21> 157:66> 159:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <157:17 157:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <156:6 156:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <157:12 157:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ArrayInitializerExpr [DefaultVisitorAdapter.java <157:23 157:42>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <157:44 157:47>]
@@ -524,6 +553,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <161:5 <161:5  <162:17 162:21> 162:56> 164:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.AssignExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.AssignExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <162:17 162:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <161:6 161:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <162:12 162:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.AssignExpr [DefaultVisitorAdapter.java <162:23 162:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <162:34 162:37>]
@@ -539,6 +569,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <166:5 <166:5  <167:17 167:21> 167:56> 169:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.BinaryExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.BinaryExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <167:17 167:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <166:6 166:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <167:12 167:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.BinaryExpr [DefaultVisitorAdapter.java <167:23 167:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <167:34 167:37>]
@@ -554,6 +585,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <171:5 <171:5  <172:17 172:21> 172:54> 174:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.CastExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.CastExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <172:17 172:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <171:6 171:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <172:12 172:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.CastExpr [DefaultVisitorAdapter.java <172:23 172:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <172:32 172:35>]
@@ -569,6 +601,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <176:5 <176:5  <177:17 177:21> 177:55> 179:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ClassExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ClassExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <177:17 177:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <176:6 176:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <177:12 177:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ClassExpr [DefaultVisitorAdapter.java <177:23 177:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <177:33 177:36>]
@@ -584,6 +617,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <181:5 <181:5  <182:17 182:21> 182:61> 184:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ConditionalExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ConditionalExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <182:17 182:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <181:6 181:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <182:12 182:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ConditionalExpr [DefaultVisitorAdapter.java <182:23 182:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <182:39 182:42>]
@@ -599,6 +633,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <186:5 <186:5  <187:17 187:21> 187:58> 189:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.EnclosedExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.EnclosedExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <187:17 187:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <186:6 186:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <187:12 187:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.EnclosedExpr [DefaultVisitorAdapter.java <187:23 187:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <187:36 187:39>]
@@ -614,6 +649,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <191:5 <191:5  <192:17 192:21> 192:61> 194:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.FieldAccessExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.FieldAccessExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <192:17 192:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <191:6 191:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <192:12 192:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.FieldAccessExpr [DefaultVisitorAdapter.java <192:23 192:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <192:39 192:42>]
@@ -629,6 +665,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <196:5 <196:5  <197:17 197:21> 197:60> 199:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.InstanceOfExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.InstanceOfExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <197:17 197:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <196:6 196:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <197:12 197:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.InstanceOfExpr [DefaultVisitorAdapter.java <197:23 197:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <197:38 197:41>]
@@ -644,6 +681,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <201:5 <201:5  <202:17 202:21> 202:63> 204:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.StringLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.StringLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <202:17 202:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <201:6 201:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <202:12 202:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.StringLiteralExpr [DefaultVisitorAdapter.java <202:23 202:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <202:41 202:44>]
@@ -659,6 +697,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <206:5 <206:5  <207:17 207:21> 207:64> 209:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <207:17 207:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <206:6 206:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <207:12 207:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.IntegerLiteralExpr [DefaultVisitorAdapter.java <207:23 207:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <207:42 207:45>]
@@ -674,6 +713,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <211:5 <211:5  <212:17 212:21> 212:61> 214:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.LongLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.LongLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <212:17 212:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <211:6 211:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <212:12 212:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.LongLiteralExpr [DefaultVisitorAdapter.java <212:23 212:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <212:39 212:42>]
@@ -689,6 +729,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <216:5 <216:5  <217:17 217:21> 217:61> 219:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.CharLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.CharLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <217:17 217:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <216:6 216:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <217:12 217:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.CharLiteralExpr [DefaultVisitorAdapter.java <217:23 217:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <217:39 217:42>]
@@ -704,6 +745,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <221:5 <221:5  <222:17 222:21> 222:63> 224:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <222:17 222:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <221:6 221:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <222:12 222:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.DoubleLiteralExpr [DefaultVisitorAdapter.java <222:23 222:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <222:41 222:44>]
@@ -719,6 +761,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <226:5 <226:5  <227:17 227:21> 227:64> 229:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <227:17 227:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <226:6 226:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <227:12 227:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.BooleanLiteralExpr [DefaultVisitorAdapter.java <227:23 227:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <227:42 227:45>]
@@ -734,6 +777,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <231:5 <231:5  <232:17 232:21> 232:61> 234:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.NullLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.NullLiteralExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <232:17 232:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <231:6 231:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <232:12 232:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.NullLiteralExpr [DefaultVisitorAdapter.java <232:23 232:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <232:39 232:42>]
@@ -749,6 +793,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <236:5 <236:5  <237:17 237:21> 237:60> 239:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MethodCallExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MethodCallExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <237:17 237:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <236:6 236:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <237:12 237:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.MethodCallExpr [DefaultVisitorAdapter.java <237:23 237:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <237:38 237:41>]
@@ -764,6 +809,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <241:5 <241:5  <242:17 242:21> 242:54> 244:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.NameExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.NameExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <242:17 242:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <241:6 241:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <242:12 242:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.NameExpr [DefaultVisitorAdapter.java <242:23 242:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <242:32 242:35>]
@@ -779,6 +825,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <246:5 <246:5  <247:17 247:21> 247:64> 249:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <247:17 247:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <246:6 246:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <247:12 247:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ObjectCreationExpr [DefaultVisitorAdapter.java <247:23 247:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <247:42 247:45>]
@@ -794,6 +841,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <251:5 <251:5  <252:17 252:21> 252:54> 254:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ThisExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.ThisExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <252:17 252:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <251:6 251:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <252:12 252:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ThisExpr [DefaultVisitorAdapter.java <252:23 252:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <252:32 252:35>]
@@ -809,6 +857,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <256:5 <256:5  <257:17 257:21> 257:55> 259:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.SuperExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.SuperExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <257:17 257:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <256:6 256:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <257:12 257:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.SuperExpr [DefaultVisitorAdapter.java <257:23 257:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <257:33 257:36>]
@@ -824,6 +873,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <261:5 <261:5  <262:17 262:21> 262:55> 264:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.UnaryExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.UnaryExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <262:17 262:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <261:6 261:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <262:12 262:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.UnaryExpr [DefaultVisitorAdapter.java <262:23 262:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <262:33 262:36>]
@@ -839,6 +889,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <266:5 <266:5  <267:17 267:21> 267:69> 269:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <267:17 267:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <266:6 266:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <267:12 267:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.VariableDeclarationExpr [DefaultVisitorAdapter.java <267:23 267:45>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <267:47 267:50>]
@@ -854,6 +905,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <271:5 <271:5  <272:17 272:21> 272:66> 274:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <272:17 272:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <271:6 271:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <272:12 272:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MarkerAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.MarkerAnnotationExpr [DefaultVisitorAdapter.java <272:23 272:42>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <272:44 272:47>]
@@ -869,6 +921,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <276:5 <276:5  <277:17 277:21> 277:72> 279:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <277:17 277:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <276:6 276:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <277:12 277:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SingleMemberAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.SingleMemberAnnotationExpr [DefaultVisitorAdapter.java <277:23 277:48>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <277:50 277:53>]
@@ -884,6 +937,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <281:5 <281:5  <282:17 282:21> 282:66> 284:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <282:17 282:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <281:6 281:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <282:12 282:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NormalAnnotationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.NormalAnnotationExpr [DefaultVisitorAdapter.java <282:23 282:42>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <282:44 282:47>]
@@ -899,6 +953,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MemberValuePair, java.lang.Boolean) [DefaultVisitorAdapter.java <286:5 <286:5  <287:17 287:21> 287:61> 289:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MemberValuePair, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MemberValuePair, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MemberValuePair, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <287:17 287:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MemberValuePair, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <286:6 286:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MemberValuePair, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <287:12 287:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MemberValuePair, java.lang.Boolean) -> com.github.javaparser.ast.expr.MemberValuePair [DefaultVisitorAdapter.java <287:23 287:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <287:39 287:42>]
@@ -914,6 +969,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <291:5 <291:5  <292:17 292:21> 292:79> 294:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <292:17 292:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <291:6 291:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <292:12 292:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt [DefaultVisitorAdapter.java <292:23 292:55>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <292:57 292:60>]
@@ -929,6 +985,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <296:5 <296:5  <297:17 297:21> 297:71> 299:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <297:17 297:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <296:6 296:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <297:12 297:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LocalClassDeclarationStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.LocalClassDeclarationStmt [DefaultVisitorAdapter.java <297:23 297:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <297:49 297:52>]
@@ -944,6 +1001,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.AssertStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <301:5 <301:5  <302:17 302:21> 302:56> 304:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.AssertStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.AssertStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.AssertStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <302:17 302:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.AssertStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <301:6 301:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.AssertStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <302:12 302:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.AssertStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.AssertStmt [DefaultVisitorAdapter.java <302:23 302:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <302:34 302:37>]
@@ -959,6 +1017,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BlockStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <306:5 <306:5  <307:17 307:21> 307:55> 309:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.BlockStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BlockStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.BlockStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <307:17 307:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BlockStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <306:6 306:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BlockStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <307:12 307:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BlockStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.BlockStmt [DefaultVisitorAdapter.java <307:23 307:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <307:33 307:36>]
@@ -974,6 +1033,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LabeledStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <311:5 <311:5  <312:17 312:21> 312:57> 314:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.LabeledStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LabeledStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.LabeledStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <312:17 312:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LabeledStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <311:6 311:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LabeledStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <312:12 312:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.LabeledStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.LabeledStmt [DefaultVisitorAdapter.java <312:23 312:33>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <312:35 312:38>]
@@ -989,6 +1049,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.EmptyStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <316:5 <316:5  <317:17 317:21> 317:55> 319:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.EmptyStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.EmptyStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.EmptyStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <317:17 317:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.EmptyStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <316:6 316:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.EmptyStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <317:12 317:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.EmptyStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.EmptyStmt [DefaultVisitorAdapter.java <317:23 317:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <317:33 317:36>]
@@ -1004,6 +1065,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExpressionStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <321:5 <321:5  <322:17 322:21> 322:60> 324:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ExpressionStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExpressionStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ExpressionStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <322:17 322:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExpressionStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <321:6 321:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExpressionStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <322:12 322:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ExpressionStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ExpressionStmt [DefaultVisitorAdapter.java <322:23 322:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <322:38 322:41>]
@@ -1019,6 +1081,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <326:5 <326:5  <327:17 327:21> 327:56> 329:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.SwitchStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.SwitchStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <327:17 327:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <326:6 326:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <327:12 327:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.SwitchStmt [DefaultVisitorAdapter.java <327:23 327:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <327:34 327:37>]
@@ -1034,6 +1097,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <331:5 <331:5  <332:17 332:21> 332:61> 334:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <332:17 332:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <331:6 331:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <332:12 332:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SwitchEntryStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.SwitchEntryStmt [DefaultVisitorAdapter.java <332:23 332:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <332:39 332:42>]
@@ -1049,6 +1113,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BreakStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <336:5 <336:5  <337:17 337:21> 337:55> 339:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.BreakStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BreakStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.BreakStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <337:17 337:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BreakStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <336:6 336:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BreakStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <337:12 337:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.BreakStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.BreakStmt [DefaultVisitorAdapter.java <337:23 337:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <337:33 337:36>]
@@ -1064,6 +1129,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ReturnStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <341:5 <341:5  <342:17 342:21> 342:56> 344:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ReturnStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ReturnStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ReturnStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <342:17 342:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ReturnStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <341:6 341:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ReturnStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <342:12 342:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ReturnStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ReturnStmt [DefaultVisitorAdapter.java <342:23 342:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <342:34 342:37>]
@@ -1079,6 +1145,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.IfStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <346:5 <346:5  <347:17 347:21> 347:52> 349:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.IfStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.IfStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.IfStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <347:17 347:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.IfStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <346:6 346:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.IfStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <347:12 347:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.IfStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.IfStmt [DefaultVisitorAdapter.java <347:23 347:28>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <347:30 347:33>]
@@ -1094,6 +1161,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.WhileStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <351:5 <351:5  <352:17 352:21> 352:55> 354:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.WhileStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.WhileStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.WhileStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <352:17 352:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.WhileStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <351:6 351:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.WhileStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <352:12 352:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.WhileStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.WhileStmt [DefaultVisitorAdapter.java <352:23 352:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <352:33 352:36>]
@@ -1109,6 +1177,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ContinueStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <356:5 <356:5  <357:17 357:21> 357:58> 359:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ContinueStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ContinueStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ContinueStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <357:17 357:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ContinueStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <356:6 356:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ContinueStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <357:12 357:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ContinueStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ContinueStmt [DefaultVisitorAdapter.java <357:23 357:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <357:36 357:39>]
@@ -1124,6 +1193,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.DoStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <361:5 <361:5  <362:17 362:21> 362:52> 364:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.DoStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.DoStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.DoStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <362:17 362:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.DoStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <361:6 361:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.DoStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <362:12 362:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.DoStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.DoStmt [DefaultVisitorAdapter.java <362:23 362:28>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <362:30 362:33>]
@@ -1139,6 +1209,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForeachStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <366:5 <366:5  <367:17 367:21> 367:57> 369:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ForeachStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForeachStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ForeachStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <367:17 367:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForeachStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <366:6 366:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForeachStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <367:12 367:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForeachStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ForeachStmt [DefaultVisitorAdapter.java <367:23 367:33>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <367:35 367:38>]
@@ -1154,6 +1225,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <371:5 <371:5  <372:17 372:21> 372:53> 374:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ForStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ForStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <372:17 372:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <371:6 371:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <372:12 372:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ForStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ForStmt [DefaultVisitorAdapter.java <372:23 372:29>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <372:31 372:34>]
@@ -1169,6 +1241,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ThrowStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <376:5 <376:5  <377:17 377:21> 377:55> 379:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ThrowStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ThrowStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.ThrowStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <377:17 377:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ThrowStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <376:6 376:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ThrowStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <377:12 377:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.ThrowStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.ThrowStmt [DefaultVisitorAdapter.java <377:23 377:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <377:33 377:36>]
@@ -1184,6 +1257,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <381:5 <381:5  <382:17 382:21> 382:62> 384:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <382:17 382:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <381:6 381:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <382:12 382:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.SynchronizedStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.SynchronizedStmt [DefaultVisitorAdapter.java <382:23 382:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <382:40 382:43>]
@@ -1199,6 +1273,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.TryStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <386:5 <386:5  <387:17 387:21> 387:53> 389:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.TryStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.TryStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.TryStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <387:17 387:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.TryStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <386:6 386:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.TryStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <387:12 387:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.TryStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.TryStmt [DefaultVisitorAdapter.java <387:23 387:29>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <387:31 387:34>]
@@ -1214,6 +1289,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.CatchClause, java.lang.Boolean) [DefaultVisitorAdapter.java <391:5 <391:5  <392:17 392:21> 392:57> 394:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.CatchClause, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.CatchClause, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.CatchClause, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <392:17 392:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.CatchClause, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <391:6 391:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.CatchClause, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <392:12 392:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.CatchClause, java.lang.Boolean) -> com.github.javaparser.ast.stmt.CatchClause [DefaultVisitorAdapter.java <392:23 392:33>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <392:35 392:38>]
@@ -1229,6 +1305,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <396:5 <396:5  <397:17 397:21> 397:56> 399:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.LambdaExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.LambdaExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <397:17 397:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <396:6 396:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <397:12 397:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.LambdaExpr [DefaultVisitorAdapter.java <397:23 397:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <397:34 397:37>]
@@ -1244,6 +1321,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <401:5 <401:5  <402:17 402:21> 402:65> 404:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <402:17 402:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <401:6 401:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <402:12 402:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.MethodReferenceExpr [DefaultVisitorAdapter.java <402:23 402:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <402:43 402:46>]
@@ -1259,6 +1337,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.TypeExpr, java.lang.Boolean) [DefaultVisitorAdapter.java <406:5 <406:5  <407:17 407:21> 407:54> 409:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.TypeExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.TypeExpr, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.TypeExpr, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <407:17 407:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.TypeExpr, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <406:6 406:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.TypeExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <407:12 407:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.TypeExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.TypeExpr [DefaultVisitorAdapter.java <407:23 407:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <407:32 407:35>]
@@ -1274,6 +1353,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.NodeList, java.lang.Boolean) [DefaultVisitorAdapter.java <411:5 <411:5  <412:17 412:21> 412:54> 414:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.NodeList, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.NodeList, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.NodeList, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <412:17 412:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.NodeList, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <411:6 411:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.NodeList, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <412:12 412:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.NodeList, java.lang.Boolean) -> com.github.javaparser.ast.NodeList<N> [DefaultVisitorAdapter.java <412:23 412:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <412:32 412:35>]
@@ -1289,6 +1369,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.Name, java.lang.Boolean) [DefaultVisitorAdapter.java <416:5 <416:5  <417:17 417:21> 417:50> 419:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.Name, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.Name, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.Name, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <417:17 417:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.Name, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <416:6 416:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.Name, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <417:12 417:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.Name, java.lang.Boolean) -> com.github.javaparser.ast.expr.Name [DefaultVisitorAdapter.java <417:23 417:26>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <417:28 417:31>]
@@ -1304,6 +1385,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SimpleName, java.lang.Boolean) [DefaultVisitorAdapter.java <421:5 <421:5  <422:17 422:21> 422:56> 424:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.SimpleName, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SimpleName, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.expr.SimpleName, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <422:17 422:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SimpleName, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <421:6 421:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SimpleName, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <422:12 422:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SimpleName, java.lang.Boolean) -> com.github.javaparser.ast.expr.SimpleName [DefaultVisitorAdapter.java <422:23 422:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <422:34 422:37>]
@@ -1319,6 +1401,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ImportDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <426:5 <426:5  <427:17 427:21> 427:63> 429:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.ImportDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ImportDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.ImportDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <427:17 427:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ImportDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <426:6 426:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ImportDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <427:12 427:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.ImportDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.ImportDeclaration [DefaultVisitorAdapter.java <427:23 427:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <427:41 427:44>]
@@ -1334,6 +1417,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleDeclaration, java.lang.Boolean) [DefaultVisitorAdapter.java <431:5 <431:5  <432:17 432:21> 432:58> 434:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleDeclaration, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <432:17 432:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleDeclaration, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <431:6 431:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleDeclaration, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <432:12 432:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleDeclaration, java.lang.Boolean) -> com.github.javaparser.ast.modules.ModuleDeclaration [DefaultVisitorAdapter.java <432:23 432:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <432:41 432:44>]
@@ -1349,6 +1433,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <436:5 <436:5  <437:17 437:21> 437:59> 439:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <437:17 437:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <436:6 436:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <437:12 437:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleRequiresStmt, java.lang.Boolean) -> com.github.javaparser.ast.modules.ModuleRequiresStmt [DefaultVisitorAdapter.java <437:23 437:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <437:42 437:45>]
@@ -1364,6 +1449,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <441:5 <441:5  <442:17 442:21> 442:58> 444:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <442:17 442:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <441:6 441:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <442:12 442:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleExportsStmt, java.lang.Boolean) -> com.github.javaparser.ast.modules.ModuleExportsStmt [DefaultVisitorAdapter.java <442:23 442:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <442:41 442:44>]
@@ -1379,6 +1465,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <446:5 <446:5  <447:17 447:21> 447:59> 449:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <447:17 447:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <446:6 446:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <447:12 447:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleProvidesStmt, java.lang.Boolean) -> com.github.javaparser.ast.modules.ModuleProvidesStmt [DefaultVisitorAdapter.java <447:23 447:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <447:42 447:45>]
@@ -1394,6 +1481,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <451:5 <451:5  <452:17 452:21> 452:55> 454:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <452:17 452:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <451:6 451:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <452:12 452:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleUsesStmt, java.lang.Boolean) -> com.github.javaparser.ast.modules.ModuleUsesStmt [DefaultVisitorAdapter.java <452:23 452:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <452:38 452:41>]
@@ -1409,6 +1497,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <456:5 <456:5  <457:17 457:21> 457:56> 459:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <457:17 457:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <456:6 456:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <457:12 457:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.modules.ModuleOpensStmt, java.lang.Boolean) -> com.github.javaparser.ast.modules.ModuleOpensStmt [DefaultVisitorAdapter.java <457:23 457:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <457:39 457:42>]
@@ -1424,6 +1513,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.UnparsableStmt, java.lang.Boolean) [DefaultVisitorAdapter.java <461:5 <461:5  <462:17 462:21> 462:55> 464:5>]
 SYMBOL_METHOD com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.UnparsableStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.UnparsableStmt, java.lang.Boolean) -> com.github.javaparser.ast.visitor.GenericVisitor<R, A>.R com.github.javaparser.ast.visitor.GenericVisitor<R, A>.visit(com.github.javaparser.ast.stmt.UnparsableStmt, com.github.javaparser.ast.visitor.GenericVisitor<R, A>.A) [DefaultVisitorAdapter.java <462:17 462:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.UnparsableStmt, java.lang.Boolean) -> java.lang.Override [DefaultVisitorAdapter.java <461:6 461:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.UnparsableStmt, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [DefaultVisitorAdapter.java <462:12 462:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.stmt.UnparsableStmt, java.lang.Boolean) -> com.github.javaparser.ast.stmt.UnparsableStmt [DefaultVisitorAdapter.java <462:23 462:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit<0> [DefaultVisitorAdapter.java <462:38 462:41>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_LambdaArgumentTypePlaceholder.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_LambdaArgumentTypePlaceholder.txt
index 1f3719a5..4ff78cfe 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_LambdaArgumentTypePlaceholder.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_LambdaArgumentTypePlaceholder.txt
@@ -55,6 +55,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isArray() [LambdaArgumentTypePlaceholder.java <38:5 <38:5  <39:20 39:26> 39:28> 41:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isArray() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray() [LambdaArgumentTypePlaceholder.java <39:20 39:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isArray() -> java.lang.Override [LambdaArgumentTypePlaceholder.java <38:6 38:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isArray() -> boolean [LambdaArgumentTypePlaceholder.java <39:12 39:18>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<39:30> [LambdaArgumentTypePlaceholder.java <39:30 39:30>]
@@ -62,18 +63,21 @@ LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<39:30> [LambdaArgumentTypePlace
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isPrimitive() [LambdaArgumentTypePlaceholder.java <43:5 <43:5  <44:20 44:30> 44:32> 46:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isPrimitive() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive() [LambdaArgumentTypePlaceholder.java <44:20 44:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isPrimitive() -> java.lang.Override [LambdaArgumentTypePlaceholder.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isPrimitive() -> boolean [LambdaArgumentTypePlaceholder.java <44:12 44:18>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<44:34> [LambdaArgumentTypePlaceholder.java <44:34 44:34>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<44:34> [LambdaArgumentTypePlaceholder.java <46:5 46:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isReferenceType() [LambdaArgumentTypePlaceholder.java <48:5 <48:5  <49:20 49:34> 49:36> 51:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isReferenceType() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType() [LambdaArgumentTypePlaceholder.java <49:20 49:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isReferenceType() -> java.lang.Override [LambdaArgumentTypePlaceholder.java <48:6 48:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isReferenceType() -> boolean [LambdaArgumentTypePlaceholder.java <49:12 49:18>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<49:38> [LambdaArgumentTypePlaceholder.java <49:38 49:38>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<49:38> [LambdaArgumentTypePlaceholder.java <51:5 51:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.describe() [LambdaArgumentTypePlaceholder.java <53:5 <53:5  <54:19 54:26> 54:28> 56:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [LambdaArgumentTypePlaceholder.java <54:19 54:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.describe() -> java.lang.Override [LambdaArgumentTypePlaceholder.java <53:6 53:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.describe() -> java.lang.String [LambdaArgumentTypePlaceholder.java <54:12 54:17>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<54:30> [LambdaArgumentTypePlaceholder.java <54:30 54:30>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<54:30> [LambdaArgumentTypePlaceholder.java <56:5 56:5>]
@@ -83,6 +87,7 @@ REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javapar
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isTypeVariable() [LambdaArgumentTypePlaceholder.java <58:5 <58:5  <59:20 59:33> 59:35> 61:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isTypeVariable() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable() [LambdaArgumentTypePlaceholder.java <59:20 59:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isTypeVariable() -> java.lang.Override [LambdaArgumentTypePlaceholder.java <58:6 58:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isTypeVariable() -> boolean [LambdaArgumentTypePlaceholder.java <59:12 59:18>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<59:37> [LambdaArgumentTypePlaceholder.java <59:37 59:37>]
 LOCAL_SYMBOL: LambdaArgumentTypePlaceholder.java<59:37> [LambdaArgumentTypePlaceholder.java <61:5 61:5>]
@@ -101,6 +106,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [LambdaArgumentTypePlaceholder.java <67:5 <67:5  <68:20 68:33> 68:45> 70:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [LambdaArgumentTypePlaceholder.java <68:20 68:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [LambdaArgumentTypePlaceholder.java <67:6 67:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [LambdaArgumentTypePlaceholder.java <68:12 68:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [LambdaArgumentTypePlaceholder.java <68:35 68:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder.isAssignableBy<0> [LambdaArgumentTypePlaceholder.java <68:40 68:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_TypeExtractor.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_TypeExtractor.txt
index 5143e7e9..85bc1350 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_TypeExtractor.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_TypeExtractor.txt
@@ -274,6 +274,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.T
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) [TypeExtractor.java <58:5 <58:5  <59:17 59:21> 59:68> 69:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) [TypeExtractor.java <59:17 59:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <58:6 58:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <59:12 59:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.VariableDeclarator, java.lang.Boolean) -> com.github.javaparser.ast.body.VariableDeclarator [TypeExtractor.java <59:23 59:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <59:42 59:45>]
@@ -312,6 +313,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) [TypeExtractor.java <71:5 <71:5  <72:17 72:21> 72:59> 77:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) [TypeExtractor.java <72:17 72:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <72:12 72:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.body.Parameter, java.lang.Boolean) -> com.github.javaparser.ast.body.Parameter [TypeExtractor.java <72:23 72:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <72:33 72:36>]
@@ -338,6 +340,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) [TypeExtractor.java <80:5 <80:5  <81:17 81:21> 81:65> 87:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) [TypeExtractor.java <81:17 81:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <80:6 80:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <81:12 81:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayAccessExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ArrayAccessExpr [TypeExtractor.java <81:23 81:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <81:39 81:42>]
@@ -366,6 +369,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) [TypeExtractor.java <89:5 <89:5  <90:17 90:21> 90:67> 96:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) [TypeExtractor.java <90:17 90:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <89:6 89:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <90:12 90:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayCreationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ArrayCreationExpr [TypeExtractor.java <90:23 90:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <90:41 90:44>]
@@ -407,6 +411,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) [TypeExtractor.java <98:5 <98:5  <99:17 99:21> 99:70> 101:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) [TypeExtractor.java <99:17 99:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <98:6 98:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <99:12 99:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ArrayInitializerExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ArrayInitializerExpr [TypeExtractor.java <99:23 99:42>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <99:44 99:47>]
@@ -422,6 +427,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) [TypeExtractor.java <103:5 <103:5  <104:17 104:21> 104:60> 106:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) [TypeExtractor.java <104:17 104:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <103:6 103:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <104:12 104:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.AssignExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.AssignExpr [TypeExtractor.java <104:23 104:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <104:34 104:37>]
@@ -437,6 +443,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) [TypeExtractor.java <108:5 <108:5  <109:17 109:21> 109:60> 136:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) [TypeExtractor.java <109:17 109:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <108:6 108:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <109:12 109:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BinaryExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.BinaryExpr [TypeExtractor.java <109:23 109:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <109:34 109:37>]
@@ -513,6 +520,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) [TypeExtractor.java <138:5 <138:5  <139:17 139:21> 139:58> 141:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) [TypeExtractor.java <139:17 139:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <138:6 138:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <139:12 139:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CastExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.CastExpr [TypeExtractor.java <139:23 139:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <139:32 139:35>]
@@ -532,6 +540,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) [TypeExtractor.java <143:5 <143:5  <144:17 144:21> 144:59> 149:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) [TypeExtractor.java <144:17 144:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <143:6 143:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <144:12 144:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ClassExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ClassExpr [TypeExtractor.java <144:23 144:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <144:33 144:36>]
@@ -572,6 +581,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) [TypeExtractor.java <151:5 <151:5  <152:17 152:21> 152:65> 154:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) [TypeExtractor.java <152:17 152:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <151:6 151:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <152:12 152:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ConditionalExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ConditionalExpr [TypeExtractor.java <152:23 152:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <152:39 152:42>]
@@ -587,6 +597,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) [TypeExtractor.java <156:5 <156:5  <157:17 157:21> 157:62> 159:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) [TypeExtractor.java <157:17 157:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <156:6 156:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <157:12 157:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.EnclosedExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.EnclosedExpr [TypeExtractor.java <157:23 157:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <157:36 157:39>]
@@ -655,6 +666,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.s
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) [TypeExtractor.java <177:5 <177:5  <178:17 178:21> 178:65> 224:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) [TypeExtractor.java <178:17 178:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <177:6 177:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <178:12 178:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.FieldAccessExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.FieldAccessExpr [TypeExtractor.java <178:23 178:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <178:39 178:42>]
@@ -813,6 +825,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) [TypeExtractor.java <226:5 <226:5  <227:17 227:21> 227:64> 229:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) [TypeExtractor.java <227:17 227:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <226:6 226:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <227:12 227:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.InstanceOfExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.InstanceOfExpr [TypeExtractor.java <227:23 227:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <227:38 227:41>]
@@ -825,6 +838,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) [TypeExtractor.java <231:5 <231:5  <232:17 232:21> 232:67> 234:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) [TypeExtractor.java <232:17 232:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <231:6 231:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <232:12 232:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.StringLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.StringLiteralExpr [TypeExtractor.java <232:23 232:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <232:41 232:44>]
@@ -843,6 +857,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) [TypeExtractor.java <236:5 <236:5  <237:17 237:21> 237:68> 239:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) [TypeExtractor.java <237:17 237:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <236:6 236:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <237:12 237:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.IntegerLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.IntegerLiteralExpr [TypeExtractor.java <237:23 237:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <237:42 237:45>]
@@ -856,6 +871,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) [TypeExtractor.java <241:5 <241:5  <242:17 242:21> 242:65> 244:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) [TypeExtractor.java <242:17 242:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <241:6 241:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <242:12 242:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LongLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.LongLiteralExpr [TypeExtractor.java <242:23 242:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <242:39 242:42>]
@@ -869,6 +885,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) [TypeExtractor.java <246:5 <246:5  <247:17 247:21> 247:65> 249:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) [TypeExtractor.java <247:17 247:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <246:6 246:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <247:12 247:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.CharLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.CharLiteralExpr [TypeExtractor.java <247:23 247:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <247:39 247:42>]
@@ -882,6 +899,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) [TypeExtractor.java <251:5 <251:5  <252:17 252:21> 252:67> 257:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) [TypeExtractor.java <252:17 252:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <251:6 251:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <252:12 252:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.DoubleLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.DoubleLiteralExpr [TypeExtractor.java <252:23 252:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <252:41 252:44>]
@@ -907,6 +925,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) [TypeExtractor.java <259:5 <259:5  <260:17 260:21> 260:68> 262:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) [TypeExtractor.java <260:17 260:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <259:6 259:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <260:12 260:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.BooleanLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.BooleanLiteralExpr [TypeExtractor.java <260:23 260:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <260:42 260:45>]
@@ -919,6 +938,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) [TypeExtractor.java <264:5 <264:5  <265:17 265:21> 265:65> 267:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) [TypeExtractor.java <265:17 265:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <264:6 264:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <265:12 265:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NullLiteralExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.NullLiteralExpr [TypeExtractor.java <265:23 265:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <265:39 265:42>]
@@ -932,6 +952,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) [TypeExtractor.java <269:5 <269:5  <270:17 270:21> 270:64> 278:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) [TypeExtractor.java <270:17 270:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <269:6 269:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <270:12 270:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodCallExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.MethodCallExpr [TypeExtractor.java <270:23 270:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <270:38 270:41>]
@@ -964,6 +985,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) [TypeExtractor.java <280:5 <280:5  <281:17 281:21> 281:58> 289:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) [TypeExtractor.java <281:17 281:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <280:6 280:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <281:12 281:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.NameExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.NameExpr [TypeExtractor.java <281:23 281:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <281:32 281:35>]
@@ -1005,6 +1027,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) [TypeExtractor.java <291:5 <291:5  <292:17 292:21> 292:68> 295:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) [TypeExtractor.java <292:17 292:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <291:6 291:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <292:12 292:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ObjectCreationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ObjectCreationExpr [TypeExtractor.java <292:23 292:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <292:42 292:45>]
@@ -1024,6 +1047,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) [TypeExtractor.java <297:5 <297:5  <298:17 298:21> 298:58> 319:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) [TypeExtractor.java <298:17 298:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <297:6 297:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <298:12 298:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.ThisExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.ThisExpr [TypeExtractor.java <298:23 298:30>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <298:32 298:35>]
@@ -1102,6 +1126,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) [TypeExtractor.java <321:5 <321:5  <322:17 322:21> 322:59> 329:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) [TypeExtractor.java <322:17 322:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <321:6 321:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <322:12 322:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.SuperExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.SuperExpr [TypeExtractor.java <322:23 322:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <322:33 322:36>]
@@ -1134,6 +1159,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) [TypeExtractor.java <331:5 <331:5  <332:17 332:21> 332:59> 347:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) [TypeExtractor.java <332:17 332:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <331:6 331:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <332:12 332:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.UnaryExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.UnaryExpr [TypeExtractor.java <332:23 332:31>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <332:33 332:36>]
@@ -1179,6 +1205,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) [TypeExtractor.java <349:5 <349:5  <350:17 350:21> 350:73> 355:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) [TypeExtractor.java <350:17 350:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <349:6 349:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <350:12 350:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.VariableDeclarationExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.VariableDeclarationExpr [TypeExtractor.java <350:23 350:45>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <350:47 350:50>]
@@ -1204,6 +1231,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.v
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) [TypeExtractor.java <358:5 <358:5  <359:17 359:21> 359:60> 476:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) [TypeExtractor.java <359:17 359:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <358:6 358:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <359:12 359:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.LambdaExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.LambdaExpr [TypeExtractor.java <359:23 359:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <359:34 359:37>]
@@ -1531,6 +1559,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type co
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) [TypeExtractor.java <478:5 <478:5  <479:17 479:21> 479:69> 520:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.DefaultVisitorAdapter.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) [TypeExtractor.java <479:17 479:21>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> java.lang.Override [TypeExtractor.java <478:6 478:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeExtractor.java <479:12 479:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit(com.github.javaparser.ast.expr.MethodReferenceExpr, java.lang.Boolean) -> com.github.javaparser.ast.expr.MethodReferenceExpr [TypeExtractor.java <479:23 479:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.TypeExtractor.visit<0> [TypeExtractor.java <479:43 479:46>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_UnsolvedSymbolException.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_UnsolvedSymbolException.txt
index 07061a80..10b7f720 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_UnsolvedSymbolException.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_UnsolvedSymbolException.txt
@@ -28,6 +28,7 @@ SYMBOL_CLASS public com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedS
 LOCAL_SYMBOL: UnsolvedSymbolException.java<29:63> [UnsolvedSymbolException.java <29:63 29:63>]
 LOCAL_SYMBOL: UnsolvedSymbolException.java<29:63> [UnsolvedSymbolException.java <67:1 67:1>]
 COMMENT: comment [UnsolvedSymbolException.java <22:1 26:3>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException -> java.lang.Deprecated [UnsolvedSymbolException.java <28:2 28:11>]
 REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException -> java.lang.RuntimeException [UnsolvedSymbolException.java <29:46 29:61>]
 SYMBOL_FIELD private java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException.context [UnsolvedSymbolException.java <31:20 31:26>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException.context -> java.lang.String [UnsolvedSymbolException.java <31:13 31:18>]
@@ -105,6 +106,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolE
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException.toString() [UnsolvedSymbolException.java <59:5 <59:5  <60:19 60:26> 60:28> 66:5>]
 SYMBOL_METHOD java.lang.String java.lang.Throwable.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException.toString() -> java.lang.String java.lang.Throwable.toString() [UnsolvedSymbolException.java <60:19 60:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException.toString() -> java.lang.Override [UnsolvedSymbolException.java <59:6 59:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.UnsolvedSymbolException.toString() -> java.lang.String [UnsolvedSymbolException.java <60:12 60:17>]
 LOCAL_SYMBOL: UnsolvedSymbolException.java<60:30> [UnsolvedSymbolException.java <60:30 60:30>]
 LOCAL_SYMBOL: UnsolvedSymbolException.java<60:30> [UnsolvedSymbolException.java <66:5 66:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractJavaParserContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractJavaParserContext.txt
index e6009214..d1e59db4 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractJavaParserContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractJavaParserContext.txt
@@ -173,6 +173,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.equals(java.lang.Object) [AbstractJavaParserContext.java <73:5 <73:5  <74:20 74:25> 74:35> 83:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [AbstractJavaParserContext.java <74:20 74:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.equals(java.lang.Object) -> java.lang.Override [AbstractJavaParserContext.java <73:6 73:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.equals(java.lang.Object) -> boolean [AbstractJavaParserContext.java <74:12 74:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.equals(java.lang.Object) -> java.lang.Object [AbstractJavaParserContext.java <74:27 74:32>]
@@ -200,6 +201,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.conte
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.hashCode() [AbstractJavaParserContext.java <85:5 <85:5  <86:16 86:23> 86:25> 88:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.hashCode() -> int java.lang.Object.hashCode() [AbstractJavaParserContext.java <86:16 86:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.hashCode() -> java.lang.Override [AbstractJavaParserContext.java <85:6 85:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.hashCode() -> int [AbstractJavaParserContext.java <86:12 86:14>]
 LOCAL_SYMBOL: AbstractJavaParserContext.java<86:27> [AbstractJavaParserContext.java <86:27 86:27>]
@@ -211,6 +213,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.contexts.
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractJavaParserContext.java <90:5 <90:5  <91:27 91:42> 91:78> 98:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.core.resolution.Context.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.core.resolution.Context.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractJavaParserContext.java <91:27 91:42>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AbstractJavaParserContext.java <90:6 90:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [AbstractJavaParserContext.java <91:12 91:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.Type [AbstractJavaParserContext.java <91:21 91:24>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AbstractJavaParserContext.java <91:44 91:49>]
@@ -238,6 +241,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.getParent() [AbstractJavaParserContext.java <100:5 <100:5  <101:26 101:34> 101:36> 125:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.core.resolution.Context.getParent()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.getParent() -> com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.core.resolution.Context.getParent() [AbstractJavaParserContext.java <101:26 101:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.getParent() -> java.lang.Override [AbstractJavaParserContext.java <100:6 100:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.getParent() -> com.github.javaparser.symbolsolver.core.resolution.Context [AbstractJavaParserContext.java <101:18 101:24>]
 LOCAL_SYMBOL: AbstractJavaParserContext.java<101:38> [AbstractJavaParserContext.java <101:38 101:38>]
 LOCAL_SYMBOL: AbstractJavaParserContext.java<101:38> [AbstractJavaParserContext.java <125:5 125:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractMethodLikeDeclarationContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractMethodLikeDeclarationContext.txt
index 2e720037..b4db7ec4 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractMethodLikeDeclarationContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AbstractMethodLikeDeclarationContext.txt
@@ -201,6 +201,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <46:5 <46:5  <47:33 47:48> 47:84> 54:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <47:33 47:48>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AbstractMethodLikeDeclarationContext.java <46:6 46:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [AbstractMethodLikeDeclarationContext.java <47:18 47:25>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.Type [AbstractMethodLikeDeclarationContext.java <47:27 47:30>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AbstractMethodLikeDeclarationContext.java <47:50 47:55>]
@@ -249,6 +250,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <56:5 <56:5  <57:34 57:51> 57:87> 69:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <57:34 57:51>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AbstractMethodLikeDeclarationContext.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [AbstractMethodLikeDeclarationContext.java <57:18 57:25>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [AbstractMethodLikeDeclarationContext.java <57:27 57:31>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AbstractMethodLikeDeclarationContext.java <57:53 57:58>]
@@ -290,6 +292,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <71:5 <71:5  <72:51 72:59> 72:95> 94:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <72:51 72:59>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AbstractMethodLikeDeclarationContext.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [AbstractMethodLikeDeclarationContext.java <72:18 72:32>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [AbstractMethodLikeDeclarationContext.java <72:34 72:48>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AbstractMethodLikeDeclarationContext.java <72:61 72:66>]
@@ -403,6 +406,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <96:5 <96:5  <97:53 97:63> 98:94> 100:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AbstractMethodLikeDeclarationContext.java <97:53 97:63>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AbstractMethodLikeDeclarationContext.java <96:6 96:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [AbstractMethodLikeDeclarationContext.java <97:18 97:32>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [AbstractMethodLikeDeclarationContext.java <97:34 97:50>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractMethodLikeDeclarationContext<T>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AbstractMethodLikeDeclarationContext.java <98:13 98:18>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AnonymousClassDeclarationContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AnonymousClassDeclarationContext.txt
index 33c25b95..0fd70483 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AnonymousClassDeclarationContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_AnonymousClassDeclarationContext.txt
@@ -186,6 +186,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Anonym
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AnonymousClassDeclarationContext.java <41:3 <41:3  <42:45 42:55> 45:78> 98:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AnonymousClassDeclarationContext.java <42:45 42:55>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AnonymousClassDeclarationContext.java <41:4 41:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [AnonymousClassDeclarationContext.java <42:10 42:24>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [AnonymousClassDeclarationContext.java <42:26 42:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AnonymousClassDeclarationContext.java <42:57 42:62>]
@@ -330,6 +331,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Anonym
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AnonymousClassDeclarationContext.java <100:3 <100:3  <101:43 101:51> 101:87> 172:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AnonymousClassDeclarationContext.java <101:43 101:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AnonymousClassDeclarationContext.java <100:4 100:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [AnonymousClassDeclarationContext.java <101:10 101:24>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [AnonymousClassDeclarationContext.java <101:26 101:40>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AnonymousClassDeclarationContext.java <101:53 101:58>]
@@ -528,6 +530,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Anonym
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AnonymousClassDeclarationContext.java <174:3 <174:3  <175:54 175:64> 176:87> 184:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [AnonymousClassDeclarationContext.java <175:54 175:64>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [AnonymousClassDeclarationContext.java <174:4 174:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [AnonymousClassDeclarationContext.java <175:10 175:24>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [AnonymousClassDeclarationContext.java <175:36 175:51>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AnonymousClassDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [AnonymousClassDeclarationContext.java <175:66 175:71>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CatchClauseContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CatchClauseContext.txt
index 68552ce2..c242e212 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CatchClauseContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CatchClauseContext.txt
@@ -143,6 +143,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchC
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CatchClauseContext.java <36:5 <36:5  <37:34 37:51> 37:87> 47:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CatchClauseContext.java <37:34 37:51>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [CatchClauseContext.java <36:6 36:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [CatchClauseContext.java <37:18 37:25>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [CatchClauseContext.java <37:27 37:31>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [CatchClauseContext.java <37:53 37:58>]
@@ -179,6 +180,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchC
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CatchClauseContext.java <49:5 <49:5  <50:53 50:63> 51:94> 53:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CatchClauseContext.java <50:53 50:63>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [CatchClauseContext.java <49:6 49:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [CatchClauseContext.java <50:18 50:32>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [CatchClauseContext.java <50:34 50:50>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CatchClauseContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [CatchClauseContext.java <51:13 51:18>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ClassOrInterfaceDeclarationContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ClassOrInterfaceDeclarationContext.txt
index d2eab7d0..c09af7a0 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ClassOrInterfaceDeclarationContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ClassOrInterfaceDeclarationContext.txt
@@ -115,6 +115,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.javaparsermodel.contexts.Class
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <53:5 <53:5  <54:56 54:66> 54:102> 63:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <54:56 54:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ClassOrInterfaceDeclarationContext.java <53:6 53:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ClassOrInterfaceDeclarationContext.java <54:12 54:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [ClassOrInterfaceDeclarationContext.java <54:38 54:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ClassOrInterfaceDeclarationContext.java <54:68 54:73>]
@@ -150,6 +151,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassO
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <65:5 <65:5  <66:28 66:45> 66:81> 75:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <66:28 66:45>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ClassOrInterfaceDeclarationContext.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [ClassOrInterfaceDeclarationContext.java <66:12 66:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [ClassOrInterfaceDeclarationContext.java <66:21 66:25>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ClassOrInterfaceDeclarationContext.java <66:47 66:52>]
@@ -184,6 +186,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassO
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <77:5 <77:5  <78:27 78:42> 78:78> 85:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <78:27 78:42>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ClassOrInterfaceDeclarationContext.java <77:6 77:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [ClassOrInterfaceDeclarationContext.java <78:12 78:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ClassOrInterfaceDeclarationContext.java <78:21 78:24>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ClassOrInterfaceDeclarationContext.java <78:44 78:49>]
@@ -233,6 +236,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassO
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <87:5 <87:5  <88:45 88:53> 88:89> 90:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <88:45 88:53>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ClassOrInterfaceDeclarationContext.java <87:6 87:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ClassOrInterfaceDeclarationContext.java <88:12 88:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [ClassOrInterfaceDeclarationContext.java <88:28 88:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ClassOrInterfaceDeclarationContext.java <88:55 88:60>]
@@ -249,6 +253,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassO
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <92:5 <92:5  <93:47 93:57> 93:140> 95:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ClassOrInterfaceDeclarationContext.java <93:47 93:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ClassOrInterfaceDeclarationContext.java <92:6 92:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ClassOrInterfaceDeclarationContext.java <93:12 93:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ClassOrInterfaceDeclarationContext.java <93:28 93:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ClassOrInterfaceDeclarationContext.java <93:59 93:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CompilationUnitContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CompilationUnitContext.txt
index 59f9b7c0..f2d7d11a 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CompilationUnitContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_CompilationUnitContext.txt
@@ -160,6 +160,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Compil
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CompilationUnitContext.java <64:5 <64:5  <65:56 65:66> 65:102> 108:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CompilationUnitContext.java <65:56 65:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [CompilationUnitContext.java <64:6 64:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [CompilationUnitContext.java <65:12 65:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [CompilationUnitContext.java <65:38 65:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [CompilationUnitContext.java <65:68 65:73>]
@@ -315,6 +316,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolR
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CompilationUnitContext.java <110:5 <110:5  <111:99 111:107> 111:143> 194:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CompilationUnitContext.java <111:99 111:107>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [CompilationUnitContext.java <110:6 110:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [CompilationUnitContext.java <111:12 111:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [CompilationUnitContext.java <111:82 111:96>]
 QUALIFIER: com.github.javaparser.symbolsolver.model.declarations [CompilationUnitContext.java <111:69 111:80>]
@@ -748,6 +750,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Compil
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CompilationUnitContext.java <226:5 <226:5  <227:47 227:57> 227:140> 262:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CompilationUnitContext.java <227:47 227:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [CompilationUnitContext.java <226:6 226:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [CompilationUnitContext.java <227:12 227:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [CompilationUnitContext.java <227:28 227:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [CompilationUnitContext.java <227:59 227:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_EnumDeclarationContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_EnumDeclarationContext.txt
index 04c71bf7..b307047c 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_EnumDeclarationContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_EnumDeclarationContext.txt
@@ -113,6 +113,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumD
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [EnumDeclarationContext.java <44:5 <44:5  <45:56 45:66> 45:102> 61:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [EnumDeclarationContext.java <45:56 45:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [EnumDeclarationContext.java <44:6 44:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [EnumDeclarationContext.java <45:12 45:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [EnumDeclarationContext.java <45:38 45:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [EnumDeclarationContext.java <45:68 45:73>]
@@ -173,6 +174,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDe
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [EnumDeclarationContext.java <63:5 <63:5  <64:99 64:107> 64:143> 66:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [EnumDeclarationContext.java <64:99 64:107>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [EnumDeclarationContext.java <63:6 63:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [EnumDeclarationContext.java <64:12 64:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [EnumDeclarationContext.java <64:82 64:96>]
 QUALIFIER: com.github.javaparser.symbolsolver.model.declarations [EnumDeclarationContext.java <64:69 64:80>]
@@ -195,6 +197,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDe
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [EnumDeclarationContext.java <68:5 <68:5  <69:101 69:111> 69:194> 71:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [EnumDeclarationContext.java <69:101 69:111>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [EnumDeclarationContext.java <68:6 68:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [EnumDeclarationContext.java <69:12 69:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [EnumDeclarationContext.java <69:82 69:98>]
 QUALIFIER: com.github.javaparser.symbolsolver.model.declarations [EnumDeclarationContext.java <69:69 69:80>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_FieldAccessContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_FieldAccessContext.txt
index 0de9eeaf..8b155294 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_FieldAccessContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_FieldAccessContext.txt
@@ -145,6 +145,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <50:5 <50:5  <51:56 51:66> 51:102> 59:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <51:56 51:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [FieldAccessContext.java <50:6 50:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [FieldAccessContext.java <51:12 51:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [FieldAccessContext.java <51:38 51:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [FieldAccessContext.java <51:68 51:73>]
@@ -204,6 +205,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <61:5 <61:5  <62:45 62:53> 62:89> 64:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <62:45 62:53>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [FieldAccessContext.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [FieldAccessContext.java <62:12 62:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [FieldAccessContext.java <62:28 62:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [FieldAccessContext.java <62:55 62:60>]
@@ -223,6 +225,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldA
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <66:5 <66:5  <67:47 67:57> 67:140> 69:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <67:47 67:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [FieldAccessContext.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [FieldAccessContext.java <67:12 67:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [FieldAccessContext.java <67:28 67:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [FieldAccessContext.java <67:59 67:64>]
@@ -249,6 +252,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldA
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <71:5 <71:5  <72:28 72:45> 72:81> 92:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [FieldAccessContext.java <72:28 72:45>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [FieldAccessContext.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [FieldAccessContext.java <72:12 72:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [FieldAccessContext.java <72:21 72:25>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.FieldAccessContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [FieldAccessContext.java <72:47 72:52>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForStatementContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForStatementContext.txt
index a692cbf5..c76da746 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForStatementContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForStatementContext.txt
@@ -134,6 +134,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForSta
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForStatementContext.java <43:5 <43:5  <44:56 44:66> 44:102> 63:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForStatementContext.java <44:56 44:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ForStatementContext.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ForStatementContext.java <44:12 44:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [ForStatementContext.java <44:38 44:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ForStatementContext.java <44:68 44:73>]
@@ -219,6 +220,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForSta
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForStatementContext.java <65:5 <65:5  <66:47 66:57> 66:140> 68:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForStatementContext.java <66:47 66:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ForStatementContext.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ForStatementContext.java <66:12 66:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ForStatementContext.java <66:28 66:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ForStatementContext.java <66:59 66:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForechStatementContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForechStatementContext.txt
index 3976da08..686948e6 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForechStatementContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_ForechStatementContext.txt
@@ -108,6 +108,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Forech
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForechStatementContext.java <39:5 <39:5  <40:56 40:66> 40:102> 54:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForechStatementContext.java <40:56 40:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ForechStatementContext.java <39:6 39:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ForechStatementContext.java <40:12 40:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [ForechStatementContext.java <40:38 40:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ForechStatementContext.java <40:68 40:73>]
@@ -178,6 +179,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Forech
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForechStatementContext.java <56:5 <56:5  <57:47 57:57> 57:140> 59:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ForechStatementContext.java <57:47 57:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ForechStatementContext.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ForechStatementContext.java <57:12 57:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ForechStatementContext.java <57:28 57:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.ForechStatementContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ForechStatementContext.java <57:59 57:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_LambdaExprContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_LambdaExprContext.txt
index 1a86de1e..cfcd6984 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_LambdaExprContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_LambdaExprContext.txt
@@ -197,6 +197,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Lambda
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <56:5 <56:5  <57:28 57:45> 57:81> 139:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <57:28 57:45>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [LambdaExprContext.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [LambdaExprContext.java <57:12 57:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [LambdaExprContext.java <57:21 57:25>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [LambdaExprContext.java <57:47 57:52>]
@@ -521,6 +522,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Lambda
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <141:5 <141:5  <142:56 142:66> 142:102> 153:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <142:56 142:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [LambdaExprContext.java <141:6 141:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [LambdaExprContext.java <142:12 142:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [LambdaExprContext.java <142:38 142:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [LambdaExprContext.java <142:68 142:73>]
@@ -561,6 +563,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Lambda
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <155:5 <155:5  <156:45 156:53> 156:89> 158:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <156:45 156:53>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [LambdaExprContext.java <155:6 155:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [LambdaExprContext.java <156:12 156:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [LambdaExprContext.java <156:28 156:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [LambdaExprContext.java <156:55 156:60>]
@@ -576,6 +579,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Lambda
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <160:5 <160:5  <161:47 161:57> 162:94> 164:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [LambdaExprContext.java <161:47 161:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [LambdaExprContext.java <160:6 160:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [LambdaExprContext.java <161:12 161:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [LambdaExprContext.java <161:28 161:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.LambdaExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [LambdaExprContext.java <162:13 162:18>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_MethodCallExprContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_MethodCallExprContext.txt
index d755dd4e..644671da 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_MethodCallExprContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_MethodCallExprContext.txt
@@ -197,6 +197,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Method
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <62:5 <62:5  <63:27 63:42> 63:78> 71:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <63:27 63:42>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [MethodCallExprContext.java <62:6 62:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [MethodCallExprContext.java <63:12 63:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.Type [MethodCallExprContext.java <63:21 63:24>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.typesystem.Type> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveGenericType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [MethodCallExprContext.java <63:44 63:49>]
@@ -243,6 +244,7 @@ QUALIFIER: java.util.Optional [MethodCallExprContext.java <69:20 69:27>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.toString() [MethodCallExprContext.java <73:5 <73:5  <74:19 74:26> 74:28> 76:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.toString() -> java.lang.String java.lang.Object.toString() [MethodCallExprContext.java <74:19 74:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.toString() -> java.lang.Override [MethodCallExprContext.java <73:6 73:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.toString() -> java.lang.String [MethodCallExprContext.java <74:12 74:17>]
 LOCAL_SYMBOL: MethodCallExprContext.java<74:30> [MethodCallExprContext.java <74:30 74:30>]
 LOCAL_SYMBOL: MethodCallExprContext.java<74:30> [MethodCallExprContext.java <76:5 76:5>]
@@ -250,6 +252,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <78:5 <78:5  <79:34 79:51> 79:114> 124:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <79:34 79:51>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [MethodCallExprContext.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [MethodCallExprContext.java <79:12 79:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.methods.MethodUsage [MethodCallExprContext.java <79:21 79:31>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [MethodCallExprContext.java <79:53 79:58>]
@@ -506,6 +509,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Method
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <144:5 <144:5  <145:56 145:66> 145:102> 147:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <145:56 145:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [MethodCallExprContext.java <144:6 144:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [MethodCallExprContext.java <145:12 145:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [MethodCallExprContext.java <145:38 145:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [MethodCallExprContext.java <145:68 145:73>]
@@ -521,6 +525,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Method
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <149:5 <149:5  <150:28 150:45> 150:81> 153:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <150:28 150:45>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [MethodCallExprContext.java <149:6 149:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [MethodCallExprContext.java <150:12 150:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [MethodCallExprContext.java <150:21 150:25>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [MethodCallExprContext.java <150:47 150:52>]
@@ -539,6 +544,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Method
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <155:5 <155:5  <156:47 156:57> 156:140> 202:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MethodCallExprContext.java <156:47 156:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [MethodCallExprContext.java <155:6 155:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [MethodCallExprContext.java <156:12 156:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [MethodCallExprContext.java <156:28 156:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [MethodCallExprContext.java <156:59 156:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_StatementContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_StatementContext.txt
index 78d2fbdb..cf78c626 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_StatementContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_StatementContext.txt
@@ -337,6 +337,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Statem
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveInBlockAsValue<1> [StatementContext.java <97:103 97:112>]
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <100:5 <100:5  <101:28 101:45> 101:81> 144:5>]
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <101:28 101:45>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [StatementContext.java <100:6 100:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [StatementContext.java <101:12 101:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [StatementContext.java <101:21 101:25>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [StatementContext.java <101:47 101:52>]
@@ -473,6 +474,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Statem
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbolAsValue<1> [StatementContext.java <143:55 143:64>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <146:5 <146:5  <147:56 147:66> 147:102> 189:5>]
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <147:56 147:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [StatementContext.java <146:6 146:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [StatementContext.java <147:12 147:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [StatementContext.java <147:38 147:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [StatementContext.java <147:68 147:73>]
@@ -606,6 +608,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Statem
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <191:5 <191:5  <192:47 192:57> 192:140> 194:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <192:47 192:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [StatementContext.java <191:6 191:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [StatementContext.java <192:12 192:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [StatementContext.java <192:28 192:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [StatementContext.java <192:59 192:64>]
@@ -628,6 +631,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Statem
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <196:5 <196:5  <197:45 197:53> 197:89> 199:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [StatementContext.java <197:45 197:53>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [StatementContext.java <196:6 196:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [StatementContext.java <197:12 197:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [StatementContext.java <197:28 197:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.StatementContext<N>.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [StatementContext.java <197:55 197:60>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_SwitchEntryContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_SwitchEntryContext.txt
index 732d0853..0639d84b 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_SwitchEntryContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_SwitchEntryContext.txt
@@ -126,6 +126,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Switch
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [SwitchEntryContext.java <45:5 <45:5  <46:56 46:66> 46:102> 74:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [SwitchEntryContext.java <46:56 46:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [SwitchEntryContext.java <45:6 45:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [SwitchEntryContext.java <46:12 46:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [SwitchEntryContext.java <46:38 46:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [SwitchEntryContext.java <46:68 46:73>]
@@ -240,6 +241,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Switch
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [SwitchEntryContext.java <76:5 <76:5  <77:47 77:57> 77:140> 79:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [SwitchEntryContext.java <77:47 77:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [SwitchEntryContext.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [SwitchEntryContext.java <77:12 77:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [SwitchEntryContext.java <77:28 77:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.SwitchEntryContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [SwitchEntryContext.java <77:59 77:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_TryWithResourceContext.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_TryWithResourceContext.txt
index 1d7c77d2..eb509938 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_TryWithResourceContext.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_contexts_TryWithResourceContext.txt
@@ -132,6 +132,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWit
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TryWithResourceContext.java <43:5 <43:5  <44:28 44:45> 44:81> 59:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TryWithResourceContext.java <44:28 44:45>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [TryWithResourceContext.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.Optional<T> [TryWithResourceContext.java <44:12 44:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.Value [TryWithResourceContext.java <44:21 44:25>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.resolution.Value> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbolAsValue(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [TryWithResourceContext.java <44:47 44:52>]
@@ -201,6 +202,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWit
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TryWithResourceContext.java <61:5 <61:5  <62:56 62:66> 62:102> 76:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TryWithResourceContext.java <62:56 62:66>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [TryWithResourceContext.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [TryWithResourceContext.java <62:12 62:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [TryWithResourceContext.java <62:38 62:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [TryWithResourceContext.java <62:68 62:73>]
@@ -255,6 +257,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWit
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TryWithResourceContext.java <78:5 <78:5  <79:47 79:57> 79:140> 81:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.core.resolution.Context.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TryWithResourceContext.java <79:47 79:57>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [TryWithResourceContext.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [TryWithResourceContext.java <79:12 79:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [TryWithResourceContext.java <79:28 79:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.contexts.TryWithResourceContext.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [TryWithResourceContext.java <79:59 79:64>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_DefaultConstructorDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_DefaultConstructorDeclaration.txt
index 8c821098..01d418f8 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_DefaultConstructorDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_DefaultConstructorDeclaration.txt
@@ -43,6 +43,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.De
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.declaringType() [DefaultConstructorDeclaration.java <35:5 <35:5  <36:29 36:41> 36:43> 38:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() [DefaultConstructorDeclaration.java <36:29 36:41>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.declaringType() -> java.lang.Override [DefaultConstructorDeclaration.java <35:6 35:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration [DefaultConstructorDeclaration.java <36:12 36:27>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<36:45> [DefaultConstructorDeclaration.java <36:45 36:45>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<36:45> [DefaultConstructorDeclaration.java <38:5 38:5>]
@@ -50,6 +51,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDecla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getNumberOfParams() [DefaultConstructorDeclaration.java <40:5 <40:5  <41:16 41:32> 41:34> 43:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [DefaultConstructorDeclaration.java <41:16 41:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getNumberOfParams() -> java.lang.Override [DefaultConstructorDeclaration.java <40:6 40:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getNumberOfParams() -> int [DefaultConstructorDeclaration.java <41:12 41:14>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<41:36> [DefaultConstructorDeclaration.java <41:36 41:36>]
@@ -57,6 +59,7 @@ LOCAL_SYMBOL: DefaultConstructorDeclaration.java<41:36> [DefaultConstructorDecla
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getParam(int) [DefaultConstructorDeclaration.java <45:5 <45:5  <46:33 46:40> 46:47> 48:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [DefaultConstructorDeclaration.java <46:33 46:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getParam(int) -> java.lang.Override [DefaultConstructorDeclaration.java <45:6 45:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [DefaultConstructorDeclaration.java <46:12 46:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getParam(int) -> int [DefaultConstructorDeclaration.java <46:42 46:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getParam<0> [DefaultConstructorDeclaration.java <46:46 46:46>]
@@ -68,6 +71,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.Param
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getName() [DefaultConstructorDeclaration.java <50:5 <50:5  <51:19 51:25> 51:27> 53:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [DefaultConstructorDeclaration.java <51:19 51:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getName() -> java.lang.Override [DefaultConstructorDeclaration.java <50:6 50:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getName() -> java.lang.String [DefaultConstructorDeclaration.java <51:12 51:17>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<51:29> [DefaultConstructorDeclaration.java <51:29 51:29>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<51:29> [DefaultConstructorDeclaration.java <53:5 53:5>]
@@ -76,6 +80,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.accessLevel() [DefaultConstructorDeclaration.java <55:5 <55:5  <56:24 56:34> 56:36> 58:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [DefaultConstructorDeclaration.java <56:24 56:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.accessLevel() -> java.lang.Override [DefaultConstructorDeclaration.java <55:6 55:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [DefaultConstructorDeclaration.java <56:12 56:22>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<56:38> [DefaultConstructorDeclaration.java <56:38 56:38>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<56:38> [DefaultConstructorDeclaration.java <58:5 58:5>]
@@ -85,6 +90,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getTypeParameters() [DefaultConstructorDeclaration.java <60:5 <60:5  <61:43 61:59> 61:61> 63:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [DefaultConstructorDeclaration.java <61:43 61:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getTypeParameters() -> java.lang.Override [DefaultConstructorDeclaration.java <60:6 60:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getTypeParameters() -> java.util.List<E> [DefaultConstructorDeclaration.java <61:12 61:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.DefaultConstructorDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [DefaultConstructorDeclaration.java <61:17 61:40>]
 LOCAL_SYMBOL: DefaultConstructorDeclaration.java<61:63> [DefaultConstructorDeclaration.java <61:63 61:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnnotationDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnnotationDeclaration.txt
index eb3a6710..637688e3 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnnotationDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnnotationDeclaration.txt
@@ -103,6 +103,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAncestors() [JavaParserAnnotationDeclaration.java <28:5 <28:5  <29:32 29:43> 29:45> 31:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserAnnotationDeclaration.java <29:32 29:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAncestors() -> java.lang.Override [JavaParserAnnotationDeclaration.java <28:6 28:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAncestors() -> java.util.List<E> [JavaParserAnnotationDeclaration.java <29:12 29:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserAnnotationDeclaration.java <29:17 29:29>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<29:47> [JavaParserAnnotationDeclaration.java <29:47 29:47>]
@@ -113,6 +114,7 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typ
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAllFields() [JavaParserAnnotationDeclaration.java <33:5 <33:5  <34:35 34:46> 34:48> 36:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserAnnotationDeclaration.java <34:35 34:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAllFields() -> java.lang.Override [JavaParserAnnotationDeclaration.java <33:6 33:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAllFields() -> java.util.List<E> [JavaParserAnnotationDeclaration.java <34:12 34:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserAnnotationDeclaration.java <34:17 34:32>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<34:50> [JavaParserAnnotationDeclaration.java <34:50 34:50>]
@@ -122,6 +124,7 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.dec
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getDeclaredMethods() [JavaParserAnnotationDeclaration.java <38:5 <38:5  <39:35 39:52> 39:54> 41:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserAnnotationDeclaration.java <39:35 39:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getDeclaredMethods() -> java.lang.Override [JavaParserAnnotationDeclaration.java <38:6 38:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavaParserAnnotationDeclaration.java <39:12 39:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserAnnotationDeclaration.java <39:16 39:32>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<39:56> [JavaParserAnnotationDeclaration.java <39:56 39:56>]
@@ -131,6 +134,7 @@ REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.decl
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserAnnotationDeclaration.java <43:5 <43:5  <44:20 44:33> 44:44> 46:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserAnnotationDeclaration.java <44:20 44:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserAnnotationDeclaration.java <43:6 43:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserAnnotationDeclaration.java <44:12 44:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserAnnotationDeclaration.java <44:35 44:38>]
@@ -142,6 +146,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserAnnotationDeclaration.java <48:5 <48:5  <49:20 49:33> 49:65> 51:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserAnnotationDeclaration.java <49:20 49:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserAnnotationDeclaration.java <48:6 48:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserAnnotationDeclaration.java <49:12 49:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserAnnotationDeclaration.java <49:35 49:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.isAssignableBy<0> [JavaParserAnnotationDeclaration.java <49:60 49:64>]
@@ -152,6 +157,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserAnnotationDeclaration.java <53:5 <53:5  <54:20 54:40> 54:62> 56:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserAnnotationDeclaration.java <54:20 54:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserAnnotationDeclaration.java <53:6 53:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserAnnotationDeclaration.java <54:12 54:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserAnnotationDeclaration.java <54:42 54:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.hasDirectlyAnnotation<0> [JavaParserAnnotationDeclaration.java <54:49 54:61>]
@@ -162,6 +168,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getPackageName() [JavaParserAnnotationDeclaration.java <58:5 <58:5  <59:19 59:32> 59:34> 61:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavaParserAnnotationDeclaration.java <59:19 59:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getPackageName() -> java.lang.Override [JavaParserAnnotationDeclaration.java <58:6 58:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getPackageName() -> java.lang.String [JavaParserAnnotationDeclaration.java <59:12 59:17>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<59:36> [JavaParserAnnotationDeclaration.java <59:36 59:36>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<59:36> [JavaParserAnnotationDeclaration.java <61:5 61:5>]
@@ -172,6 +179,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getClassName() [JavaParserAnnotationDeclaration.java <63:5 <63:5  <64:19 64:30> 64:32> 66:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavaParserAnnotationDeclaration.java <64:19 64:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getClassName() -> java.lang.Override [JavaParserAnnotationDeclaration.java <63:6 63:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getClassName() -> java.lang.String [JavaParserAnnotationDeclaration.java <64:12 64:17>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<64:34> [JavaParserAnnotationDeclaration.java <64:34 64:34>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<64:34> [JavaParserAnnotationDeclaration.java <66:5 66:5>]
@@ -182,6 +190,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getQualifiedName() [JavaParserAnnotationDeclaration.java <68:5 <68:5  <69:19 69:34> 69:36> 76:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavaParserAnnotationDeclaration.java <69:19 69:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getQualifiedName() -> java.lang.Override [JavaParserAnnotationDeclaration.java <68:6 68:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getQualifiedName() -> java.lang.String [JavaParserAnnotationDeclaration.java <69:12 69:17>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<69:38> [JavaParserAnnotationDeclaration.java <69:38 69:38>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<69:38> [JavaParserAnnotationDeclaration.java <76:5 76:5>]
@@ -211,6 +220,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getName() [JavaParserAnnotationDeclaration.java <78:5 <78:5  <79:19 79:25> 79:27> 81:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserAnnotationDeclaration.java <79:19 79:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getName() -> java.lang.Override [JavaParserAnnotationDeclaration.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getName() -> java.lang.String [JavaParserAnnotationDeclaration.java <79:12 79:17>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<79:29> [JavaParserAnnotationDeclaration.java <79:29 79:29>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<79:29> [JavaParserAnnotationDeclaration.java <81:5 81:5>]
@@ -220,6 +230,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getTypeParameters() [JavaParserAnnotationDeclaration.java <83:5 <83:5  <84:43 84:59> 84:61> 86:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserAnnotationDeclaration.java <84:43 84:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getTypeParameters() -> java.lang.Override [JavaParserAnnotationDeclaration.java <83:6 83:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserAnnotationDeclaration.java <84:12 84:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserAnnotationDeclaration.java <84:17 84:40>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<84:63> [JavaParserAnnotationDeclaration.java <84:63 84:63>]
@@ -229,6 +240,7 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.dec
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.containerType() [JavaParserAnnotationDeclaration.java <88:5 <88:5  <89:47 89:59> 89:61> 91:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserAnnotationDeclaration.java <89:47 89:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.containerType() -> java.lang.Override [JavaParserAnnotationDeclaration.java <88:6 88:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.containerType() -> java.util.Optional<T> [JavaParserAnnotationDeclaration.java <89:12 89:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnnotationDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserAnnotationDeclaration.java <89:21 89:44>]
 LOCAL_SYMBOL: JavaParserAnnotationDeclaration.java<89:63> [JavaParserAnnotationDeclaration.java <89:63 89:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt
index 808feb45..28fa2cce 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt
@@ -256,6 +256,7 @@ QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java
 SYMBOL_METHOD protected com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.object() [JavaParserAnonymousClassDeclaration.java <63:3 <63:3  <64:27 64:32> 64:34> 66:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object() [JavaParserAnonymousClassDeclaration.java <64:27 64:32>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.object() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <63:4 63:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserAnonymousClassDeclaration.java <64:13 64:25>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<64:36> [JavaParserAnonymousClassDeclaration.java <64:36 64:36>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<64:36> [JavaParserAnonymousClassDeclaration.java <66:3 66:3>]
@@ -272,6 +273,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTyp
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getSuperClass() [JavaParserAnonymousClassDeclaration.java <68:3 <68:3  <69:24 69:36> 69:38> 71:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass() [JavaParserAnonymousClassDeclaration.java <69:24 69:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getSuperClass() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <68:4 68:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserAnonymousClassDeclaration.java <69:10 69:22>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<69:40> [JavaParserAnonymousClassDeclaration.java <69:40 69:40>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<69:40> [JavaParserAnonymousClassDeclaration.java <71:3 71:3>]
@@ -284,6 +286,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTyp
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces() [JavaParserAnonymousClassDeclaration.java <73:3 <73:3  <74:30 74:42> 74:44> 81:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces() [JavaParserAnonymousClassDeclaration.java <74:30 74:42>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <73:4 73:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <74:10 74:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserAnonymousClassDeclaration.java <74:15 74:27>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<74:46> [JavaParserAnonymousClassDeclaration.java <74:46 74:46>]
@@ -306,6 +309,7 @@ QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getConstructors() [JavaParserAnonymousClassDeclaration.java <83:3 <83:3  <84:39 84:53> 84:55> 90:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getConstructors() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors() [JavaParserAnonymousClassDeclaration.java <84:39 84:53>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getConstructors() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <83:4 83:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getConstructors() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <84:10 84:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getConstructors() -> com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration [JavaParserAnonymousClassDeclaration.java <84:15 84:36>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<84:57> [JavaParserAnonymousClassDeclaration.java <84:57 84:57>]
@@ -332,6 +336,7 @@ QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.accessLevel() [JavaParserAnonymousClassDeclaration.java <92:3 <92:3  <93:22 93:32> 93:34> 95:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserAnonymousClassDeclaration.java <93:22 93:32>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.accessLevel() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <92:4 92:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserAnonymousClassDeclaration.java <93:10 93:20>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<93:36> [JavaParserAnonymousClassDeclaration.java <93:36 93:36>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<93:36> [JavaParserAnonymousClassDeclaration.java <95:3 95:3>]
@@ -340,6 +345,7 @@ SYMBOL_FIELD com.github.javaparser.symbolsolver.model.declarations.AccessLevel.P
 REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel.PRIVATE [JavaParserAnonymousClassDeclaration.java <94:24 94:30>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAncestors() [JavaParserAnonymousClassDeclaration.java <97:3 <97:3  <98:30 98:41> 98:43> 105:3>]
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserAnonymousClassDeclaration.java <98:30 98:41>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAncestors() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <97:4 97:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAncestors() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <98:10 98:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserAnonymousClassDeclaration.java <98:15 98:27>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<98:45> [JavaParserAnonymousClassDeclaration.java <98:45 98:45>]
@@ -362,6 +368,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesyst
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() [JavaParserAnonymousClassDeclaration.java <107:3 <107:3  <108:33 108:44> 108:46> 134:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserAnonymousClassDeclaration.java <108:33 108:44>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <107:4 107:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <108:10 108:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserAnonymousClassDeclaration.java <108:15 108:30>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<108:48> [JavaParserAnonymousClassDeclaration.java <108:48 108:48>]
@@ -428,6 +435,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() [JavaParserAnonymousClassDeclaration.java <136:3 <136:3  <137:33 137:50> 137:52> 143:3>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserAnonymousClassDeclaration.java <137:33 137:50>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <136:4 136:11>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavaParserAnonymousClassDeclaration.java <137:10 137:12>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserAnonymousClassDeclaration.java <137:14 137:30>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<137:54> [JavaParserAnonymousClassDeclaration.java <137:54 137:54>]
@@ -454,6 +462,7 @@ QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserAnonymousClassDeclaration.java <145:3 <145:3  <146:18 146:31> 146:42> 148:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserAnonymousClassDeclaration.java <146:18 146:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <145:4 145:11>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserAnonymousClassDeclaration.java <146:10 146:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserAnonymousClassDeclaration.java <146:33 146:36>]
@@ -463,6 +472,7 @@ LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<146:44> [JavaParserAnonym
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserAnonymousClassDeclaration.java <150:3 <150:3  <151:18 151:31> 151:63> 153:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserAnonymousClassDeclaration.java <151:18 151:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <150:4 150:11>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserAnonymousClassDeclaration.java <151:10 151:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserAnonymousClassDeclaration.java <151:33 151:56>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.isAssignableBy<0> [JavaParserAnonymousClassDeclaration.java <151:58 151:62>]
@@ -471,6 +481,7 @@ LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<151:65> [JavaParserAnonym
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserAnonymousClassDeclaration.java <155:3 <155:3  <156:18 156:38> 156:60> 158:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserAnonymousClassDeclaration.java <156:18 156:38>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <155:4 155:11>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserAnonymousClassDeclaration.java <156:10 156:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserAnonymousClassDeclaration.java <156:40 156:45>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.hasDirectlyAnnotation<0> [JavaParserAnonymousClassDeclaration.java <156:47 156:59>]
@@ -479,6 +490,7 @@ LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<156:62> [JavaParserAnonym
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getPackageName() [JavaParserAnonymousClassDeclaration.java <160:3 <160:3  <161:17 161:30> 161:32> 163:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavaParserAnonymousClassDeclaration.java <161:17 161:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getPackageName() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <160:4 160:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getPackageName() -> java.lang.String [JavaParserAnonymousClassDeclaration.java <161:10 161:15>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<161:34> [JavaParserAnonymousClassDeclaration.java <161:34 161:34>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<161:34> [JavaParserAnonymousClassDeclaration.java <163:3 163:3>]
@@ -489,6 +501,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getClassName() [JavaParserAnonymousClassDeclaration.java <165:3 <165:3  <166:17 166:28> 166:30> 168:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavaParserAnonymousClassDeclaration.java <166:17 166:28>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getClassName() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <165:4 165:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getClassName() -> java.lang.String [JavaParserAnonymousClassDeclaration.java <166:10 166:15>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<166:32> [JavaParserAnonymousClassDeclaration.java <166:32 166:32>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<166:32> [JavaParserAnonymousClassDeclaration.java <168:3 168:3>]
@@ -499,6 +512,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getQualifiedName() [JavaParserAnonymousClassDeclaration.java <170:3 <170:3  <171:17 171:32> 171:34> 178:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavaParserAnonymousClassDeclaration.java <171:17 171:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getQualifiedName() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <170:4 170:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getQualifiedName() -> java.lang.String [JavaParserAnonymousClassDeclaration.java <171:10 171:15>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<171:36> [JavaParserAnonymousClassDeclaration.java <171:36 171:36>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<171:36> [JavaParserAnonymousClassDeclaration.java <178:3 178:3>]
@@ -524,6 +538,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javaparsermod
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.internalTypes() [JavaParserAnonymousClassDeclaration.java <180:3 <180:3  <181:40 181:52> 181:54> 187:3>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavaParserAnonymousClassDeclaration.java <181:40 181:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.internalTypes() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <180:4 180:11>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.internalTypes() -> java.util.Set<E> [JavaParserAnonymousClassDeclaration.java <181:10 181:12>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserAnonymousClassDeclaration.java <181:14 181:37>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<181:56> [JavaParserAnonymousClassDeclaration.java <181:56 181:56>]
@@ -551,6 +566,7 @@ QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getName() [JavaParserAnonymousClassDeclaration.java <189:3 <189:3  <190:17 190:23> 190:25> 192:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserAnonymousClassDeclaration.java <190:17 190:23>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getName() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <189:4 189:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getName() -> java.lang.String [JavaParserAnonymousClassDeclaration.java <190:10 190:15>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<190:27> [JavaParserAnonymousClassDeclaration.java <190:27 190:27>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<190:27> [JavaParserAnonymousClassDeclaration.java <192:3 192:3>]
@@ -559,6 +575,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getTypeParameters() [JavaParserAnonymousClassDeclaration.java <194:3 <194:3  <195:41 195:57> 195:59> 197:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserAnonymousClassDeclaration.java <195:41 195:57>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getTypeParameters() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <194:4 194:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <195:10 195:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserAnonymousClassDeclaration.java <195:15 195:38>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<195:61> [JavaParserAnonymousClassDeclaration.java <195:61 195:61>]
@@ -569,6 +586,7 @@ QUALIFIER: com.google.common.collect.Lists [JavaParserAnonymousClassDeclaration.
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.containerType() [JavaParserAnonymousClassDeclaration.java <199:3 <199:3  <200:45 200:57> 200:59> 202:3>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserAnonymousClassDeclaration.java <200:45 200:57>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.containerType() -> java.lang.Override [JavaParserAnonymousClassDeclaration.java <199:4 199:11>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.containerType() -> java.util.Optional<T> [JavaParserAnonymousClassDeclaration.java <200:10 200:17>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserAnonymousClassDeclaration.java <200:19 200:42>]
 LOCAL_SYMBOL: JavaParserAnonymousClassDeclaration.java<200:61> [JavaParserAnonymousClassDeclaration.java <200:61 200:61>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserClassDeclaration.txt
index e81b57f1..b77999af 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserClassDeclaration.txt
@@ -226,6 +226,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.equals(java.lang.Object) [JavaParserClassDeclaration.java <76:5 <76:5  <77:20 77:25> 77:35> 86:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [JavaParserClassDeclaration.java <77:20 77:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.equals(java.lang.Object) -> java.lang.Override [JavaParserClassDeclaration.java <76:6 76:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.equals(java.lang.Object) -> boolean [JavaParserClassDeclaration.java <77:12 77:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.equals(java.lang.Object) -> java.lang.Object [JavaParserClassDeclaration.java <77:27 77:32>]
@@ -250,6 +251,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hashCode() [JavaParserClassDeclaration.java <88:5 <88:5  <89:16 89:23> 89:25> 91:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hashCode() -> int java.lang.Object.hashCode() [JavaParserClassDeclaration.java <89:16 89:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hashCode() -> java.lang.Override [JavaParserClassDeclaration.java <88:6 88:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hashCode() -> int [JavaParserClassDeclaration.java <89:12 89:14>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<89:27> [JavaParserClassDeclaration.java <89:27 89:27>]
@@ -260,6 +262,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarati
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toString() [JavaParserClassDeclaration.java <93:5 <93:5  <94:19 94:26> 94:28> 98:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserClassDeclaration.java <94:19 94:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toString() -> java.lang.Override [JavaParserClassDeclaration.java <93:6 93:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toString() -> java.lang.String [JavaParserClassDeclaration.java <94:12 94:17>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<94:30> [JavaParserClassDeclaration.java <94:30 94:30>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<94:30> [JavaParserClassDeclaration.java <98:5 98:5>]
@@ -267,6 +270,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAllFields() [JavaParserClassDeclaration.java <104:5 <104:5  <105:35 105:46> 105:48> 125:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserClassDeclaration.java <105:35 105:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAllFields() -> java.lang.Override [JavaParserClassDeclaration.java <104:6 104:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAllFields() -> java.util.List<E> [JavaParserClassDeclaration.java <105:12 105:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserClassDeclaration.java <105:17 105:32>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<105:50> [JavaParserClassDeclaration.java <105:50 105:50>]
@@ -373,6 +377,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveMethod<1> [JavaParserClassDeclaration.java <133:38 133:51>]
 REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.typeSolver [JavaParserClassDeclaration.java <133:61 133:70>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getContext() [JavaParserClassDeclaration.java <136:5 <136:5  <137:20 137:29> 137:31> 139:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getContext() -> java.lang.Deprecated [JavaParserClassDeclaration.java <136:6 136:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.core.resolution.Context com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getContext() -> com.github.javaparser.symbolsolver.core.resolution.Context [JavaParserClassDeclaration.java <137:12 137:18>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<137:33> [JavaParserClassDeclaration.java <137:33 137:33>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<137:33> [JavaParserClassDeclaration.java <139:5 139:5>]
@@ -393,6 +398,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type co
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getName() [JavaParserClassDeclaration.java <145:5 <145:5  <146:19 146:25> 146:27> 148:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserClassDeclaration.java <146:19 146:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getName() -> java.lang.Override [JavaParserClassDeclaration.java <145:6 145:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getName() -> java.lang.String [JavaParserClassDeclaration.java <146:12 146:17>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<146:29> [JavaParserClassDeclaration.java <146:29 146:29>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<146:29> [JavaParserClassDeclaration.java <148:5 148:5>]
@@ -404,6 +410,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getSuperClass() [JavaParserClassDeclaration.java <150:5 <150:5  <151:26 151:38> 151:40> 157:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass() [JavaParserClassDeclaration.java <151:26 151:38>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getSuperClass() -> java.lang.Override [JavaParserClassDeclaration.java <150:6 150:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserClassDeclaration.java <151:12 151:24>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<151:42> [JavaParserClassDeclaration.java <151:42 151:42>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<151:42> [JavaParserClassDeclaration.java <157:5 157:5>]
@@ -427,6 +434,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTyp
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getInterfaces() [JavaParserClassDeclaration.java <159:5 <159:5  <160:32 160:44> 160:46> 168:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getInterfaces() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces() [JavaParserClassDeclaration.java <160:32 160:44>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getInterfaces() -> java.lang.Override [JavaParserClassDeclaration.java <159:6 159:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getInterfaces() -> java.util.List<E> [JavaParserClassDeclaration.java <160:12 160:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getInterfaces() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserClassDeclaration.java <160:17 160:29>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<160:48> [JavaParserClassDeclaration.java <160:48 160:48>]
@@ -456,6 +464,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getConstructors() [JavaParserClassDeclaration.java <170:5 <170:5  <171:41 171:55> 171:57> 185:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getConstructors() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors() [JavaParserClassDeclaration.java <171:41 171:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getConstructors() -> java.lang.Override [JavaParserClassDeclaration.java <170:6 170:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getConstructors() -> java.util.List<E> [JavaParserClassDeclaration.java <171:12 171:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getConstructors() -> com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration [JavaParserClassDeclaration.java <171:17 171:38>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<171:59> [JavaParserClassDeclaration.java <171:59 171:59>]
@@ -519,6 +528,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserClassDeclaration.java <187:5 <187:5  <188:20 188:40> 188:62> 195:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserClassDeclaration.java <188:20 188:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserClassDeclaration.java <187:6 187:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserClassDeclaration.java <188:12 188:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserClassDeclaration.java <188:42 188:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.hasDirectlyAnnotation<0> [JavaParserClassDeclaration.java <188:49 188:61>]
@@ -550,6 +560,7 @@ LOCAL_SYMBOL: JavaParserClassDeclaration.java<190:145> [JavaParserClassDeclarati
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isInterface() [JavaParserClassDeclaration.java <197:5 <197:5  <198:20 198:30> 198:32> 200:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface() [JavaParserClassDeclaration.java <198:20 198:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isInterface() -> java.lang.Override [JavaParserClassDeclaration.java <197:6 197:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isInterface() -> boolean [JavaParserClassDeclaration.java <198:12 198:18>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<198:34> [JavaParserClassDeclaration.java <198:34 198:34>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<198:34> [JavaParserClassDeclaration.java <200:5 200:5>]
@@ -558,6 +569,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getPackageName() [JavaParserClassDeclaration.java <202:5 <202:5  <203:19 203:32> 203:34> 205:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavaParserClassDeclaration.java <203:19 203:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getPackageName() -> java.lang.Override [JavaParserClassDeclaration.java <202:6 202:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getPackageName() -> java.lang.String [JavaParserClassDeclaration.java <203:12 203:17>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<203:36> [JavaParserClassDeclaration.java <203:36 203:36>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<203:36> [JavaParserClassDeclaration.java <205:5 205:5>]
@@ -567,6 +579,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getClassName() [JavaParserClassDeclaration.java <207:5 <207:5  <208:19 208:30> 208:32> 210:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavaParserClassDeclaration.java <208:19 208:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getClassName() -> java.lang.Override [JavaParserClassDeclaration.java <207:6 207:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getClassName() -> java.lang.String [JavaParserClassDeclaration.java <208:12 208:17>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<208:34> [JavaParserClassDeclaration.java <208:34 208:34>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<208:34> [JavaParserClassDeclaration.java <210:5 210:5>]
@@ -575,6 +588,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javaparsermod
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getClassName() -> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeAdapter<com.github.javaparser.ast.body.ClassOrInterfaceDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.javaParserTypeAdapter [JavaParserClassDeclaration.java <209:16 209:36>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getQualifiedName() [JavaParserClassDeclaration.java <212:5 <212:5  <213:19 213:34> 213:36> 215:5>]
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavaParserClassDeclaration.java <213:19 213:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getQualifiedName() -> java.lang.Override [JavaParserClassDeclaration.java <212:6 212:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getQualifiedName() -> java.lang.String [JavaParserClassDeclaration.java <213:12 213:17>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<213:38> [JavaParserClassDeclaration.java <213:38 213:38>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<213:38> [JavaParserClassDeclaration.java <215:5 215:5>]
@@ -584,6 +598,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserClassDeclaration.java <217:5 <217:5  <218:20 218:33> 218:65> 220:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserClassDeclaration.java <218:20 218:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserClassDeclaration.java <217:6 217:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserClassDeclaration.java <218:12 218:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserClassDeclaration.java <218:35 218:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy<0> [JavaParserClassDeclaration.java <218:60 218:64>]
@@ -596,6 +611,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserClassDeclaration.java <222:5 <222:5  <223:20 223:33> 223:44> 225:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserClassDeclaration.java <223:20 223:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserClassDeclaration.java <222:6 222:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserClassDeclaration.java <223:12 223:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserClassDeclaration.java <223:35 223:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isAssignableBy<0> [JavaParserClassDeclaration.java <223:40 223:43>]
@@ -608,6 +624,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserClassDeclaration.java <227:5 <227:5  <228:20 228:34> 228:66> 254:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserClassDeclaration.java <228:20 228:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserClassDeclaration.java <227:6 227:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserClassDeclaration.java <228:12 228:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserClassDeclaration.java <228:36 228:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.canBeAssignedTo<0> [JavaParserClassDeclaration.java <228:61 228:65>]
@@ -671,10 +688,12 @@ LOCAL_SYMBOL: JavaParserClassDeclaration.java<247:54> [JavaParserClassDeclaratio
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isTypeParameter() [JavaParserClassDeclaration.java <256:5 <256:5  <257:20 257:34> 257:36> 259:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [JavaParserClassDeclaration.java <257:20 257:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isTypeParameter() -> java.lang.Override [JavaParserClassDeclaration.java <256:6 256:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.isTypeParameter() -> boolean [JavaParserClassDeclaration.java <257:12 257:18>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<257:38> [JavaParserClassDeclaration.java <257:38 257:38>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<257:38> [JavaParserClassDeclaration.java <259:5 259:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserClassDeclaration.java <261:5 <261:5  <262:45 262:53> 262:89> 277:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Deprecated [JavaParserClassDeclaration.java <261:6 261:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavaParserClassDeclaration.java <262:12 262:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [JavaParserClassDeclaration.java <262:28 262:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [JavaParserClassDeclaration.java <262:55 262:60>]
@@ -746,6 +765,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAncestors() [JavaParserClassDeclaration.java <279:5 <279:5  <280:32 280:43> 280:45> 293:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserClassDeclaration.java <280:32 280:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAncestors() -> java.lang.Override [JavaParserClassDeclaration.java <279:6 279:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAncestors() -> java.util.List<E> [JavaParserClassDeclaration.java <280:12 280:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserClassDeclaration.java <280:17 280:29>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<280:47> [JavaParserClassDeclaration.java <280:47 280:47>]
@@ -785,6 +805,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getDeclaredMethods() [JavaParserClassDeclaration.java <295:5 <295:5  <296:35 296:52> 296:54> 304:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserClassDeclaration.java <296:35 296:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getDeclaredMethods() -> java.lang.Override [JavaParserClassDeclaration.java <295:6 295:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavaParserClassDeclaration.java <296:12 296:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserClassDeclaration.java <296:16 296:32>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<296:56> [JavaParserClassDeclaration.java <296:56 296:56>]
@@ -828,6 +849,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getTypeParameters() [JavaParserClassDeclaration.java <306:5 <306:5  <307:43 307:59> 307:61> 311:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserClassDeclaration.java <307:43 307:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getTypeParameters() -> java.lang.Override [JavaParserClassDeclaration.java <306:6 306:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserClassDeclaration.java <307:12 307:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserClassDeclaration.java <307:17 307:40>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<307:63> [JavaParserClassDeclaration.java <307:63 307:63>]
@@ -865,6 +887,7 @@ REFERENCE_USAGE com.github.javaparser.ast.body.ClassOrInterfaceDeclaration com.g
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.accessLevel() [JavaParserClassDeclaration.java <322:5 <322:5  <323:24 323:34> 323:36> 325:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserClassDeclaration.java <323:24 323:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.accessLevel() -> java.lang.Override [JavaParserClassDeclaration.java <322:6 322:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserClassDeclaration.java <323:12 323:22>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<323:38> [JavaParserClassDeclaration.java <323:38 323:38>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<323:38> [JavaParserClassDeclaration.java <325:5 325:5>]
@@ -877,6 +900,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD protected com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.object() [JavaParserClassDeclaration.java <331:5 <331:5  <332:29 332:34> 332:36> 334:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object() [JavaParserClassDeclaration.java <332:29 332:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.object() -> java.lang.Override [JavaParserClassDeclaration.java <331:6 331:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserClassDeclaration.java <332:15 332:27>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<332:38> [JavaParserClassDeclaration.java <332:38 332:38>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<332:38> [JavaParserClassDeclaration.java <334:5 334:5>]
@@ -892,6 +916,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTyp
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.internalTypes() [JavaParserClassDeclaration.java <336:5 <336:5  <337:42 337:54> 337:56> 345:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavaParserClassDeclaration.java <337:42 337:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.internalTypes() -> java.lang.Override [JavaParserClassDeclaration.java <336:6 336:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.internalTypes() -> java.util.Set<E> [JavaParserClassDeclaration.java <337:12 337:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserClassDeclaration.java <337:16 337:39>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<337:58> [JavaParserClassDeclaration.java <337:58 337:58>]
@@ -936,6 +961,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.containerType() [JavaParserClassDeclaration.java <347:5 <347:5  <348:47 348:59> 348:61> 350:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserClassDeclaration.java <348:47 348:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.containerType() -> java.lang.Override [JavaParserClassDeclaration.java <347:6 347:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.containerType() -> java.util.Optional<T> [JavaParserClassDeclaration.java <348:12 348:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserClassDeclaration.java <348:21 348:44>]
 LOCAL_SYMBOL: JavaParserClassDeclaration.java<348:63> [JavaParserClassDeclaration.java <348:63 348:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserConstructorDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserConstructorDeclaration.txt
index e241d73c..5467c7bf 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserConstructorDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserConstructorDeclaration.txt
@@ -79,6 +79,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.declaringType() [JavaParserConstructorDeclaration.java <41:5 <41:5  <42:29 42:41> 42:43> 44:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() [JavaParserConstructorDeclaration.java <42:29 42:41>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.declaringType() -> java.lang.Override [JavaParserConstructorDeclaration.java <41:6 41:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration [JavaParserConstructorDeclaration.java <42:12 42:27>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<42:45> [JavaParserConstructorDeclaration.java <42:45 42:45>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<42:45> [JavaParserConstructorDeclaration.java <44:5 44:5>]
@@ -86,6 +87,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDecla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getNumberOfParams() [JavaParserConstructorDeclaration.java <46:5 <46:5  <47:16 47:32> 47:34> 49:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [JavaParserConstructorDeclaration.java <47:16 47:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getNumberOfParams() -> java.lang.Override [JavaParserConstructorDeclaration.java <46:6 46:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getNumberOfParams() -> int [JavaParserConstructorDeclaration.java <47:12 47:14>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<47:36> [JavaParserConstructorDeclaration.java <47:36 47:36>]
@@ -99,6 +101,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarati
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getParam(int) [JavaParserConstructorDeclaration.java <51:5 <51:5  <52:33 52:40> 52:47> 57:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [JavaParserConstructorDeclaration.java <52:33 52:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getParam(int) -> java.lang.Override [JavaParserConstructorDeclaration.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [JavaParserConstructorDeclaration.java <52:12 52:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getParam(int) -> int [JavaParserConstructorDeclaration.java <52:42 52:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getParam<0> [JavaParserConstructorDeclaration.java <52:46 52:46>]
@@ -130,6 +133,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterD
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getName() [JavaParserConstructorDeclaration.java <59:5 <59:5  <60:19 60:25> 60:27> 62:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserConstructorDeclaration.java <60:19 60:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getName() -> java.lang.Override [JavaParserConstructorDeclaration.java <59:6 59:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getName() -> java.lang.String [JavaParserConstructorDeclaration.java <60:12 60:17>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<60:29> [JavaParserConstructorDeclaration.java <60:29 60:29>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<60:29> [JavaParserConstructorDeclaration.java <62:5 62:5>]
@@ -150,6 +154,7 @@ REFERENCE_USAGE com.github.javaparser.ast.body.ConstructorDeclaration com.github
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.accessLevel() [JavaParserConstructorDeclaration.java <73:5 <73:5  <74:24 74:34> 74:36> 76:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserConstructorDeclaration.java <74:24 74:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.accessLevel() -> java.lang.Override [JavaParserConstructorDeclaration.java <73:6 73:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserConstructorDeclaration.java <74:12 74:22>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<74:38> [JavaParserConstructorDeclaration.java <74:38 74:38>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<74:38> [JavaParserConstructorDeclaration.java <76:5 76:5>]
@@ -162,6 +167,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getTypeParameters() [JavaParserConstructorDeclaration.java <78:5 <78:5  <79:43 79:59> 79:61> 81:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserConstructorDeclaration.java <79:43 79:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getTypeParameters() -> java.lang.Override [JavaParserConstructorDeclaration.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserConstructorDeclaration.java <79:12 79:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserConstructorDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserConstructorDeclaration.java <79:17 79:40>]
 LOCAL_SYMBOL: JavaParserConstructorDeclaration.java<79:63> [JavaParserConstructorDeclaration.java <79:63 79:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumConstantDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumConstantDeclaration.txt
index c1febf3b..75601105 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumConstantDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumConstantDeclaration.txt
@@ -93,6 +93,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getType() [JavaParserEnumConstantDeclaration.java <40:5 <40:5  <41:17 41:23> 41:25> 43:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [JavaParserEnumConstantDeclaration.java <41:17 41:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getType() -> java.lang.Override [JavaParserEnumConstantDeclaration.java <40:6 40:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserEnumConstantDeclaration.java <41:12 41:15>]
 LOCAL_SYMBOL: JavaParserEnumConstantDeclaration.java<41:27> [JavaParserEnumConstantDeclaration.java <41:27 41:27>]
 LOCAL_SYMBOL: JavaParserEnumConstantDeclaration.java<41:27> [JavaParserEnumConstantDeclaration.java <43:5 43:5>]
@@ -111,6 +112,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getName() [JavaParserEnumConstantDeclaration.java <45:5 <45:5  <46:19 46:25> 46:27> 48:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserEnumConstantDeclaration.java <46:19 46:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getName() -> java.lang.Override [JavaParserEnumConstantDeclaration.java <45:6 45:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration.getName() -> java.lang.String [JavaParserEnumConstantDeclaration.java <46:12 46:17>]
 LOCAL_SYMBOL: JavaParserEnumConstantDeclaration.java<46:29> [JavaParserEnumConstantDeclaration.java <46:29 46:29>]
 LOCAL_SYMBOL: JavaParserEnumConstantDeclaration.java<46:29> [JavaParserEnumConstantDeclaration.java <48:5 48:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumDeclaration.txt
index a6e051af..6039928a 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserEnumDeclaration.txt
@@ -212,6 +212,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.toString() [JavaParserEnumDeclaration.java <59:5 <59:5  <60:19 60:26> 60:28> 64:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserEnumDeclaration.java <60:19 60:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.toString() -> java.lang.Override [JavaParserEnumDeclaration.java <59:6 59:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.toString() -> java.lang.String [JavaParserEnumDeclaration.java <60:12 60:17>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<60:30> [JavaParserEnumDeclaration.java <60:30 60:30>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<60:30> [JavaParserEnumDeclaration.java <64:5 64:5>]
@@ -219,6 +220,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getDeclaredMethods() [JavaParserEnumDeclaration.java <66:5 <66:5  <67:35 67:52> 67:54> 75:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserEnumDeclaration.java <67:35 67:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getDeclaredMethods() -> java.lang.Override [JavaParserEnumDeclaration.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavaParserEnumDeclaration.java <67:12 67:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserEnumDeclaration.java <67:16 67:32>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<67:56> [JavaParserEnumDeclaration.java <67:56 67:56>]
@@ -272,6 +274,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.core.resolution.Context com.g
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getName() [JavaParserEnumDeclaration.java <81:5 <81:5  <82:19 82:25> 82:27> 84:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserEnumDeclaration.java <82:19 82:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getName() -> java.lang.Override [JavaParserEnumDeclaration.java <81:6 81:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getName() -> java.lang.String [JavaParserEnumDeclaration.java <82:12 82:17>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<82:29> [JavaParserEnumDeclaration.java <82:29 82:29>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<82:29> [JavaParserEnumDeclaration.java <84:5 84:5>]
@@ -283,6 +286,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isField() [JavaParserEnumDeclaration.java <86:5 <86:5  <87:20 87:26> 87:28> 89:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavaParserEnumDeclaration.java <87:20 87:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isField() -> java.lang.Override [JavaParserEnumDeclaration.java <86:6 86:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isField() -> boolean [JavaParserEnumDeclaration.java <87:12 87:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<87:30> [JavaParserEnumDeclaration.java <87:30 87:30>]
@@ -290,18 +294,21 @@ LOCAL_SYMBOL: JavaParserEnumDeclaration.java<87:30> [JavaParserEnumDeclaration.j
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isParameter() [JavaParserEnumDeclaration.java <91:5 <91:5  <92:20 92:30> 92:32> 94:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavaParserEnumDeclaration.java <92:20 92:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isParameter() -> java.lang.Override [JavaParserEnumDeclaration.java <91:6 91:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isParameter() -> boolean [JavaParserEnumDeclaration.java <92:12 92:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<92:34> [JavaParserEnumDeclaration.java <92:34 92:34>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<92:34> [JavaParserEnumDeclaration.java <94:5 94:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isType() [JavaParserEnumDeclaration.java <96:5 <96:5  <97:20 97:25> 97:27> 99:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() [JavaParserEnumDeclaration.java <97:20 97:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isType() -> java.lang.Override [JavaParserEnumDeclaration.java <96:6 96:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isType() -> boolean [JavaParserEnumDeclaration.java <97:12 97:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<97:29> [JavaParserEnumDeclaration.java <97:29 97:29>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<97:29> [JavaParserEnumDeclaration.java <99:5 99:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserEnumDeclaration.java <101:5 <101:5  <102:20 102:40> 102:62> 104:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserEnumDeclaration.java <102:20 102:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserEnumDeclaration.java <101:6 101:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserEnumDeclaration.java <102:12 102:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserEnumDeclaration.java <102:42 102:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hasDirectlyAnnotation<0> [JavaParserEnumDeclaration.java <102:49 102:61>]
@@ -313,6 +320,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserEnumDeclaration.java <106:5 <106:5  <107:20 107:34> 107:66> 126:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserEnumDeclaration.java <107:20 107:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserEnumDeclaration.java <106:6 106:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserEnumDeclaration.java <107:12 107:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserEnumDeclaration.java <107:36 107:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.canBeAssignedTo<0> [JavaParserEnumDeclaration.java <107:61 107:65>]
@@ -360,18 +368,21 @@ LOCAL_SYMBOL: JavaParserEnumDeclaration.java<122:79> [JavaParserEnumDeclaration.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isClass() [JavaParserEnumDeclaration.java <128:5 <128:5  <129:20 129:26> 129:28> 131:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isClass()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isClass() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isClass() [JavaParserEnumDeclaration.java <129:20 129:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isClass() -> java.lang.Override [JavaParserEnumDeclaration.java <128:6 128:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isClass() -> boolean [JavaParserEnumDeclaration.java <129:12 129:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<129:30> [JavaParserEnumDeclaration.java <129:30 129:30>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<129:30> [JavaParserEnumDeclaration.java <131:5 131:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isInterface() [JavaParserEnumDeclaration.java <133:5 <133:5  <134:20 134:30> 134:32> 136:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface() [JavaParserEnumDeclaration.java <134:20 134:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isInterface() -> java.lang.Override [JavaParserEnumDeclaration.java <133:6 133:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isInterface() -> boolean [JavaParserEnumDeclaration.java <134:12 134:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<134:34> [JavaParserEnumDeclaration.java <134:34 134:34>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<134:34> [JavaParserEnumDeclaration.java <136:5 136:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getPackageName() [JavaParserEnumDeclaration.java <138:5 <138:5  <139:19 139:32> 139:34> 141:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavaParserEnumDeclaration.java <139:19 139:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getPackageName() -> java.lang.Override [JavaParserEnumDeclaration.java <138:6 138:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getPackageName() -> java.lang.String [JavaParserEnumDeclaration.java <139:12 139:17>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<139:36> [JavaParserEnumDeclaration.java <139:36 139:36>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<139:36> [JavaParserEnumDeclaration.java <141:5 141:5>]
@@ -381,6 +392,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getClassName() [JavaParserEnumDeclaration.java <143:5 <143:5  <144:19 144:30> 144:32> 146:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavaParserEnumDeclaration.java <144:19 144:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getClassName() -> java.lang.Override [JavaParserEnumDeclaration.java <143:6 143:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getClassName() -> java.lang.String [JavaParserEnumDeclaration.java <144:12 144:17>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<144:34> [JavaParserEnumDeclaration.java <144:34 144:34>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<144:34> [JavaParserEnumDeclaration.java <146:5 146:5>]
@@ -389,6 +401,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javaparsermod
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getClassName() -> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeAdapter com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.javaParserTypeAdapter [JavaParserEnumDeclaration.java <145:16 145:36>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getQualifiedName() [JavaParserEnumDeclaration.java <148:5 <148:5  <149:19 149:34> 149:36> 151:5>]
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavaParserEnumDeclaration.java <149:19 149:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getQualifiedName() -> java.lang.Override [JavaParserEnumDeclaration.java <148:6 148:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getQualifiedName() -> java.lang.String [JavaParserEnumDeclaration.java <149:12 149:17>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<149:38> [JavaParserEnumDeclaration.java <149:38 149:38>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<149:38> [JavaParserEnumDeclaration.java <151:5 151:5>]
@@ -398,6 +411,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserEnumDeclaration.java <153:5 <153:5  <154:20 154:33> 154:65> 156:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserEnumDeclaration.java <154:20 154:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserEnumDeclaration.java <153:6 153:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserEnumDeclaration.java <154:12 154:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserEnumDeclaration.java <154:35 154:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy<0> [JavaParserEnumDeclaration.java <154:60 154:64>]
@@ -410,6 +424,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserEnumDeclaration.java <158:5 <158:5  <159:20 159:33> 159:44> 161:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserEnumDeclaration.java <159:20 159:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserEnumDeclaration.java <158:6 158:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserEnumDeclaration.java <159:12 159:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserEnumDeclaration.java <159:35 159:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isAssignableBy<0> [JavaParserEnumDeclaration.java <159:40 159:43>]
@@ -422,12 +437,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isTypeParameter() [JavaParserEnumDeclaration.java <163:5 <163:5  <164:20 164:34> 164:36> 166:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [JavaParserEnumDeclaration.java <164:20 164:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isTypeParameter() -> java.lang.Override [JavaParserEnumDeclaration.java <163:6 163:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.isTypeParameter() -> boolean [JavaParserEnumDeclaration.java <164:12 164:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<164:38> [JavaParserEnumDeclaration.java <164:38 164:38>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<164:38> [JavaParserEnumDeclaration.java <166:5 166:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.equals(java.lang.Object) [JavaParserEnumDeclaration.java <168:5 <168:5  <169:20 169:25> 169:35> 178:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [JavaParserEnumDeclaration.java <169:20 169:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.equals(java.lang.Object) -> java.lang.Override [JavaParserEnumDeclaration.java <168:6 168:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.equals(java.lang.Object) -> boolean [JavaParserEnumDeclaration.java <169:12 169:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.equals(java.lang.Object) -> java.lang.Object [JavaParserEnumDeclaration.java <169:27 169:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.equals<0> [JavaParserEnumDeclaration.java <169:34 169:34>]
@@ -451,6 +468,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hashCode() [JavaParserEnumDeclaration.java <180:5 <180:5  <181:16 181:23> 181:25> 183:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hashCode() -> int java.lang.Object.hashCode() [JavaParserEnumDeclaration.java <181:16 181:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hashCode() -> java.lang.Override [JavaParserEnumDeclaration.java <180:6 180:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hashCode() -> int [JavaParserEnumDeclaration.java <181:12 181:14>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<181:27> [JavaParserEnumDeclaration.java <181:27 181:27>]
@@ -459,6 +477,7 @@ SYMBOL_METHOD int com.github.javaparser.ast.Node.hashCode()
 REFERENCE_CALL int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hashCode() -> int com.github.javaparser.ast.Node.hashCode() [JavaParserEnumDeclaration.java <182:28 182:35>]
 REFERENCE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.hashCode() -> com.github.javaparser.ast.body.EnumDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.wrappedNode [JavaParserEnumDeclaration.java <182:16 182:26>]
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) [JavaParserEnumDeclaration.java <185:5 <185:5  <186:34 186:51> 186:173> 192:5>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Deprecated [JavaParserEnumDeclaration.java <185:6 185:15>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.util.Optional<T> [JavaParserEnumDeclaration.java <186:12 186:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.methods.MethodUsage [JavaParserEnumDeclaration.java <186:21 186:31>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.String [JavaParserEnumDeclaration.java <186:53 186:58>]
@@ -501,6 +520,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAllFields() [JavaParserEnumDeclaration.java <194:5 <194:5  <195:35 195:46> 195:48> 215:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserEnumDeclaration.java <195:35 195:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAllFields() -> java.lang.Override [JavaParserEnumDeclaration.java <194:6 194:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAllFields() -> java.util.List<E> [JavaParserEnumDeclaration.java <195:12 195:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserEnumDeclaration.java <195:17 195:32>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<195:50> [JavaParserEnumDeclaration.java <195:50 195:50>]
@@ -585,6 +605,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAncestors() [JavaParserEnumDeclaration.java <217:5 <217:5  <218:32 218:43> 218:45> 234:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserEnumDeclaration.java <218:32 218:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAncestors() -> java.lang.Override [JavaParserEnumDeclaration.java <217:6 217:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAncestors() -> java.util.List<E> [JavaParserEnumDeclaration.java <218:12 218:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserEnumDeclaration.java <218:17 218:29>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<218:47> [JavaParserEnumDeclaration.java <218:47 218:47>]
@@ -680,6 +701,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesyst
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getAncestors<0> [JavaParserEnumDeclaration.java <233:16 233:24>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getTypeParameters() [JavaParserEnumDeclaration.java <236:5 <236:5  <237:43 237:59> 237:61> 239:5>]
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserEnumDeclaration.java <237:43 237:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getTypeParameters() -> java.lang.Override [JavaParserEnumDeclaration.java <236:6 236:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserEnumDeclaration.java <237:12 237:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserEnumDeclaration.java <237:17 237:40>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<237:63> [JavaParserEnumDeclaration.java <237:63 237:63>]
@@ -724,6 +746,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.declaringType() [JavaParserEnumDeclaration.java <261:9 <261:9  <262:41 262:53> 262:55> 264:9>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType() [JavaParserEnumDeclaration.java <262:41 262:53>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.declaringType() -> java.lang.Override [JavaParserEnumDeclaration.java <261:10 261:17>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserEnumDeclaration.java <262:16 262:39>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<262:57> [JavaParserEnumDeclaration.java <262:57 262:57>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<262:57> [JavaParserEnumDeclaration.java <264:9 264:9>]
@@ -731,6 +754,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceT
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getReturnType() [JavaParserEnumDeclaration.java <266:9 <266:9  <267:21 267:33> 267:35> 269:9>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType() [JavaParserEnumDeclaration.java <267:21 267:33>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getReturnType() -> java.lang.Override [JavaParserEnumDeclaration.java <266:10 266:17>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserEnumDeclaration.java <267:16 267:19>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<267:37> [JavaParserEnumDeclaration.java <267:37 267:37>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<267:37> [JavaParserEnumDeclaration.java <269:9 269:9>]
@@ -744,12 +768,14 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getNumberOfParams() [JavaParserEnumDeclaration.java <271:9 <271:9  <272:20 272:36> 272:38> 274:9>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [JavaParserEnumDeclaration.java <272:20 272:36>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getNumberOfParams() -> java.lang.Override [JavaParserEnumDeclaration.java <271:10 271:17>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getNumberOfParams() -> int [JavaParserEnumDeclaration.java <272:16 272:18>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<272:40> [JavaParserEnumDeclaration.java <272:40 272:40>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<272:40> [JavaParserEnumDeclaration.java <274:9 274:9>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getParam(int) [JavaParserEnumDeclaration.java <276:9 <276:9  <277:37 277:44> 277:51> 279:9>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [JavaParserEnumDeclaration.java <277:37 277:44>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getParam(int) -> java.lang.Override [JavaParserEnumDeclaration.java <276:10 276:17>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [JavaParserEnumDeclaration.java <277:16 277:35>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getParam(int) -> int [JavaParserEnumDeclaration.java <277:46 277:48>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getParam<0> [JavaParserEnumDeclaration.java <277:50 277:50>]
@@ -780,6 +806,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.methods.MethodUsag
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isAbstract() [JavaParserEnumDeclaration.java <289:9 <289:9  <290:24 290:33> 290:35> 292:9>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isAbstract() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract() [JavaParserEnumDeclaration.java <290:24 290:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isAbstract() -> java.lang.Override [JavaParserEnumDeclaration.java <289:10 289:17>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isAbstract() -> boolean [JavaParserEnumDeclaration.java <290:16 290:22>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<290:37> [JavaParserEnumDeclaration.java <290:37 290:37>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<290:37> [JavaParserEnumDeclaration.java <292:9 292:9>]
@@ -788,22 +815,26 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isDefaultMethod() [JavaParserEnumDeclaration.java <294:9 <294:9  <295:24 295:38> 295:40> 297:9>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isDefaultMethod() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod() [JavaParserEnumDeclaration.java <295:24 295:38>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isDefaultMethod() -> java.lang.Override [JavaParserEnumDeclaration.java <294:10 294:17>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isDefaultMethod() -> boolean [JavaParserEnumDeclaration.java <295:16 295:22>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<295:42> [JavaParserEnumDeclaration.java <295:42 295:42>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<295:42> [JavaParserEnumDeclaration.java <297:9 297:9>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isStatic() [JavaParserEnumDeclaration.java <299:9 <299:9  <300:24 300:31> 300:33> 302:9>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic() [JavaParserEnumDeclaration.java <300:24 300:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isStatic() -> java.lang.Override [JavaParserEnumDeclaration.java <299:10 299:17>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.isStatic() -> boolean [JavaParserEnumDeclaration.java <300:16 300:22>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<300:35> [JavaParserEnumDeclaration.java <300:35 300:35>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<300:35> [JavaParserEnumDeclaration.java <302:9 302:9>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getName() [JavaParserEnumDeclaration.java <304:9 <304:9  <305:23 305:29> 305:31> 307:9>]
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserEnumDeclaration.java <305:23 305:29>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getName() -> java.lang.Override [JavaParserEnumDeclaration.java <304:10 304:17>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getName() -> java.lang.String [JavaParserEnumDeclaration.java <305:16 305:21>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<305:33> [JavaParserEnumDeclaration.java <305:33 305:33>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<305:33> [JavaParserEnumDeclaration.java <307:9 307:9>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getTypeParameters() [JavaParserEnumDeclaration.java <309:9 <309:9  <310:47 310:63> 310:65> 312:9>]
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserEnumDeclaration.java <310:47 310:63>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getTypeParameters() -> java.lang.Override [JavaParserEnumDeclaration.java <309:10 309:17>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getTypeParameters() -> java.util.List<E> [JavaParserEnumDeclaration.java <310:16 310:19>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserEnumDeclaration.java <310:21 310:44>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<310:67> [JavaParserEnumDeclaration.java <310:67 310:67>]
@@ -813,6 +844,7 @@ QUALIFIER: java.util.Collections [JavaParserEnumDeclaration.java <311:20 311:30>
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.accessLevel() [JavaParserEnumDeclaration.java <314:9 <314:9  <315:28 315:38> 315:40> 317:9>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserEnumDeclaration.java <315:28 315:38>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.accessLevel() -> java.lang.Override [JavaParserEnumDeclaration.java <314:10 314:17>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserEnumDeclaration.java <315:16 315:26>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<315:42> [JavaParserEnumDeclaration.java <315:42 315:42>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<315:42> [JavaParserEnumDeclaration.java <317:9 317:9>]
@@ -826,6 +858,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.declarations.AccessLevel
 REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.accessLevel() -> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.ValuesMethod.enumDeclaration [JavaParserEnumDeclaration.java <316:41 316:55>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.accessLevel() [JavaParserEnumDeclaration.java <320:5 <320:5  <321:24 321:34> 321:36> 323:5>]
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserEnumDeclaration.java <321:24 321:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.accessLevel() -> java.lang.Override [JavaParserEnumDeclaration.java <320:6 320:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserEnumDeclaration.java <321:12 321:22>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<321:38> [JavaParserEnumDeclaration.java <321:38 321:38>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<321:38> [JavaParserEnumDeclaration.java <323:5 323:5>]
@@ -834,6 +867,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.Acces
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.internalTypes() [JavaParserEnumDeclaration.java <325:5 <325:5  <326:42 326:54> 326:56> 334:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavaParserEnumDeclaration.java <326:42 326:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.internalTypes() -> java.lang.Override [JavaParserEnumDeclaration.java <325:6 325:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.internalTypes() -> java.util.Set<E> [JavaParserEnumDeclaration.java <326:12 326:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserEnumDeclaration.java <326:16 326:39>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<326:58> [JavaParserEnumDeclaration.java <326:58 326:58>]
@@ -878,6 +912,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.containerType() [JavaParserEnumDeclaration.java <336:5 <336:5  <337:47 337:59> 337:61> 339:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserEnumDeclaration.java <337:47 337:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.containerType() -> java.lang.Override [JavaParserEnumDeclaration.java <336:6 336:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.containerType() -> java.util.Optional<T> [JavaParserEnumDeclaration.java <337:12 337:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserEnumDeclaration.java <337:21 337:44>]
 LOCAL_SYMBOL: JavaParserEnumDeclaration.java<337:63> [JavaParserEnumDeclaration.java <337:63 337:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserFieldDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserFieldDeclaration.txt
index 086b88fa..8593f88a 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserFieldDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserFieldDeclaration.txt
@@ -190,6 +190,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getType() [JavaParserFieldDeclaration.java <65:5 <65:5  <66:17 66:23> 66:25> 74:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [JavaParserFieldDeclaration.java <66:17 66:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getType() -> java.lang.Override [JavaParserFieldDeclaration.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserFieldDeclaration.java <66:12 66:15>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<66:27> [JavaParserFieldDeclaration.java <66:27 66:27>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<66:27> [JavaParserFieldDeclaration.java <74:5 74:5>]
@@ -238,6 +239,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getName() [JavaParserFieldDeclaration.java <76:5 <76:5  <77:19 77:25> 77:27> 83:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserFieldDeclaration.java <77:19 77:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getName() -> java.lang.Override [JavaParserFieldDeclaration.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.getName() -> java.lang.String [JavaParserFieldDeclaration.java <77:12 77:17>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<77:29> [JavaParserFieldDeclaration.java <77:29 77:29>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<77:29> [JavaParserFieldDeclaration.java <83:5 83:5>]
@@ -258,6 +260,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isStatic() [JavaParserFieldDeclaration.java <85:5 <85:5  <86:20 86:27> 86:29> 88:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isStatic() [JavaParserFieldDeclaration.java <86:20 86:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isStatic() -> java.lang.Override [JavaParserFieldDeclaration.java <85:6 85:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isStatic() -> boolean [JavaParserFieldDeclaration.java <86:12 86:18>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<86:31> [JavaParserFieldDeclaration.java <86:31 86:31>]
@@ -273,6 +276,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isField() [JavaParserFieldDeclaration.java <90:5 <90:5  <91:20 91:26> 91:28> 93:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() [JavaParserFieldDeclaration.java <91:20 91:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isField() -> java.lang.Override [JavaParserFieldDeclaration.java <90:6 90:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.isField() -> boolean [JavaParserFieldDeclaration.java <91:12 91:18>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<91:30> [JavaParserFieldDeclaration.java <91:30 91:30>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<91:30> [JavaParserFieldDeclaration.java <93:5 93:5>]
@@ -290,6 +294,7 @@ REFERENCE_USAGE com.github.javaparser.ast.body.FieldDeclaration com.github.javap
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.toString() [JavaParserFieldDeclaration.java <104:5 <104:5  <105:19 105:26> 105:28> 107:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserFieldDeclaration.java <105:19 105:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.toString() -> java.lang.Override [JavaParserFieldDeclaration.java <104:6 104:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.toString() -> java.lang.String [JavaParserFieldDeclaration.java <105:12 105:17>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<105:30> [JavaParserFieldDeclaration.java <105:30 105:30>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<105:30> [JavaParserFieldDeclaration.java <107:5 107:5>]
@@ -298,6 +303,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javaparsermod
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.accessLevel() [JavaParserFieldDeclaration.java <109:5 <109:5  <110:24 110:34> 110:36> 112:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserFieldDeclaration.java <110:24 110:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.accessLevel() -> java.lang.Override [JavaParserFieldDeclaration.java <109:6 109:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserFieldDeclaration.java <110:12 110:22>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<110:38> [JavaParserFieldDeclaration.java <110:38 110:38>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<110:38> [JavaParserFieldDeclaration.java <112:5 112:5>]
@@ -309,6 +315,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.declaringType() [JavaParserFieldDeclaration.java <114:5 <114:5  <115:28 115:40> 115:42> 122:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.declaringType() [JavaParserFieldDeclaration.java <115:28 115:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.declaringType() -> java.lang.Override [JavaParserFieldDeclaration.java <114:6 114:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [JavaParserFieldDeclaration.java <115:12 115:26>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<115:44> [JavaParserFieldDeclaration.java <115:44 115:44>]
 LOCAL_SYMBOL: JavaParserFieldDeclaration.java<115:44> [JavaParserFieldDeclaration.java <122:5 122:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserInterfaceDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserInterfaceDeclaration.txt
index c569500f..51c5f474 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserInterfaceDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserInterfaceDeclaration.txt
@@ -194,6 +194,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getDeclaredMethods() [JavaParserInterfaceDeclaration.java <60:5 <60:5  <61:35 61:52> 61:54> 69:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserInterfaceDeclaration.java <61:35 61:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getDeclaredMethods() -> java.lang.Override [JavaParserInterfaceDeclaration.java <60:6 60:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavaParserInterfaceDeclaration.java <61:12 61:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserInterfaceDeclaration.java <61:16 61:32>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<61:56> [JavaParserInterfaceDeclaration.java <61:56 61:56>]
@@ -256,6 +257,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type co
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.equals(java.lang.Object) [JavaParserInterfaceDeclaration.java <79:5 <79:5  <80:20 80:25> 80:35> 89:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [JavaParserInterfaceDeclaration.java <80:20 80:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.equals(java.lang.Object) -> java.lang.Override [JavaParserInterfaceDeclaration.java <79:6 79:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.equals(java.lang.Object) -> boolean [JavaParserInterfaceDeclaration.java <80:12 80:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.equals(java.lang.Object) -> java.lang.Object [JavaParserInterfaceDeclaration.java <80:27 80:32>]
@@ -280,6 +282,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hashCode() [JavaParserInterfaceDeclaration.java <91:5 <91:5  <92:16 92:23> 92:25> 94:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hashCode() -> int java.lang.Object.hashCode() [JavaParserInterfaceDeclaration.java <92:16 92:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hashCode() -> java.lang.Override [JavaParserInterfaceDeclaration.java <91:6 91:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hashCode() -> int [JavaParserInterfaceDeclaration.java <92:12 92:14>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<92:27> [JavaParserInterfaceDeclaration.java <92:27 92:27>]
@@ -290,6 +293,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarati
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getName() [JavaParserInterfaceDeclaration.java <96:5 <96:5  <97:19 97:25> 97:27> 99:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserInterfaceDeclaration.java <97:19 97:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getName() -> java.lang.Override [JavaParserInterfaceDeclaration.java <96:6 96:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getName() -> java.lang.String [JavaParserInterfaceDeclaration.java <97:12 97:17>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<97:29> [JavaParserInterfaceDeclaration.java <97:29 97:29>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<97:29> [JavaParserInterfaceDeclaration.java <99:5 99:5>]
@@ -301,12 +305,14 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.asInterface() [JavaParserInterfaceDeclaration.java <101:5 <101:5  <102:33 102:43> 102:45> 104:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asInterface()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.asInterface() -> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asInterface() [JavaParserInterfaceDeclaration.java <102:33 102:43>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.asInterface() -> java.lang.Override [JavaParserInterfaceDeclaration.java <101:6 101:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.asInterface() -> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration [JavaParserInterfaceDeclaration.java <102:12 102:31>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<102:47> [JavaParserInterfaceDeclaration.java <102:47 102:47>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<102:47> [JavaParserInterfaceDeclaration.java <104:5 104:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserInterfaceDeclaration.java <106:5 <106:5  <107:20 107:40> 107:62> 114:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserInterfaceDeclaration.java <107:20 107:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserInterfaceDeclaration.java <106:6 106:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserInterfaceDeclaration.java <107:12 107:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserInterfaceDeclaration.java <107:42 107:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.hasDirectlyAnnotation<0> [JavaParserInterfaceDeclaration.java <107:49 107:61>]
@@ -338,12 +344,14 @@ LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<109:145> [JavaParserInterfaceD
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isInterface() [JavaParserInterfaceDeclaration.java <116:5 <116:5  <117:20 117:30> 117:32> 119:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface() [JavaParserInterfaceDeclaration.java <117:20 117:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isInterface() -> java.lang.Override [JavaParserInterfaceDeclaration.java <116:6 116:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isInterface() -> boolean [JavaParserInterfaceDeclaration.java <117:12 117:18>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<117:34> [JavaParserInterfaceDeclaration.java <117:34 117:34>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<117:34> [JavaParserInterfaceDeclaration.java <119:5 119:5>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getInterfacesExtended() [JavaParserInterfaceDeclaration.java <121:5 <121:5  <122:32 122:52> 122:54> 130:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.getInterfacesExtended()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getInterfacesExtended() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.getInterfacesExtended() [JavaParserInterfaceDeclaration.java <122:32 122:52>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getInterfacesExtended() -> java.lang.Override [JavaParserInterfaceDeclaration.java <121:6 121:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getInterfacesExtended() -> java.util.List<E> [JavaParserInterfaceDeclaration.java <122:12 122:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getInterfacesExtended() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserInterfaceDeclaration.java <122:17 122:29>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<122:56> [JavaParserInterfaceDeclaration.java <122:56 122:56>]
@@ -384,6 +392,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getPackageName() [JavaParserInterfaceDeclaration.java <132:5 <132:5  <133:19 133:32> 133:34> 135:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavaParserInterfaceDeclaration.java <133:19 133:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getPackageName() -> java.lang.Override [JavaParserInterfaceDeclaration.java <132:6 132:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getPackageName() -> java.lang.String [JavaParserInterfaceDeclaration.java <133:12 133:17>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<133:36> [JavaParserInterfaceDeclaration.java <133:36 133:36>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<133:36> [JavaParserInterfaceDeclaration.java <135:5 135:5>]
@@ -393,6 +402,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getClassName() [JavaParserInterfaceDeclaration.java <137:5 <137:5  <138:19 138:30> 138:32> 140:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavaParserInterfaceDeclaration.java <138:19 138:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getClassName() -> java.lang.Override [JavaParserInterfaceDeclaration.java <137:6 137:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getClassName() -> java.lang.String [JavaParserInterfaceDeclaration.java <138:12 138:17>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<138:34> [JavaParserInterfaceDeclaration.java <138:34 138:34>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<138:34> [JavaParserInterfaceDeclaration.java <140:5 140:5>]
@@ -401,6 +411,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javaparsermod
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getClassName() -> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeAdapter com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.javaParserTypeAdapter [JavaParserInterfaceDeclaration.java <139:16 139:36>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getQualifiedName() [JavaParserInterfaceDeclaration.java <142:5 <142:5  <143:19 143:34> 143:36> 145:5>]
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavaParserInterfaceDeclaration.java <143:19 143:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getQualifiedName() -> java.lang.Override [JavaParserInterfaceDeclaration.java <142:6 142:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getQualifiedName() -> java.lang.String [JavaParserInterfaceDeclaration.java <143:12 143:17>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<143:38> [JavaParserInterfaceDeclaration.java <143:38 143:38>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<143:38> [JavaParserInterfaceDeclaration.java <145:5 145:5>]
@@ -410,6 +421,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserInterfaceDeclaration.java <147:5 <147:5  <148:20 148:33> 148:65> 150:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserInterfaceDeclaration.java <148:20 148:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserInterfaceDeclaration.java <147:6 147:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserInterfaceDeclaration.java <148:12 148:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserInterfaceDeclaration.java <148:35 148:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy<0> [JavaParserInterfaceDeclaration.java <148:60 148:64>]
@@ -422,6 +434,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserInterfaceDeclaration.java <152:5 <152:5  <153:20 153:33> 153:44> 155:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserInterfaceDeclaration.java <153:20 153:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserInterfaceDeclaration.java <152:6 152:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserInterfaceDeclaration.java <153:12 153:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserInterfaceDeclaration.java <153:35 153:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isAssignableBy<0> [JavaParserInterfaceDeclaration.java <153:40 153:43>]
@@ -434,6 +447,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserInterfaceDeclaration.java <157:5 <157:5  <158:20 158:34> 158:66> 182:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserInterfaceDeclaration.java <158:20 158:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserInterfaceDeclaration.java <157:6 157:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserInterfaceDeclaration.java <158:12 158:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserInterfaceDeclaration.java <158:36 158:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.canBeAssignedTo<0> [JavaParserInterfaceDeclaration.java <158:61 158:65>]
@@ -501,12 +515,14 @@ LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<175:54> [JavaParserInterfaceDe
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isTypeParameter() [JavaParserInterfaceDeclaration.java <184:5 <184:5  <185:20 185:34> 185:36> 187:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [JavaParserInterfaceDeclaration.java <185:20 185:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isTypeParameter() -> java.lang.Override [JavaParserInterfaceDeclaration.java <184:6 184:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.isTypeParameter() -> boolean [JavaParserInterfaceDeclaration.java <185:12 185:18>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<185:38> [JavaParserInterfaceDeclaration.java <185:38 185:38>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<185:38> [JavaParserInterfaceDeclaration.java <187:5 187:5>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAllFields() [JavaParserInterfaceDeclaration.java <189:5 <189:5  <190:35 190:46> 190:48> 208:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserInterfaceDeclaration.java <190:35 190:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAllFields() -> java.lang.Override [JavaParserInterfaceDeclaration.java <189:6 189:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAllFields() -> java.util.List<E> [JavaParserInterfaceDeclaration.java <190:12 190:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserInterfaceDeclaration.java <190:17 190:32>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<190:50> [JavaParserInterfaceDeclaration.java <190:50 190:50>]
@@ -582,11 +598,13 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toString() [JavaParserInterfaceDeclaration.java <211:5 <211:5  <212:19 212:26> 212:28> 216:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserInterfaceDeclaration.java <212:19 212:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toString() -> java.lang.Override [JavaParserInterfaceDeclaration.java <211:6 211:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toString() -> java.lang.String [JavaParserInterfaceDeclaration.java <212:12 212:17>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<212:30> [JavaParserInterfaceDeclaration.java <212:30 212:30>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<212:30> [JavaParserInterfaceDeclaration.java <216:5 216:5>]
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toString() -> com.github.javaparser.ast.body.ClassOrInterfaceDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.wrappedNode [JavaParserInterfaceDeclaration.java <214:34 214:44>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserInterfaceDeclaration.java <218:5 <218:5  <219:45 219:53> 219:89> 234:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Deprecated [JavaParserInterfaceDeclaration.java <218:6 218:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavaParserInterfaceDeclaration.java <219:12 219:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [JavaParserInterfaceDeclaration.java <219:28 219:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.solveType(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [JavaParserInterfaceDeclaration.java <219:55 219:60>]
@@ -659,6 +677,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAncestors() [JavaParserInterfaceDeclaration.java <236:5 <236:5  <237:32 237:43> 237:45> 250:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserInterfaceDeclaration.java <237:32 237:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAncestors() -> java.lang.Override [JavaParserInterfaceDeclaration.java <236:6 236:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAncestors() -> java.util.List<E> [JavaParserInterfaceDeclaration.java <237:12 237:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserInterfaceDeclaration.java <237:17 237:29>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<237:47> [JavaParserInterfaceDeclaration.java <237:47 237:47>]
@@ -701,6 +720,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getTypeParameters() [JavaParserInterfaceDeclaration.java <252:5 <252:5  <253:43 253:59> 253:61> 261:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserInterfaceDeclaration.java <253:43 253:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getTypeParameters() -> java.lang.Override [JavaParserInterfaceDeclaration.java <252:6 252:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserInterfaceDeclaration.java <253:12 253:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserInterfaceDeclaration.java <253:17 253:40>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<253:63> [JavaParserInterfaceDeclaration.java <253:63 253:63>]
@@ -743,6 +763,7 @@ REFERENCE_USAGE com.github.javaparser.ast.body.ClassOrInterfaceDeclaration com.g
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.accessLevel() [JavaParserInterfaceDeclaration.java <272:5 <272:5  <273:24 273:34> 273:36> 275:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserInterfaceDeclaration.java <273:24 273:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.accessLevel() -> java.lang.Override [JavaParserInterfaceDeclaration.java <272:6 272:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserInterfaceDeclaration.java <273:12 273:22>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<273:38> [JavaParserInterfaceDeclaration.java <273:38 273:38>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<273:38> [JavaParserInterfaceDeclaration.java <275:5 275:5>]
@@ -755,6 +776,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.internalTypes() [JavaParserInterfaceDeclaration.java <277:5 <277:5  <278:42 278:54> 278:56> 286:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavaParserInterfaceDeclaration.java <278:42 278:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.internalTypes() -> java.lang.Override [JavaParserInterfaceDeclaration.java <277:6 277:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.internalTypes() -> java.util.Set<E> [JavaParserInterfaceDeclaration.java <278:12 278:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserInterfaceDeclaration.java <278:16 278:39>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<278:58> [JavaParserInterfaceDeclaration.java <278:58 278:58>]
@@ -799,6 +821,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.containerType() [JavaParserInterfaceDeclaration.java <288:5 <288:5  <289:47 289:59> 289:61> 291:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserInterfaceDeclaration.java <289:47 289:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.containerType() -> java.lang.Override [JavaParserInterfaceDeclaration.java <288:6 288:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.containerType() -> java.util.Optional<T> [JavaParserInterfaceDeclaration.java <289:12 289:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserInterfaceDeclaration.java <289:21 289:44>]
 LOCAL_SYMBOL: JavaParserInterfaceDeclaration.java<289:63> [JavaParserInterfaceDeclaration.java <289:63 289:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserMethodDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserMethodDeclaration.txt
index 83ba5603..38b45b69 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserMethodDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserMethodDeclaration.txt
@@ -136,6 +136,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.toString() [JavaParserMethodDeclaration.java <48:5 <48:5  <49:19 49:26> 49:28> 54:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserMethodDeclaration.java <49:19 49:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.toString() -> java.lang.Override [JavaParserMethodDeclaration.java <48:6 48:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.toString() -> java.lang.String [JavaParserMethodDeclaration.java <49:12 49:17>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<49:30> [JavaParserMethodDeclaration.java <49:30 49:30>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<49:30> [JavaParserMethodDeclaration.java <54:5 54:5>]
@@ -144,6 +145,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.declaringType() [JavaParserMethodDeclaration.java <56:5 <56:5  <57:37 57:49> 57:51> 64:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType() [JavaParserMethodDeclaration.java <57:37 57:49>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.declaringType() -> java.lang.Override [JavaParserMethodDeclaration.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserMethodDeclaration.java <57:12 57:35>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<57:53> [JavaParserMethodDeclaration.java <57:53 57:53>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<57:53> [JavaParserMethodDeclaration.java <64:5 64:5>]
@@ -174,6 +176,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceT
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getReturnType() [JavaParserMethodDeclaration.java <66:5 <66:5  <67:17 67:29> 67:31> 69:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType() [JavaParserMethodDeclaration.java <67:17 67:29>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getReturnType() -> java.lang.Override [JavaParserMethodDeclaration.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserMethodDeclaration.java <67:12 67:15>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<67:33> [JavaParserMethodDeclaration.java <67:33 67:33>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<67:33> [JavaParserMethodDeclaration.java <69:5 69:5>]
@@ -191,6 +194,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.typesystem.Type com.gith
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getNumberOfParams() [JavaParserMethodDeclaration.java <71:5 <71:5  <72:16 72:32> 72:34> 74:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [JavaParserMethodDeclaration.java <72:16 72:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getNumberOfParams() -> java.lang.Override [JavaParserMethodDeclaration.java <71:6 71:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getNumberOfParams() -> int [JavaParserMethodDeclaration.java <72:12 72:14>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<72:36> [JavaParserMethodDeclaration.java <72:36 72:36>]
@@ -203,6 +207,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarati
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getParam(int) [JavaParserMethodDeclaration.java <76:5 <76:5  <77:33 77:40> 77:47> 82:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [JavaParserMethodDeclaration.java <77:33 77:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getParam(int) -> java.lang.Override [JavaParserMethodDeclaration.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [JavaParserMethodDeclaration.java <77:12 77:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getParam(int) -> int [JavaParserMethodDeclaration.java <77:42 77:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getParam<0> [JavaParserMethodDeclaration.java <77:46 77:46>]
@@ -269,6 +274,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.core.resolution.Context com.g
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isAbstract() [JavaParserMethodDeclaration.java <96:5 <96:5  <97:20 97:29> 97:31> 99:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isAbstract() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract() [JavaParserMethodDeclaration.java <97:20 97:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isAbstract() -> java.lang.Override [JavaParserMethodDeclaration.java <96:6 96:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isAbstract() -> boolean [JavaParserMethodDeclaration.java <97:12 97:18>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<97:33> [JavaParserMethodDeclaration.java <97:33 97:33>]
@@ -281,6 +287,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getName() [JavaParserMethodDeclaration.java <101:5 <101:5  <102:19 102:25> 102:27> 104:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserMethodDeclaration.java <102:19 102:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getName() -> java.lang.Override [JavaParserMethodDeclaration.java <101:6 101:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getName() -> java.lang.String [JavaParserMethodDeclaration.java <102:12 102:17>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<102:29> [JavaParserMethodDeclaration.java <102:29 102:29>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<102:29> [JavaParserMethodDeclaration.java <104:5 104:5>]
@@ -292,6 +299,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isField() [JavaParserMethodDeclaration.java <106:5 <106:5  <107:20 107:26> 107:28> 109:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavaParserMethodDeclaration.java <107:20 107:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isField() -> java.lang.Override [JavaParserMethodDeclaration.java <106:6 106:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isField() -> boolean [JavaParserMethodDeclaration.java <107:12 107:18>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<107:30> [JavaParserMethodDeclaration.java <107:30 107:30>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<107:30> [JavaParserMethodDeclaration.java <109:5 109:5>]
@@ -300,6 +308,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isParameter() [JavaParserMethodDeclaration.java <111:5 <111:5  <112:20 112:30> 112:32> 114:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavaParserMethodDeclaration.java <112:20 112:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isParameter() -> java.lang.Override [JavaParserMethodDeclaration.java <111:6 111:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isParameter() -> boolean [JavaParserMethodDeclaration.java <112:12 112:18>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<112:34> [JavaParserMethodDeclaration.java <112:34 112:34>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<112:34> [JavaParserMethodDeclaration.java <114:5 114:5>]
@@ -308,6 +317,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isType() [JavaParserMethodDeclaration.java <116:5 <116:5  <117:20 117:25> 117:27> 119:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavaParserMethodDeclaration.java <117:20 117:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isType() -> java.lang.Override [JavaParserMethodDeclaration.java <116:6 116:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isType() -> boolean [JavaParserMethodDeclaration.java <117:12 117:18>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<117:29> [JavaParserMethodDeclaration.java <117:29 117:29>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<117:29> [JavaParserMethodDeclaration.java <119:5 119:5>]
@@ -316,6 +326,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getTypeParameters() [JavaParserMethodDeclaration.java <121:5 <121:5  <122:43 122:59> 122:61> 124:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserMethodDeclaration.java <122:43 122:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getTypeParameters() -> java.lang.Override [JavaParserMethodDeclaration.java <121:6 121:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserMethodDeclaration.java <122:12 122:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserMethodDeclaration.java <122:17 122:40>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<122:63> [JavaParserMethodDeclaration.java <122:63 122:63>]
@@ -342,6 +353,7 @@ QUALIFIER: java.util.stream.Collectors [JavaParserMethodDeclaration.java <123:13
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isDefaultMethod() [JavaParserMethodDeclaration.java <126:5 <126:5  <127:20 127:34> 127:36> 129:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isDefaultMethod() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod() [JavaParserMethodDeclaration.java <127:20 127:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isDefaultMethod() -> java.lang.Override [JavaParserMethodDeclaration.java <126:6 126:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isDefaultMethod() -> boolean [JavaParserMethodDeclaration.java <127:12 127:18>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<127:38> [JavaParserMethodDeclaration.java <127:38 127:38>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<127:38> [JavaParserMethodDeclaration.java <129:5 129:5>]
@@ -351,6 +363,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isStatic() [JavaParserMethodDeclaration.java <131:5 <131:5  <132:20 132:27> 132:29> 134:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic() [JavaParserMethodDeclaration.java <132:20 132:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isStatic() -> java.lang.Override [JavaParserMethodDeclaration.java <131:6 131:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.isStatic() -> boolean [JavaParserMethodDeclaration.java <132:12 132:18>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<132:31> [JavaParserMethodDeclaration.java <132:31 132:31>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<132:31> [JavaParserMethodDeclaration.java <134:5 134:5>]
@@ -371,6 +384,7 @@ REFERENCE_USAGE com.github.javaparser.ast.body.MethodDeclaration com.github.java
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.accessLevel() [JavaParserMethodDeclaration.java <145:5 <145:5  <146:24 146:34> 146:36> 148:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavaParserMethodDeclaration.java <146:24 146:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.accessLevel() -> java.lang.Override [JavaParserMethodDeclaration.java <145:6 145:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavaParserMethodDeclaration.java <146:12 146:22>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<146:38> [JavaParserMethodDeclaration.java <146:38 146:38>]
 LOCAL_SYMBOL: JavaParserMethodDeclaration.java<146:38> [JavaParserMethodDeclaration.java <148:5 148:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserParameterDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserParameterDeclaration.txt
index 5396470b..32a34fff 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserParameterDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserParameterDeclaration.txt
@@ -81,6 +81,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getName() [JavaParserParameterDeclaration.java <39:5 <39:5  <40:19 40:25> 40:27> 42:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserParameterDeclaration.java <40:19 40:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getName() -> java.lang.Override [JavaParserParameterDeclaration.java <39:6 39:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getName() -> java.lang.String [JavaParserParameterDeclaration.java <40:12 40:17>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<40:29> [JavaParserParameterDeclaration.java <40:29 40:29>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<40:29> [JavaParserParameterDeclaration.java <42:5 42:5>]
@@ -92,6 +93,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isField() [JavaParserParameterDeclaration.java <44:5 <44:5  <45:20 45:26> 45:28> 47:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavaParserParameterDeclaration.java <45:20 45:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isField() -> java.lang.Override [JavaParserParameterDeclaration.java <44:6 44:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isField() -> boolean [JavaParserParameterDeclaration.java <45:12 45:18>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<45:30> [JavaParserParameterDeclaration.java <45:30 45:30>]
@@ -99,12 +101,14 @@ LOCAL_SYMBOL: JavaParserParameterDeclaration.java<45:30> [JavaParserParameterDec
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isParameter() [JavaParserParameterDeclaration.java <49:5 <49:5  <50:20 50:30> 50:32> 52:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() [JavaParserParameterDeclaration.java <50:20 50:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isParameter() -> java.lang.Override [JavaParserParameterDeclaration.java <49:6 49:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isParameter() -> boolean [JavaParserParameterDeclaration.java <50:12 50:18>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<50:34> [JavaParserParameterDeclaration.java <50:34 50:34>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<50:34> [JavaParserParameterDeclaration.java <52:5 52:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isVariadic() [JavaParserParameterDeclaration.java <54:5 <54:5  <55:20 55:29> 55:31> 57:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isVariadic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isVariadic() -> boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isVariadic() [JavaParserParameterDeclaration.java <55:20 55:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isVariadic() -> java.lang.Override [JavaParserParameterDeclaration.java <54:6 54:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isVariadic() -> boolean [JavaParserParameterDeclaration.java <55:12 55:18>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<55:33> [JavaParserParameterDeclaration.java <55:33 55:33>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<55:33> [JavaParserParameterDeclaration.java <57:5 57:5>]
@@ -114,6 +118,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isType() [JavaParserParameterDeclaration.java <59:5 <59:5  <60:20 60:25> 60:27> 62:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavaParserParameterDeclaration.java <60:20 60:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isType() -> java.lang.Override [JavaParserParameterDeclaration.java <59:6 59:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.isType() -> boolean [JavaParserParameterDeclaration.java <60:12 60:18>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<60:29> [JavaParserParameterDeclaration.java <60:29 60:29>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<60:29> [JavaParserParameterDeclaration.java <62:5 62:5>]
@@ -123,6 +128,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getType() [JavaParserParameterDeclaration.java <64:5 <64:5  <65:17 65:23> 65:25> 71:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [JavaParserParameterDeclaration.java <65:17 65:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getType() -> java.lang.Override [JavaParserParameterDeclaration.java <64:6 64:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserParameterDeclaration.java <65:12 65:15>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<65:27> [JavaParserParameterDeclaration.java <65:27 65:27>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<65:27> [JavaParserParameterDeclaration.java <71:5 71:5>]
@@ -151,6 +157,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.asParameter() [JavaParserParameterDeclaration.java <73:5 <73:5  <74:33 74:43> 74:45> 76:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.asParameter()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.asParameter() -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.asParameter() [JavaParserParameterDeclaration.java <74:33 74:43>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.asParameter() -> java.lang.Override [JavaParserParameterDeclaration.java <73:6 73:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserParameterDeclaration.asParameter() -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [JavaParserParameterDeclaration.java <74:12 74:31>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<74:47> [JavaParserParameterDeclaration.java <74:47 74:47>]
 LOCAL_SYMBOL: JavaParserParameterDeclaration.java<74:47> [JavaParserParameterDeclaration.java <76:5 76:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserSymbolDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserSymbolDeclaration.txt
index 1a1244bb..e19e63d2 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserSymbolDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserSymbolDeclaration.txt
@@ -294,6 +294,7 @@ REFERENCE_TYPE_USAGE static int com.github.javaparser.symbolsolver.javaparsermod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.toString() [JavaParserSymbolDeclaration.java <94:5 <94:5  <95:19 95:26> 95:28> 100:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserSymbolDeclaration.java <95:19 95:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.toString() -> java.lang.Override [JavaParserSymbolDeclaration.java <94:6 94:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.toString() -> java.lang.String [JavaParserSymbolDeclaration.java <95:12 95:17>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<95:30> [JavaParserSymbolDeclaration.java <95:30 95:30>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<95:30> [JavaParserSymbolDeclaration.java <100:5 100:5>]
@@ -302,6 +303,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getName() [JavaParserSymbolDeclaration.java <102:5 <102:5  <103:19 103:25> 103:27> 105:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserSymbolDeclaration.java <103:19 103:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getName() -> java.lang.Override [JavaParserSymbolDeclaration.java <102:6 102:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getName() -> java.lang.String [JavaParserSymbolDeclaration.java <103:12 103:17>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<103:29> [JavaParserSymbolDeclaration.java <103:29 103:29>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<103:29> [JavaParserSymbolDeclaration.java <105:5 105:5>]
@@ -309,6 +311,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isField() [JavaParserSymbolDeclaration.java <107:5 <107:5  <108:20 108:26> 108:28> 110:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavaParserSymbolDeclaration.java <108:20 108:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isField() -> java.lang.Override [JavaParserSymbolDeclaration.java <107:6 107:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isField() -> boolean [JavaParserSymbolDeclaration.java <108:12 108:18>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<108:30> [JavaParserSymbolDeclaration.java <108:30 108:30>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<108:30> [JavaParserSymbolDeclaration.java <110:5 110:5>]
@@ -316,6 +319,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isParameter() [JavaParserSymbolDeclaration.java <112:5 <112:5  <113:20 113:30> 113:32> 115:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavaParserSymbolDeclaration.java <113:20 113:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isParameter() -> java.lang.Override [JavaParserSymbolDeclaration.java <112:6 112:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isParameter() -> boolean [JavaParserSymbolDeclaration.java <113:12 113:18>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<113:34> [JavaParserSymbolDeclaration.java <113:34 113:34>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<113:34> [JavaParserSymbolDeclaration.java <115:5 115:5>]
@@ -323,12 +327,14 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isType() [JavaParserSymbolDeclaration.java <117:5 <117:5  <118:20 118:25> 118:27> 120:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavaParserSymbolDeclaration.java <118:20 118:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isType() -> java.lang.Override [JavaParserSymbolDeclaration.java <117:6 117:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.isType() -> boolean [JavaParserSymbolDeclaration.java <118:12 118:18>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<118:29> [JavaParserSymbolDeclaration.java <118:29 118:29>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<118:29> [JavaParserSymbolDeclaration.java <120:5 120:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getType() [JavaParserSymbolDeclaration.java <122:5 <122:5  <123:17 123:23> 123:25> 160:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [JavaParserSymbolDeclaration.java <123:17 123:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getType() -> java.lang.Override [JavaParserSymbolDeclaration.java <122:6 122:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserSymbolDeclaration.java <123:12 123:15>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<123:27> [JavaParserSymbolDeclaration.java <123:27 123:27>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<123:27> [JavaParserSymbolDeclaration.java <160:5 160:5>]
@@ -484,6 +490,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.asType() [JavaParserSymbolDeclaration.java <162:5 <162:5  <163:28 163:33> 163:35> 165:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.asType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asType() [JavaParserSymbolDeclaration.java <163:28 163:33>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.asType() -> java.lang.Override [JavaParserSymbolDeclaration.java <162:6 162:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration.asType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [JavaParserSymbolDeclaration.java <163:12 163:26>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<163:37> [JavaParserSymbolDeclaration.java <163:37 163:37>]
 LOCAL_SYMBOL: JavaParserSymbolDeclaration.java<163:37> [JavaParserSymbolDeclaration.java <165:5 165:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeParameter.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeParameter.txt
index 837b229e..f7ec5d10 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeParameter.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeParameter.txt
@@ -162,6 +162,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getDeclaredMethods() [JavaParserTypeParameter.java <54:5 <54:5  <55:35 55:52> 55:54> 57:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserTypeParameter.java <55:35 55:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getDeclaredMethods() -> java.lang.Override [JavaParserTypeParameter.java <54:6 54:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getDeclaredMethods() -> java.util.Set<E> [JavaParserTypeParameter.java <55:12 55:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserTypeParameter.java <55:16 55:32>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<55:56> [JavaParserTypeParameter.java <55:56 55:56>]
@@ -189,6 +190,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolRefere
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.equals(java.lang.Object) [JavaParserTypeParameter.java <63:5 <63:5  <64:20 64:25> 64:35> 73:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [JavaParserTypeParameter.java <64:20 64:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.equals(java.lang.Object) -> java.lang.Override [JavaParserTypeParameter.java <63:6 63:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.equals(java.lang.Object) -> boolean [JavaParserTypeParameter.java <64:12 64:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.equals(java.lang.Object) -> java.lang.Object [JavaParserTypeParameter.java <64:27 64:32>]
@@ -213,6 +215,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hashCode() [JavaParserTypeParameter.java <75:5 <75:5  <76:16 76:23> 76:25> 80:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hashCode() -> int java.lang.Object.hashCode() [JavaParserTypeParameter.java <76:16 76:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hashCode() -> java.lang.Override [JavaParserTypeParameter.java <75:6 75:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hashCode() -> int [JavaParserTypeParameter.java <76:12 76:14>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<76:27> [JavaParserTypeParameter.java <76:27 76:27>]
@@ -232,6 +235,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getName() [JavaParserTypeParameter.java <82:5 <82:5  <83:19 83:25> 83:27> 85:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName() [JavaParserTypeParameter.java <83:19 83:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getName() -> java.lang.Override [JavaParserTypeParameter.java <82:6 82:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getName() -> java.lang.String [JavaParserTypeParameter.java <83:12 83:17>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<83:29> [JavaParserTypeParameter.java <83:29 83:29>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<83:29> [JavaParserTypeParameter.java <85:5 85:5>]
@@ -243,6 +247,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserTypeParameter.java <87:5 <87:5  <88:20 88:33> 88:65> 90:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserTypeParameter.java <88:20 88:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserTypeParameter.java <87:6 87:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserTypeParameter.java <88:12 88:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserTypeParameter.java <88:35 88:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy<0> [JavaParserTypeParameter.java <88:60 88:64>]
@@ -258,6 +263,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerQualifiedName() [JavaParserTypeParameter.java <92:5 <92:5  <93:19 93:43> 93:45> 102:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName() [JavaParserTypeParameter.java <93:19 93:43>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerQualifiedName() -> java.lang.Override [JavaParserTypeParameter.java <92:6 92:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerQualifiedName() -> java.lang.String [JavaParserTypeParameter.java <93:12 93:17>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<93:47> [JavaParserTypeParameter.java <93:47 93:47>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<93:47> [JavaParserTypeParameter.java <102:5 102:5>]
@@ -289,6 +295,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerId() [JavaParserTypeParameter.java <104:5 <104:5  <105:19 105:32> 105:34> 114:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerId() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId() [JavaParserTypeParameter.java <105:19 105:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerId() -> java.lang.Override [JavaParserTypeParameter.java <104:6 104:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainerId() -> java.lang.String [JavaParserTypeParameter.java <105:12 105:17>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<105:36> [JavaParserTypeParameter.java <105:36 105:36>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<105:36> [JavaParserTypeParameter.java <114:5 114:5>]
@@ -318,6 +325,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainer() [JavaParserTypeParameter.java <116:5 <116:5  <117:31 117:42> 117:44> 136:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer() [JavaParserTypeParameter.java <117:31 117:42>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainer() -> java.lang.Override [JavaParserTypeParameter.java <116:6 116:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable [JavaParserTypeParameter.java <117:12 117:29>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<117:46> [JavaParserTypeParameter.java <117:46 117:46>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<117:46> [JavaParserTypeParameter.java <136:5 136:5>]
@@ -445,6 +453,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeP
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getQualifiedName() [JavaParserTypeParameter.java <138:5 <138:5  <139:19 139:34> 139:36> 141:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getQualifiedName() [JavaParserTypeParameter.java <139:19 139:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getQualifiedName() -> java.lang.Override [JavaParserTypeParameter.java <138:6 138:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getQualifiedName() -> java.lang.String [JavaParserTypeParameter.java <139:12 139:17>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<139:38> [JavaParserTypeParameter.java <139:38 139:38>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<139:38> [JavaParserTypeParameter.java <141:5 141:5>]
@@ -458,6 +467,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javaparsermod
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserTypeParameter.java <143:5 <143:5  <144:24 144:32> 144:55> 146:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserTypeParameter.java <144:24 144:32>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [JavaParserTypeParameter.java <143:6 143:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<E> [JavaParserTypeParameter.java <144:12 144:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound [JavaParserTypeParameter.java <144:17 144:21>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [JavaParserTypeParameter.java <144:34 144:43>]
@@ -522,6 +532,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type co
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserTypeParameter.java <162:5 <162:5  <163:20 163:33> 163:44> 165:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserTypeParameter.java <163:20 163:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserTypeParameter.java <162:6 162:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserTypeParameter.java <163:12 163:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserTypeParameter.java <163:35 163:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isAssignableBy<0> [JavaParserTypeParameter.java <163:40 163:43>]
@@ -532,6 +543,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getField(java.lang.String) [JavaParserTypeParameter.java <167:5 <167:5  <168:29 168:36> 168:49> 170:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String) [JavaParserTypeParameter.java <168:29 168:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getField(java.lang.String) -> java.lang.Override [JavaParserTypeParameter.java <167:6 167:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserTypeParameter.java <168:12 168:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getField(java.lang.String) -> java.lang.String [JavaParserTypeParameter.java <168:38 168:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getField<0> [JavaParserTypeParameter.java <168:45 168:48>]
@@ -542,6 +554,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.Field
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasField(java.lang.String) [JavaParserTypeParameter.java <172:5 <172:5  <173:20 173:27> 173:40> 175:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasField(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String) [JavaParserTypeParameter.java <173:20 173:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasField(java.lang.String) -> java.lang.Override [JavaParserTypeParameter.java <172:6 172:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasField(java.lang.String) -> boolean [JavaParserTypeParameter.java <173:12 173:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasField(java.lang.String) -> java.lang.String [JavaParserTypeParameter.java <173:29 173:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasField<0> [JavaParserTypeParameter.java <173:36 173:39>]
@@ -550,6 +563,7 @@ LOCAL_SYMBOL: JavaParserTypeParameter.java<173:42> [JavaParserTypeParameter.java
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAllFields() [JavaParserTypeParameter.java <177:5 <177:5  <178:35 178:46> 178:48> 180:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserTypeParameter.java <178:35 178:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAllFields() -> java.lang.Override [JavaParserTypeParameter.java <177:6 177:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAllFields() -> java.util.List<E> [JavaParserTypeParameter.java <178:12 178:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserTypeParameter.java <178:17 178:32>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<178:50> [JavaParserTypeParameter.java <178:50 178:50>]
@@ -560,6 +574,7 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.dec
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAncestors() [JavaParserTypeParameter.java <182:5 <182:5  <183:32 183:43> 183:45> 185:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserTypeParameter.java <183:32 183:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAncestors() -> java.lang.Override [JavaParserTypeParameter.java <182:6 182:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAncestors() -> java.util.List<E> [JavaParserTypeParameter.java <183:12 183:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserTypeParameter.java <183:17 183:29>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<183:47> [JavaParserTypeParameter.java <183:47 183:47>]
@@ -569,12 +584,14 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typ
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isTypeParameter() [JavaParserTypeParameter.java <187:5 <187:5  <188:20 188:34> 188:36> 190:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [JavaParserTypeParameter.java <188:20 188:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isTypeParameter() -> java.lang.Override [JavaParserTypeParameter.java <187:6 187:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.isTypeParameter() -> boolean [JavaParserTypeParameter.java <188:12 188:18>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<188:38> [JavaParserTypeParameter.java <188:38 188:38>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<188:38> [JavaParserTypeParameter.java <190:5 190:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasDirectlyAnnotation(java.lang.String) [JavaParserTypeParameter.java <192:5 <192:5  <193:20 193:40> 193:62> 195:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserTypeParameter.java <193:20 193:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserTypeParameter.java <192:6 192:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserTypeParameter.java <193:12 193:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserTypeParameter.java <193:42 193:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.hasDirectlyAnnotation<0> [JavaParserTypeParameter.java <193:49 193:61>]
@@ -585,6 +602,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getTypeParameters() [JavaParserTypeParameter.java <197:5 <197:5  <198:43 198:59> 198:61> 200:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserTypeParameter.java <198:43 198:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getTypeParameters() -> java.lang.Override [JavaParserTypeParameter.java <197:6 197:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getTypeParameters() -> java.util.List<E> [JavaParserTypeParameter.java <198:12 198:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserTypeParameter.java <198:17 198:40>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<198:63> [JavaParserTypeParameter.java <198:63 198:63>]
@@ -606,6 +624,7 @@ REFERENCE_USAGE com.github.javaparser.ast.type.TypeParameter com.github.javapars
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.toString() [JavaParserTypeParameter.java <211:5 <211:5  <212:19 212:26> 212:28> 214:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.toString() -> java.lang.String java.lang.Object.toString() [JavaParserTypeParameter.java <212:19 212:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.toString() -> java.lang.Override [JavaParserTypeParameter.java <211:6 211:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.toString() -> java.lang.String [JavaParserTypeParameter.java <212:12 212:17>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<212:30> [JavaParserTypeParameter.java <212:30 212:30>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<212:30> [JavaParserTypeParameter.java <214:5 214:5>]
@@ -616,6 +635,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.containerType() [JavaParserTypeParameter.java <216:5 <216:5  <217:47 217:59> 217:61> 223:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserTypeParameter.java <217:47 217:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.containerType() -> java.lang.Override [JavaParserTypeParameter.java <216:6 216:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.containerType() -> java.util.Optional<T> [JavaParserTypeParameter.java <217:12 217:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserTypeParameter.java <217:21 217:44>]
 LOCAL_SYMBOL: JavaParserTypeParameter.java<217:63> [JavaParserTypeParameter.java <217:63 217:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeVariableDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeVariableDeclaration.txt
index 9704ff87..da36212e 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeVariableDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserTypeVariableDeclaration.txt
@@ -147,6 +147,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserTypeVariableDeclaration.java <52:5 <52:5  <53:20 53:33> 53:65> 55:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavaParserTypeVariableDeclaration.java <53:20 53:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavaParserTypeVariableDeclaration.java <52:6 52:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavaParserTypeVariableDeclaration.java <53:12 53:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserTypeVariableDeclaration.java <53:35 53:58>]
@@ -163,6 +164,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.decla
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getPackageName() [JavaParserTypeVariableDeclaration.java <57:5 <57:5  <58:19 58:32> 58:34> 60:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavaParserTypeVariableDeclaration.java <58:19 58:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getPackageName() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <57:6 57:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getPackageName() -> java.lang.String [JavaParserTypeVariableDeclaration.java <58:12 58:17>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<58:36> [JavaParserTypeVariableDeclaration.java <58:36 58:36>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<58:36> [JavaParserTypeVariableDeclaration.java <60:5 60:5>]
@@ -173,6 +175,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getClassName() [JavaParserTypeVariableDeclaration.java <62:5 <62:5  <63:19 63:30> 63:32> 65:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavaParserTypeVariableDeclaration.java <63:19 63:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getClassName() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <62:6 62:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getClassName() -> java.lang.String [JavaParserTypeVariableDeclaration.java <63:12 63:17>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<63:34> [JavaParserTypeVariableDeclaration.java <63:34 63:34>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<63:34> [JavaParserTypeVariableDeclaration.java <65:5 65:5>]
@@ -183,6 +186,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getQualifiedName() [JavaParserTypeVariableDeclaration.java <67:5 <67:5  <68:19 68:34> 68:36> 70:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavaParserTypeVariableDeclaration.java <68:19 68:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getQualifiedName() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <67:6 67:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getQualifiedName() -> java.lang.String [JavaParserTypeVariableDeclaration.java <68:12 68:17>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<68:38> [JavaParserTypeVariableDeclaration.java <68:38 68:38>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<68:38> [JavaParserTypeVariableDeclaration.java <70:5 70:5>]
@@ -198,6 +202,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.core.resolution.Context
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.toString() [JavaParserTypeVariableDeclaration.java <76:5 <76:5  <77:19 77:26> 77:28> 81:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavaParserTypeVariableDeclaration.java <77:19 77:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.toString() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.toString() -> java.lang.String [JavaParserTypeVariableDeclaration.java <77:12 77:17>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<77:30> [JavaParserTypeVariableDeclaration.java <77:30 77:30>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<77:30> [JavaParserTypeVariableDeclaration.java <81:5 81:5>]
@@ -227,6 +232,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type co
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserTypeVariableDeclaration.java <91:5 <91:5  <92:20 92:33> 92:44> 98:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavaParserTypeVariableDeclaration.java <92:20 92:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavaParserTypeVariableDeclaration.java <91:6 91:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavaParserTypeVariableDeclaration.java <92:12 92:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavaParserTypeVariableDeclaration.java <92:35 92:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isAssignableBy<0> [JavaParserTypeVariableDeclaration.java <92:40 92:43>]
@@ -251,12 +257,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isTypeParameter() [JavaParserTypeVariableDeclaration.java <100:5 <100:5  <101:20 101:34> 101:36> 103:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [JavaParserTypeVariableDeclaration.java <101:20 101:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isTypeParameter() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <100:6 100:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isTypeParameter() -> boolean [JavaParserTypeVariableDeclaration.java <101:12 101:18>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<101:38> [JavaParserTypeVariableDeclaration.java <101:38 101:38>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<101:38> [JavaParserTypeVariableDeclaration.java <103:5 103:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getField(java.lang.String) [JavaParserTypeVariableDeclaration.java <105:5 <105:5  <106:29 106:36> 106:49> 108:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String) [JavaParserTypeVariableDeclaration.java <106:29 106:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getField(java.lang.String) -> java.lang.Override [JavaParserTypeVariableDeclaration.java <105:6 105:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserTypeVariableDeclaration.java <106:12 106:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getField(java.lang.String) -> java.lang.String [JavaParserTypeVariableDeclaration.java <106:38 106:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getField<0> [JavaParserTypeVariableDeclaration.java <106:45 106:48>]
@@ -267,6 +275,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.Field
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasField(java.lang.String) [JavaParserTypeVariableDeclaration.java <110:5 <110:5  <111:20 111:27> 111:40> 113:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasField(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String) [JavaParserTypeVariableDeclaration.java <111:20 111:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasField(java.lang.String) -> java.lang.Override [JavaParserTypeVariableDeclaration.java <110:6 110:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasField(java.lang.String) -> boolean [JavaParserTypeVariableDeclaration.java <111:12 111:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasField(java.lang.String) -> java.lang.String [JavaParserTypeVariableDeclaration.java <111:29 111:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasField<0> [JavaParserTypeVariableDeclaration.java <111:36 111:39>]
@@ -275,6 +284,7 @@ LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<111:42> [JavaParserTypeVari
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAllFields() [JavaParserTypeVariableDeclaration.java <115:5 <115:5  <116:35 116:46> 116:48> 118:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserTypeVariableDeclaration.java <116:35 116:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAllFields() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <115:6 115:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAllFields() -> java.util.List<E> [JavaParserTypeVariableDeclaration.java <116:12 116:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserTypeVariableDeclaration.java <116:17 116:32>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<116:50> [JavaParserTypeVariableDeclaration.java <116:50 116:50>]
@@ -285,6 +295,7 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.dec
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAncestors() [JavaParserTypeVariableDeclaration.java <120:5 <120:5  <121:32 121:43> 121:45> 123:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavaParserTypeVariableDeclaration.java <121:32 121:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAncestors() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <120:6 120:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAncestors() -> java.util.List<E> [JavaParserTypeVariableDeclaration.java <121:12 121:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavaParserTypeVariableDeclaration.java <121:17 121:29>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<121:47> [JavaParserTypeVariableDeclaration.java <121:47 121:47>]
@@ -294,6 +305,7 @@ REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typ
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getDeclaredMethods() [JavaParserTypeVariableDeclaration.java <125:5 <125:5  <126:35 126:52> 126:54> 128:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserTypeVariableDeclaration.java <126:35 126:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getDeclaredMethods() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <125:6 125:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavaParserTypeVariableDeclaration.java <126:12 126:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavaParserTypeVariableDeclaration.java <126:16 126:32>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<126:56> [JavaParserTypeVariableDeclaration.java <126:56 126:56>]
@@ -304,6 +316,7 @@ QUALIFIER: java.util.Collections [JavaParserTypeVariableDeclaration.java <127:16
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getName() [JavaParserTypeVariableDeclaration.java <130:5 <130:5  <131:19 131:25> 131:27> 133:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavaParserTypeVariableDeclaration.java <131:19 131:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getName() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <130:6 130:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getName() -> java.lang.String [JavaParserTypeVariableDeclaration.java <131:12 131:17>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<131:29> [JavaParserTypeVariableDeclaration.java <131:29 131:29>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<131:29> [JavaParserTypeVariableDeclaration.java <133:5 133:5>]
@@ -314,6 +327,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javaparsermo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isField() [JavaParserTypeVariableDeclaration.java <135:5 <135:5  <136:20 136:26> 136:28> 138:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavaParserTypeVariableDeclaration.java <136:20 136:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isField() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <135:6 135:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isField() -> boolean [JavaParserTypeVariableDeclaration.java <136:12 136:18>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<136:30> [JavaParserTypeVariableDeclaration.java <136:30 136:30>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<136:30> [JavaParserTypeVariableDeclaration.java <138:5 138:5>]
@@ -322,6 +336,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isParameter() [JavaParserTypeVariableDeclaration.java <140:5 <140:5  <141:20 141:30> 141:32> 143:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavaParserTypeVariableDeclaration.java <141:20 141:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isParameter() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <140:6 140:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isParameter() -> boolean [JavaParserTypeVariableDeclaration.java <141:12 141:18>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<141:34> [JavaParserTypeVariableDeclaration.java <141:34 141:34>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<141:34> [JavaParserTypeVariableDeclaration.java <143:5 143:5>]
@@ -330,12 +345,14 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isType() [JavaParserTypeVariableDeclaration.java <145:5 <145:5  <146:20 146:25> 146:27> 148:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() [JavaParserTypeVariableDeclaration.java <146:20 146:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isType() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <145:6 145:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isType() -> boolean [JavaParserTypeVariableDeclaration.java <146:12 146:18>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<146:29> [JavaParserTypeVariableDeclaration.java <146:29 146:29>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<146:29> [JavaParserTypeVariableDeclaration.java <148:5 148:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserTypeVariableDeclaration.java <150:5 <150:5  <151:20 151:40> 151:62> 153:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavaParserTypeVariableDeclaration.java <151:20 151:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavaParserTypeVariableDeclaration.java <150:6 150:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavaParserTypeVariableDeclaration.java <151:12 151:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavaParserTypeVariableDeclaration.java <151:42 151:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.hasDirectlyAnnotation<0> [JavaParserTypeVariableDeclaration.java <151:49 151:61>]
@@ -346,18 +363,21 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isClass() [JavaParserTypeVariableDeclaration.java <155:5 <155:5  <156:20 156:26> 156:28> 158:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isClass()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isClass() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isClass() [JavaParserTypeVariableDeclaration.java <156:20 156:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isClass() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <155:6 155:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isClass() -> boolean [JavaParserTypeVariableDeclaration.java <156:12 156:18>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<156:30> [JavaParserTypeVariableDeclaration.java <156:30 156:30>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<156:30> [JavaParserTypeVariableDeclaration.java <158:5 158:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isInterface() [JavaParserTypeVariableDeclaration.java <160:5 <160:5  <161:20 161:30> 161:32> 163:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface() [JavaParserTypeVariableDeclaration.java <161:20 161:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isInterface() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <160:6 160:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.isInterface() -> boolean [JavaParserTypeVariableDeclaration.java <161:12 161:18>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<161:34> [JavaParserTypeVariableDeclaration.java <161:34 161:34>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<161:34> [JavaParserTypeVariableDeclaration.java <163:5 163:5>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getTypeParameters() [JavaParserTypeVariableDeclaration.java <165:5 <165:5  <166:43 166:59> 166:61> 168:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavaParserTypeVariableDeclaration.java <166:43 166:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getTypeParameters() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <165:6 165:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getTypeParameters() -> java.util.List<E> [JavaParserTypeVariableDeclaration.java <166:12 166:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavaParserTypeVariableDeclaration.java <166:17 166:40>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<166:63> [JavaParserTypeVariableDeclaration.java <166:63 166:63>]
@@ -386,6 +406,7 @@ REFERENCE_USAGE com.github.javaparser.ast.type.TypeParameter com.github.javapars
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.containerType() [JavaParserTypeVariableDeclaration.java <183:5 <183:5  <184:47 184:59> 184:61> 186:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavaParserTypeVariableDeclaration.java <184:47 184:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.containerType() -> java.lang.Override [JavaParserTypeVariableDeclaration.java <183:6 183:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.containerType() -> java.util.Optional<T> [JavaParserTypeVariableDeclaration.java <184:12 184:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserTypeVariableDeclaration.java <184:21 184:44>]
 LOCAL_SYMBOL: JavaParserTypeVariableDeclaration.java<184:63> [JavaParserTypeVariableDeclaration.java <184:63 184:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_FieldSymbolDeclarator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_FieldSymbolDeclarator.txt
index e23e869e..9c3105b5 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_FieldSymbolDeclarator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_FieldSymbolDeclarator.txt
@@ -75,6 +75,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarators.Fie
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator.getSymbolDeclarations() [FieldSymbolDeclarator.java <37:5 <37:5  <38:35 38:55> 38:57> 44:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator.getSymbolDeclarations() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations() [FieldSymbolDeclarator.java <38:35 38:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator.getSymbolDeclarations() -> java.lang.Override [FieldSymbolDeclarator.java <37:6 37:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator.getSymbolDeclarations() -> java.util.List<E> [FieldSymbolDeclarator.java <38:12 38:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator.getSymbolDeclarations() -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [FieldSymbolDeclarator.java <38:17 38:32>]
 LOCAL_SYMBOL: FieldSymbolDeclarator.java<38:59> [FieldSymbolDeclarator.java <38:59 38:59>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_NoSymbolDeclarator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_NoSymbolDeclarator.txt
index 4731a272..4b92fe10 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_NoSymbolDeclarator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_NoSymbolDeclarator.txt
@@ -62,6 +62,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarators.NoS
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.NoSymbolDeclarator<N>.getSymbolDeclarations() [NoSymbolDeclarator.java <35:5 <35:5  <36:35 36:55> 36:57> 38:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.NoSymbolDeclarator<N>.getSymbolDeclarations() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations() [NoSymbolDeclarator.java <36:35 36:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.NoSymbolDeclarator<N>.getSymbolDeclarations() -> java.lang.Override [NoSymbolDeclarator.java <35:6 35:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.NoSymbolDeclarator<N>.getSymbolDeclarations() -> java.util.List<E> [NoSymbolDeclarator.java <36:12 36:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.NoSymbolDeclarator<N>.getSymbolDeclarations() -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [NoSymbolDeclarator.java <36:17 36:32>]
 LOCAL_SYMBOL: NoSymbolDeclarator.java<36:59> [NoSymbolDeclarator.java <36:59 36:59>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_ParameterSymbolDeclarator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_ParameterSymbolDeclarator.txt
index 9592d098..f03c0891 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_ParameterSymbolDeclarator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_ParameterSymbolDeclarator.txt
@@ -69,6 +69,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarators.Par
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator.getSymbolDeclarations() [ParameterSymbolDeclarator.java <36:5 <36:5  <37:35 37:55> 37:57> 41:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator.getSymbolDeclarations() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations() [ParameterSymbolDeclarator.java <37:35 37:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator.getSymbolDeclarations() -> java.lang.Override [ParameterSymbolDeclarator.java <36:6 36:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator.getSymbolDeclarations() -> java.util.List<E> [ParameterSymbolDeclarator.java <37:12 37:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator.getSymbolDeclarations() -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [ParameterSymbolDeclarator.java <37:17 37:32>]
 LOCAL_SYMBOL: ParameterSymbolDeclarator.java<37:59> [ParameterSymbolDeclarator.java <37:59 37:59>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_VariableSymbolDeclarator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_VariableSymbolDeclarator.txt
index 9aa4022d..b89146b6 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_VariableSymbolDeclarator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarators_VariableSymbolDeclarator.txt
@@ -98,6 +98,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.javaparsermodel.declarat
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator.getSymbolDeclarations() [VariableSymbolDeclarator.java <43:5 <43:5  <44:35 44:55> 44:57> 50:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator.getSymbolDeclarations() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolDeclarator.getSymbolDeclarations() [VariableSymbolDeclarator.java <44:35 44:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator.getSymbolDeclarations() -> java.lang.Override [VariableSymbolDeclarator.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator.getSymbolDeclarations() -> java.util.List<E> [VariableSymbolDeclarator.java <44:12 44:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator.getSymbolDeclarations() -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [VariableSymbolDeclarator.java <44:17 44:32>]
 LOCAL_SYMBOL: VariableSymbolDeclarator.java<44:59> [VariableSymbolDeclarator.java <44:59 44:59>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistClassDeclaration.txt
index a855b01a..a09d423f 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistClassDeclaration.txt
@@ -205,6 +205,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD protected com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.object() [JavassistClassDeclaration.java <67:5 <67:5  <68:29 68:34> 68:36> 70:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object() [JavassistClassDeclaration.java <68:29 68:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.object() -> java.lang.Override [JavassistClassDeclaration.java <67:6 67:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistClassDeclaration.java <68:15 68:27>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<68:38> [JavassistClassDeclaration.java <68:38 68:38>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<68:38> [JavassistClassDeclaration.java <70:5 70:5>]
@@ -221,6 +222,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTyp
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasDirectlyAnnotation(java.lang.String) [JavassistClassDeclaration.java <72:5 <72:5  <73:20 73:40> 73:62> 75:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavassistClassDeclaration.java <73:20 73:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavassistClassDeclaration.java <72:6 72:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavassistClassDeclaration.java <73:12 73:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavassistClassDeclaration.java <73:42 73:47>]
@@ -233,6 +235,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getDeclaredMethods() [JavassistClassDeclaration.java <77:5 <77:5  <78:35 78:52> 78:54> 80:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavassistClassDeclaration.java <78:35 78:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getDeclaredMethods() -> java.lang.Override [JavassistClassDeclaration.java <77:6 77:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavassistClassDeclaration.java <78:12 78:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavassistClassDeclaration.java <78:16 78:32>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<78:56> [JavassistClassDeclaration.java <78:56 78:56>]
@@ -243,6 +246,7 @@ REFERENCE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarati
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavassistClassDeclaration.java <82:5 <82:5  <83:20 83:33> 83:65> 85:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavassistClassDeclaration.java <83:20 83:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavassistClassDeclaration.java <82:6 82:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavassistClassDeclaration.java <83:12 83:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistClassDeclaration.java <83:35 83:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy<0> [JavassistClassDeclaration.java <83:60 83:64>]
@@ -257,6 +261,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.equals(java.lang.Object) [JavassistClassDeclaration.java <87:5 <87:5  <88:20 88:25> 88:35> 97:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [JavassistClassDeclaration.java <88:20 88:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.equals(java.lang.Object) -> java.lang.Override [JavassistClassDeclaration.java <87:6 87:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.equals(java.lang.Object) -> boolean [JavassistClassDeclaration.java <88:12 88:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.equals(java.lang.Object) -> java.lang.Object [JavassistClassDeclaration.java <88:27 88:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.equals<0> [JavassistClassDeclaration.java <88:34 88:34>]
@@ -279,6 +284,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hashCode() [JavassistClassDeclaration.java <99:5 <99:5  <100:16 100:23> 100:25> 102:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hashCode() -> int java.lang.Object.hashCode() [JavassistClassDeclaration.java <100:16 100:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hashCode() -> java.lang.Override [JavassistClassDeclaration.java <99:6 99:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hashCode() -> int [JavassistClassDeclaration.java <100:12 100:14>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<100:27> [JavassistClassDeclaration.java <100:27 100:27>]
@@ -288,6 +294,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistC
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getPackageName() [JavassistClassDeclaration.java <104:5 <104:5  <105:19 105:32> 105:34> 107:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavassistClassDeclaration.java <105:19 105:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getPackageName() -> java.lang.Override [JavassistClassDeclaration.java <104:6 104:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getPackageName() -> java.lang.String [JavassistClassDeclaration.java <105:12 105:17>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<105:36> [JavassistClassDeclaration.java <105:36 105:36>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<105:36> [JavassistClassDeclaration.java <107:5 107:5>]
@@ -297,6 +304,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getClassName() [JavassistClassDeclaration.java <109:5 <109:5  <110:19 110:30> 110:32> 116:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavassistClassDeclaration.java <110:19 110:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getClassName() -> java.lang.Override [JavassistClassDeclaration.java <109:6 109:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getClassName() -> java.lang.String [JavassistClassDeclaration.java <110:12 110:17>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<110:34> [JavassistClassDeclaration.java <110:34 110:34>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<110:34> [JavassistClassDeclaration.java <116:5 116:5>]
@@ -323,6 +331,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getQualifiedName() [JavassistClassDeclaration.java <118:5 <118:5  <119:19 119:34> 119:36> 121:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavassistClassDeclaration.java <119:19 119:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getQualifiedName() -> java.lang.Override [JavassistClassDeclaration.java <118:6 118:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getQualifiedName() -> java.lang.String [JavassistClassDeclaration.java <119:12 119:17>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<119:38> [JavassistClassDeclaration.java <119:38 119:38>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<119:38> [JavassistClassDeclaration.java <121:5 121:5>]
@@ -355,6 +364,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethodAsUsage<2> [JavassistClassDeclaration.java <125:77 125:86>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethodAsUsage<3> [JavassistClassDeclaration.java <125:89 125:105>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavassistClassDeclaration.java <128:5 <128:5  <129:56 129:66> 129:102> 160:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Deprecated [JavassistClassDeclaration.java <128:6 128:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavassistClassDeclaration.java <129:12 129:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [JavassistClassDeclaration.java <129:38 129:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [JavassistClassDeclaration.java <129:68 129:73>]
@@ -462,6 +472,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolR
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors() [JavassistClassDeclaration.java <162:5 <162:5  <163:32 163:43> 163:45> 170:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavassistClassDeclaration.java <163:32 163:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors() -> java.lang.Override [JavassistClassDeclaration.java <162:6 162:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors() -> java.util.List<E> [JavassistClassDeclaration.java <163:12 163:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistClassDeclaration.java <163:17 163:29>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<163:47> [JavassistClassDeclaration.java <163:47 163:47>]
@@ -487,6 +498,7 @@ SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInterfaces() [JavassistClassDeclaration.java <168:26 168:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAncestors<0> [JavassistClassDeclaration.java <169:16 169:24>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) [JavassistClassDeclaration.java <172:5 <172:5  <173:47 173:57> 173:117> 208:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.Deprecated [JavassistClassDeclaration.java <172:6 172:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavassistClassDeclaration.java <173:12 173:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavassistClassDeclaration.java <173:28 173:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.String [JavassistClassDeclaration.java <173:59 173:64>]
@@ -653,6 +665,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavassistClassDeclaration.java <214:5 <214:5  <215:20 215:33> 215:44> 242:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavassistClassDeclaration.java <215:20 215:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavassistClassDeclaration.java <214:6 214:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavassistClassDeclaration.java <215:12 215:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavassistClassDeclaration.java <215:35 215:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isAssignableBy<0> [JavassistClassDeclaration.java <215:40 215:43>]
@@ -718,12 +731,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isTypeParameter() [JavassistClassDeclaration.java <244:5 <244:5  <245:20 245:34> 245:36> 247:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [JavassistClassDeclaration.java <245:20 245:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isTypeParameter() -> java.lang.Override [JavassistClassDeclaration.java <244:6 244:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isTypeParameter() -> boolean [JavassistClassDeclaration.java <245:12 245:18>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<245:38> [JavassistClassDeclaration.java <245:38 245:38>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<245:38> [JavassistClassDeclaration.java <247:5 247:5>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAllFields() [JavassistClassDeclaration.java <249:5 <249:5  <250:35 250:46> 250:48> 252:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavassistClassDeclaration.java <250:35 250:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAllFields() -> java.lang.Override [JavassistClassDeclaration.java <249:6 249:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAllFields() -> java.util.List<E> [JavassistClassDeclaration.java <250:12 250:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavassistClassDeclaration.java <250:17 250:32>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<250:50> [JavassistClassDeclaration.java <250:50 250:50>]
@@ -734,6 +749,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getName() [JavassistClassDeclaration.java <254:5 <254:5  <255:19 255:25> 255:27> 258:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistClassDeclaration.java <255:19 255:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getName() -> java.lang.Override [JavassistClassDeclaration.java <254:6 254:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getName() -> java.lang.String [JavassistClassDeclaration.java <255:12 255:17>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<255:29> [JavassistClassDeclaration.java <255:29 255:29>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<255:29> [JavassistClassDeclaration.java <258:5 258:5>]
@@ -752,24 +768,28 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isField() [JavassistClassDeclaration.java <260:5 <260:5  <261:20 261:26> 261:28> 263:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavassistClassDeclaration.java <261:20 261:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isField() -> java.lang.Override [JavassistClassDeclaration.java <260:6 260:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isField() -> boolean [JavassistClassDeclaration.java <261:12 261:18>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<261:30> [JavassistClassDeclaration.java <261:30 261:30>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<261:30> [JavassistClassDeclaration.java <263:5 263:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isParameter() [JavassistClassDeclaration.java <265:5 <265:5  <266:20 266:30> 266:32> 268:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavassistClassDeclaration.java <266:20 266:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isParameter() -> java.lang.Override [JavassistClassDeclaration.java <265:6 265:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isParameter() -> boolean [JavassistClassDeclaration.java <266:12 266:18>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<266:34> [JavassistClassDeclaration.java <266:34 266:34>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<266:34> [JavassistClassDeclaration.java <268:5 268:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isType() [JavassistClassDeclaration.java <270:5 <270:5  <271:20 271:25> 271:27> 273:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() [JavassistClassDeclaration.java <271:20 271:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isType() -> java.lang.Override [JavassistClassDeclaration.java <270:6 270:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isType() -> boolean [JavassistClassDeclaration.java <271:12 271:18>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<271:29> [JavassistClassDeclaration.java <271:29 271:29>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<271:29> [JavassistClassDeclaration.java <273:5 273:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isClass() [JavassistClassDeclaration.java <275:5 <275:5  <276:20 276:26> 276:28> 278:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isClass() -> boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass() [JavassistClassDeclaration.java <276:20 276:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isClass() -> java.lang.Override [JavassistClassDeclaration.java <275:6 275:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isClass() -> boolean [JavassistClassDeclaration.java <276:12 276:18>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<276:30> [JavassistClassDeclaration.java <276:30 276:30>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<276:30> [JavassistClassDeclaration.java <278:5 278:5>]
@@ -778,6 +798,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getSuperClass() [JavassistClassDeclaration.java <280:5 <280:5  <281:26 281:38> 281:40> 297:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass() [JavassistClassDeclaration.java <281:26 281:38>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getSuperClass() -> java.lang.Override [JavassistClassDeclaration.java <280:6 280:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistClassDeclaration.java <281:12 281:24>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<281:42> [JavassistClassDeclaration.java <281:42 281:42>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<281:42> [JavassistClassDeclaration.java <297:5 297:5>]
@@ -841,6 +862,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInterfaces() [JavassistClassDeclaration.java <299:5 <299:5  <300:32 300:44> 300:46> 318:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInterfaces() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces() [JavassistClassDeclaration.java <300:32 300:44>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInterfaces() -> java.lang.Override [JavassistClassDeclaration.java <299:6 299:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInterfaces() -> java.util.List<E> [JavassistClassDeclaration.java <300:12 300:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInterfaces() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistClassDeclaration.java <300:17 300:29>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<300:48> [JavassistClassDeclaration.java <300:48 300:48>]
@@ -915,6 +937,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isInterface() [JavassistClassDeclaration.java <320:5 <320:5  <321:20 321:30> 321:32> 323:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface() [JavassistClassDeclaration.java <321:20 321:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isInterface() -> java.lang.Override [JavassistClassDeclaration.java <320:6 320:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.isInterface() -> boolean [JavassistClassDeclaration.java <321:12 321:18>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<321:34> [JavassistClassDeclaration.java <321:34 321:34>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<321:34> [JavassistClassDeclaration.java <323:5 323:5>]
@@ -923,6 +946,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.toString() [JavassistClassDeclaration.java <325:5 <325:5  <326:19 326:26> 326:28> 328:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavassistClassDeclaration.java <326:19 326:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.toString() -> java.lang.Override [JavassistClassDeclaration.java <325:6 325:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.toString() -> java.lang.String [JavassistClassDeclaration.java <326:12 326:17>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<326:30> [JavassistClassDeclaration.java <326:30 326:30>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<326:30> [JavassistClassDeclaration.java <328:5 328:5>]
@@ -931,6 +955,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getTypeParameters() [JavassistClassDeclaration.java <330:5 <330:5  <331:43 331:59> 331:61> 333:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavassistClassDeclaration.java <331:43 331:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getTypeParameters() -> java.lang.Override [JavassistClassDeclaration.java <330:6 330:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getTypeParameters() -> java.util.List<E> [JavassistClassDeclaration.java <331:12 331:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavassistClassDeclaration.java <331:17 331:40>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<331:63> [JavassistClassDeclaration.java <331:63 331:63>]
@@ -941,6 +966,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.accessLevel() [JavassistClassDeclaration.java <335:5 <335:5  <336:24 336:34> 336:36> 338:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavassistClassDeclaration.java <336:24 336:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.accessLevel() -> java.lang.Override [JavassistClassDeclaration.java <335:6 335:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavassistClassDeclaration.java <336:12 336:22>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<336:38> [JavassistClassDeclaration.java <336:38 336:38>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<336:38> [JavassistClassDeclaration.java <338:5 338:5>]
@@ -953,6 +979,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getConstructors() [JavassistClassDeclaration.java <340:5 <340:5  <341:41 341:55> 341:57> 343:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getConstructors() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors() [JavassistClassDeclaration.java <341:41 341:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getConstructors() -> java.lang.Override [JavassistClassDeclaration.java <340:6 340:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getConstructors() -> java.util.List<E> [JavassistClassDeclaration.java <341:12 341:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getConstructors() -> com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration [JavassistClassDeclaration.java <341:17 341:38>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<341:59> [JavassistClassDeclaration.java <341:59 341:59>]
@@ -963,6 +990,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.containerType() [JavassistClassDeclaration.java <345:5 <345:5  <346:47 346:59> 346:61> 348:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavassistClassDeclaration.java <346:47 346:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.containerType() -> java.lang.Override [JavassistClassDeclaration.java <345:6 345:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.containerType() -> java.util.Optional<T> [JavassistClassDeclaration.java <346:12 346:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistClassDeclaration.java <346:21 346:44>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<346:63> [JavassistClassDeclaration.java <346:63 346:63>]
@@ -973,6 +1001,7 @@ REFERENCE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.decl
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.internalTypes() [JavassistClassDeclaration.java <350:5 <350:5  <351:42 351:54> 351:56> 361:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavassistClassDeclaration.java <351:42 351:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.internalTypes() -> java.lang.Override [JavassistClassDeclaration.java <350:6 350:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.internalTypes() -> java.util.Set<E> [JavassistClassDeclaration.java <351:12 351:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistClassDeclaration.java <351:16 351:39>]
 LOCAL_SYMBOL: JavassistClassDeclaration.java<351:58> [JavassistClassDeclaration.java <351:58 351:58>]
@@ -1005,6 +1034,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInternalType(java.lang.String) [JavassistClassDeclaration.java <363:5 <363:5  <364:37 364:51> 364:64> 373:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInternalType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType(java.lang.String) [JavassistClassDeclaration.java <364:37 364:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInternalType(java.lang.String) -> java.lang.Override [JavassistClassDeclaration.java <363:6 363:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInternalType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistClassDeclaration.java <364:12 364:35>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInternalType(java.lang.String) -> java.lang.String [JavassistClassDeclaration.java <364:53 364:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.getInternalType<0> [JavassistClassDeclaration.java <364:60 364:63>]
@@ -1038,6 +1068,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDe
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasInternalType(java.lang.String) [JavassistClassDeclaration.java <375:5 <375:5  <376:20 376:34> 376:47> 382:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasInternalType(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType(java.lang.String) [JavassistClassDeclaration.java <376:20 376:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasInternalType(java.lang.String) -> java.lang.Override [JavassistClassDeclaration.java <375:6 375:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasInternalType(java.lang.String) -> boolean [JavassistClassDeclaration.java <376:12 376:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasInternalType(java.lang.String) -> java.lang.String [JavassistClassDeclaration.java <376:36 376:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration.hasInternalType<0> [JavassistClassDeclaration.java <376:43 376:46>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistConstructorDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistConstructorDeclaration.txt
index 8bb4ce20..4c3d1e7f 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistConstructorDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistConstructorDeclaration.txt
@@ -77,6 +77,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistConstru
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.toString() [JavassistConstructorDeclaration.java <43:5 <43:5  <44:19 44:26> 44:28> 48:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavassistConstructorDeclaration.java <44:19 44:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.toString() -> java.lang.Override [JavassistConstructorDeclaration.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.toString() -> java.lang.String [JavassistConstructorDeclaration.java <44:12 44:17>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<44:30> [JavassistConstructorDeclaration.java <44:30 44:30>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<44:30> [JavassistConstructorDeclaration.java <48:5 48:5>]
@@ -84,6 +85,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getName() [JavassistConstructorDeclaration.java <50:5 <50:5  <51:19 51:25> 51:27> 53:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistConstructorDeclaration.java <51:19 51:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getName() -> java.lang.Override [JavassistConstructorDeclaration.java <50:6 50:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getName() -> java.lang.String [JavassistConstructorDeclaration.java <51:12 51:17>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<51:29> [JavassistConstructorDeclaration.java <51:29 51:29>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<51:29> [JavassistConstructorDeclaration.java <53:5 53:5>]
@@ -93,6 +95,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isField() [JavassistConstructorDeclaration.java <55:5 <55:5  <56:20 56:26> 56:28> 58:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavassistConstructorDeclaration.java <56:20 56:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isField() -> java.lang.Override [JavassistConstructorDeclaration.java <55:6 55:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isField() -> boolean [JavassistConstructorDeclaration.java <56:12 56:18>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<56:30> [JavassistConstructorDeclaration.java <56:30 56:30>]
@@ -100,18 +103,21 @@ LOCAL_SYMBOL: JavassistConstructorDeclaration.java<56:30> [JavassistConstructorD
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isParameter() [JavassistConstructorDeclaration.java <60:5 <60:5  <61:20 61:30> 61:32> 63:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavassistConstructorDeclaration.java <61:20 61:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isParameter() -> java.lang.Override [JavassistConstructorDeclaration.java <60:6 60:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isParameter() -> boolean [JavassistConstructorDeclaration.java <61:12 61:18>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<61:34> [JavassistConstructorDeclaration.java <61:34 61:34>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<61:34> [JavassistConstructorDeclaration.java <63:5 63:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isType() [JavassistConstructorDeclaration.java <65:5 <65:5  <66:20 66:25> 66:27> 68:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavassistConstructorDeclaration.java <66:20 66:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isType() -> java.lang.Override [JavassistConstructorDeclaration.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.isType() -> boolean [JavassistConstructorDeclaration.java <66:12 66:18>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<66:29> [JavassistConstructorDeclaration.java <66:29 66:29>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<66:29> [JavassistConstructorDeclaration.java <68:5 68:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.declaringType() [JavassistConstructorDeclaration.java <70:5 <70:5  <71:29 71:41> 71:43> 73:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() [JavassistConstructorDeclaration.java <71:29 71:41>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.declaringType() -> java.lang.Override [JavassistConstructorDeclaration.java <70:6 70:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration [JavassistConstructorDeclaration.java <71:12 71:27>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<71:45> [JavassistConstructorDeclaration.java <71:45 71:45>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<71:45> [JavassistConstructorDeclaration.java <73:5 73:5>]
@@ -125,6 +131,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDecla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getNumberOfParams() [JavassistConstructorDeclaration.java <75:5 <75:5  <76:16 76:32> 76:34> 82:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [JavassistConstructorDeclaration.java <76:16 76:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getNumberOfParams() -> java.lang.Override [JavassistConstructorDeclaration.java <75:6 75:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getNumberOfParams() -> int [JavassistConstructorDeclaration.java <76:12 76:14>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<76:36> [JavassistConstructorDeclaration.java <76:36 76:36>]
@@ -147,6 +154,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistConstru
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getParam(int) [JavassistConstructorDeclaration.java <84:5 <84:5  <85:33 85:40> 85:47> 103:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [JavassistConstructorDeclaration.java <85:33 85:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getParam(int) -> java.lang.Override [JavassistConstructorDeclaration.java <84:6 84:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [JavassistConstructorDeclaration.java <85:12 85:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getParam(int) -> int [JavassistConstructorDeclaration.java <85:42 85:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getParam<0> [JavassistConstructorDeclaration.java <85:46 85:46>]
@@ -227,6 +235,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistConstru
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getTypeParameters() [JavassistConstructorDeclaration.java <105:5 <105:5  <106:43 106:59> 106:61> 116:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavassistConstructorDeclaration.java <106:43 106:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getTypeParameters() -> java.lang.Override [JavassistConstructorDeclaration.java <105:6 105:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getTypeParameters() -> java.util.List<E> [JavassistConstructorDeclaration.java <106:12 106:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavassistConstructorDeclaration.java <106:17 106:40>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<106:63> [JavassistConstructorDeclaration.java <106:63 106:63>]
@@ -276,6 +285,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistConstru
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.accessLevel() [JavassistConstructorDeclaration.java <118:5 <118:5  <119:24 119:34> 119:36> 121:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavassistConstructorDeclaration.java <119:24 119:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.accessLevel() -> java.lang.Override [JavassistConstructorDeclaration.java <118:6 118:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavassistConstructorDeclaration.java <119:12 119:22>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<119:38> [JavassistConstructorDeclaration.java <119:38 119:38>]
 LOCAL_SYMBOL: JavassistConstructorDeclaration.java<119:38> [JavassistConstructorDeclaration.java <121:5 121:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistEnumDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistEnumDeclaration.txt
index ceb3041f..a2a4bb82 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistEnumDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistEnumDeclaration.txt
@@ -169,6 +169,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.accessLevel() [JavassistEnumDeclaration.java <61:5 <61:5  <62:24 62:34> 62:36> 64:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavassistEnumDeclaration.java <62:24 62:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.accessLevel() -> java.lang.Override [JavassistEnumDeclaration.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavassistEnumDeclaration.java <62:12 62:22>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<62:38> [JavassistEnumDeclaration.java <62:38 62:38>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<62:38> [JavassistEnumDeclaration.java <64:5 64:5>]
@@ -181,6 +182,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getPackageName() [JavassistEnumDeclaration.java <66:5 <66:5  <67:19 67:32> 67:34> 69:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavassistEnumDeclaration.java <67:19 67:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getPackageName() -> java.lang.Override [JavassistEnumDeclaration.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getPackageName() -> java.lang.String [JavassistEnumDeclaration.java <67:12 67:17>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<67:36> [JavassistEnumDeclaration.java <67:36 67:36>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<67:36> [JavassistEnumDeclaration.java <69:5 69:5>]
@@ -190,6 +192,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getClassName() [JavassistEnumDeclaration.java <71:5 <71:5  <72:19 72:30> 72:32> 78:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavassistEnumDeclaration.java <72:19 72:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getClassName() -> java.lang.Override [JavassistEnumDeclaration.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getClassName() -> java.lang.String [JavassistEnumDeclaration.java <72:12 72:17>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<72:34> [JavassistEnumDeclaration.java <72:34 72:34>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<72:34> [JavassistEnumDeclaration.java <78:5 78:5>]
@@ -216,6 +219,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getQualifiedName() [JavassistEnumDeclaration.java <80:5 <80:5  <81:19 81:34> 81:36> 83:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavassistEnumDeclaration.java <81:19 81:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getQualifiedName() -> java.lang.Override [JavassistEnumDeclaration.java <80:6 80:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getQualifiedName() -> java.lang.String [JavassistEnumDeclaration.java <81:12 81:17>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<81:38> [JavassistEnumDeclaration.java <81:38 81:38>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<81:38> [JavassistEnumDeclaration.java <83:5 83:5>]
@@ -225,6 +229,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAncestors() [JavassistEnumDeclaration.java <85:5 <85:5  <86:32 86:43> 86:45> 113:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavassistEnumDeclaration.java <86:32 86:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAncestors() -> java.lang.Override [JavassistEnumDeclaration.java <85:6 85:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAncestors() -> java.util.List<E> [JavassistEnumDeclaration.java <86:12 86:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistEnumDeclaration.java <86:17 86:29>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<86:47> [JavassistEnumDeclaration.java <86:47 86:47>]
@@ -298,6 +303,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getField(java.lang.String) [JavassistEnumDeclaration.java <115:5 <115:5  <116:29 116:36> 116:49> 120:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String) [JavassistEnumDeclaration.java <116:29 116:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getField(java.lang.String) -> java.lang.Override [JavassistEnumDeclaration.java <115:6 115:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavassistEnumDeclaration.java <116:12 116:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getField(java.lang.String) -> java.lang.String [JavassistEnumDeclaration.java <116:38 116:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getField<0> [JavassistEnumDeclaration.java <116:45 116:48>]
@@ -334,6 +340,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDecla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasField(java.lang.String) [JavassistEnumDeclaration.java <122:5 <122:5  <123:20 123:27> 123:40> 125:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasField(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String) [JavassistEnumDeclaration.java <123:20 123:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasField(java.lang.String) -> java.lang.Override [JavassistEnumDeclaration.java <122:6 122:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasField(java.lang.String) -> boolean [JavassistEnumDeclaration.java <123:12 123:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasField(java.lang.String) -> java.lang.String [JavassistEnumDeclaration.java <123:29 123:34>]
@@ -353,6 +360,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAllFields() [JavassistEnumDeclaration.java <127:5 <127:5  <128:35 128:46> 128:48> 130:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavassistEnumDeclaration.java <128:35 128:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAllFields() -> java.lang.Override [JavassistEnumDeclaration.java <127:6 127:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAllFields() -> java.util.List<E> [JavassistEnumDeclaration.java <128:12 128:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavassistEnumDeclaration.java <128:17 128:32>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<128:50> [JavassistEnumDeclaration.java <128:50 128:50>]
@@ -362,6 +370,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getDeclaredMethods() [JavassistEnumDeclaration.java <132:5 <132:5  <133:35 133:52> 133:54> 135:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavassistEnumDeclaration.java <133:35 133:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getDeclaredMethods() -> java.lang.Override [JavassistEnumDeclaration.java <132:6 132:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavassistEnumDeclaration.java <133:12 133:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavassistEnumDeclaration.java <133:16 133:32>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<133:56> [JavassistEnumDeclaration.java <133:56 133:56>]
@@ -372,6 +381,7 @@ REFERENCE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarati
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavassistEnumDeclaration.java <137:5 <137:5  <138:20 138:33> 138:44> 140:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavassistEnumDeclaration.java <138:20 138:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavassistEnumDeclaration.java <137:6 137:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavassistEnumDeclaration.java <138:12 138:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavassistEnumDeclaration.java <138:35 138:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy<0> [JavassistEnumDeclaration.java <138:40 138:43>]
@@ -383,6 +393,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavassistEnumDeclaration.java <142:5 <142:5  <143:20 143:33> 143:65> 145:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavassistEnumDeclaration.java <143:20 143:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavassistEnumDeclaration.java <142:6 142:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavassistEnumDeclaration.java <143:12 143:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistEnumDeclaration.java <143:35 143:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.isAssignableBy<0> [JavassistEnumDeclaration.java <143:60 143:64>]
@@ -393,6 +404,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation(java.lang.String) [JavassistEnumDeclaration.java <147:5 <147:5  <148:20 148:40> 148:62> 150:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavassistEnumDeclaration.java <148:20 148:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavassistEnumDeclaration.java <147:6 147:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavassistEnumDeclaration.java <148:12 148:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavassistEnumDeclaration.java <148:42 148:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation<0> [JavassistEnumDeclaration.java <148:49 148:61>]
@@ -402,6 +414,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.javassistmodel.Javassi
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.UnsupportedOperationException [JavassistEnumDeclaration.java <149:19 149:47>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getName() [JavassistEnumDeclaration.java <152:5 <152:5  <153:19 153:25> 153:27> 156:5>]
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistEnumDeclaration.java <153:19 153:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getName() -> java.lang.Override [JavassistEnumDeclaration.java <152:6 152:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getName() -> java.lang.String [JavassistEnumDeclaration.java <153:12 153:17>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<153:29> [JavassistEnumDeclaration.java <153:29 153:29>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<153:29> [JavassistEnumDeclaration.java <156:5 156:5>]
@@ -420,6 +433,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getTypeParameters() [JavassistEnumDeclaration.java <158:5 <158:5  <159:43 159:59> 159:61> 161:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavassistEnumDeclaration.java <159:43 159:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getTypeParameters() -> java.lang.Override [JavassistEnumDeclaration.java <158:6 158:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getTypeParameters() -> java.util.List<E> [JavassistEnumDeclaration.java <159:12 159:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavassistEnumDeclaration.java <159:17 159:40>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<159:63> [JavassistEnumDeclaration.java <159:63 159:63>]
@@ -430,6 +444,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.containerType() [JavassistEnumDeclaration.java <163:5 <163:5  <164:47 164:59> 164:61> 166:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavassistEnumDeclaration.java <164:47 164:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.containerType() -> java.lang.Override [JavassistEnumDeclaration.java <163:6 163:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.containerType() -> java.util.Optional<T> [JavassistEnumDeclaration.java <164:12 164:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistEnumDeclaration.java <164:21 164:44>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<164:63> [JavassistEnumDeclaration.java <164:63 164:63>]
@@ -588,6 +603,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.internalTypes() [JavassistEnumDeclaration.java <198:5 <198:5  <199:42 199:54> 199:56> 209:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavassistEnumDeclaration.java <199:42 199:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.internalTypes() -> java.lang.Override [JavassistEnumDeclaration.java <198:6 198:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.internalTypes() -> java.util.Set<E> [JavassistEnumDeclaration.java <199:12 199:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistEnumDeclaration.java <199:16 199:39>]
 LOCAL_SYMBOL: JavassistEnumDeclaration.java<199:58> [JavassistEnumDeclaration.java <199:58 199:58>]
@@ -623,6 +639,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getInternalType(java.lang.String) [JavassistEnumDeclaration.java <211:5 <211:5  <212:37 212:51> 212:64> 221:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getInternalType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType(java.lang.String) [JavassistEnumDeclaration.java <212:37 212:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getInternalType(java.lang.String) -> java.lang.Override [JavassistEnumDeclaration.java <211:6 211:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getInternalType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistEnumDeclaration.java <212:12 212:35>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getInternalType(java.lang.String) -> java.lang.String [JavassistEnumDeclaration.java <212:53 212:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.getInternalType<0> [JavassistEnumDeclaration.java <212:60 212:63>]
@@ -652,6 +669,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasInternalType(java.lang.String) [JavassistEnumDeclaration.java <223:5 <223:5  <224:20 224:34> 224:47> 230:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasInternalType(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType(java.lang.String) [JavassistEnumDeclaration.java <224:20 224:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasInternalType(java.lang.String) -> java.lang.Override [JavassistEnumDeclaration.java <223:6 223:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasInternalType(java.lang.String) -> boolean [JavassistEnumDeclaration.java <224:12 224:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasInternalType(java.lang.String) -> java.lang.String [JavassistEnumDeclaration.java <224:36 224:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.hasInternalType<0> [JavassistEnumDeclaration.java <224:43 224:46>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistFieldDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistFieldDeclaration.txt
index 1aff0d70..65b2cc2f 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistFieldDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistFieldDeclaration.txt
@@ -83,6 +83,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDe
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getType() [JavassistFieldDeclaration.java <41:5 <41:5  <42:17 42:23> 42:25> 48:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [JavassistFieldDeclaration.java <42:17 42:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getType() -> java.lang.Override [JavassistFieldDeclaration.java <41:6 41:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavassistFieldDeclaration.java <42:12 42:15>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<42:27> [JavassistFieldDeclaration.java <42:27 42:27>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<42:27> [JavassistFieldDeclaration.java <48:5 48:5>]
@@ -106,6 +107,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDe
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isStatic() [JavassistFieldDeclaration.java <50:5 <50:5  <51:20 51:27> 51:29> 53:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isStatic() [JavassistFieldDeclaration.java <51:20 51:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isStatic() -> java.lang.Override [JavassistFieldDeclaration.java <50:6 50:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isStatic() -> boolean [JavassistFieldDeclaration.java <51:12 51:18>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<51:31> [JavassistFieldDeclaration.java <51:31 51:31>]
@@ -119,6 +121,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getName() [JavassistFieldDeclaration.java <55:5 <55:5  <56:19 56:25> 56:27> 58:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistFieldDeclaration.java <56:19 56:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getName() -> java.lang.Override [JavassistFieldDeclaration.java <55:6 55:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.getName() -> java.lang.String [JavassistFieldDeclaration.java <56:12 56:17>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<56:29> [JavassistFieldDeclaration.java <56:29 56:29>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<56:29> [JavassistFieldDeclaration.java <58:5 58:5>]
@@ -128,24 +131,28 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isField() [JavassistFieldDeclaration.java <60:5 <60:5  <61:20 61:26> 61:28> 63:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() [JavassistFieldDeclaration.java <61:20 61:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isField() -> java.lang.Override [JavassistFieldDeclaration.java <60:6 60:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isField() -> boolean [JavassistFieldDeclaration.java <61:12 61:18>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<61:30> [JavassistFieldDeclaration.java <61:30 61:30>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<61:30> [JavassistFieldDeclaration.java <63:5 63:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isParameter() [JavassistFieldDeclaration.java <65:5 <65:5  <66:20 66:30> 66:32> 68:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavassistFieldDeclaration.java <66:20 66:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isParameter() -> java.lang.Override [JavassistFieldDeclaration.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isParameter() -> boolean [JavassistFieldDeclaration.java <66:12 66:18>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<66:34> [JavassistFieldDeclaration.java <66:34 66:34>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<66:34> [JavassistFieldDeclaration.java <68:5 68:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isType() [JavassistFieldDeclaration.java <70:5 <70:5  <71:20 71:25> 71:27> 73:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavassistFieldDeclaration.java <71:20 71:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isType() -> java.lang.Override [JavassistFieldDeclaration.java <70:6 70:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.isType() -> boolean [JavassistFieldDeclaration.java <71:12 71:18>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<71:29> [JavassistFieldDeclaration.java <71:29 71:29>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<71:29> [JavassistFieldDeclaration.java <73:5 73:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.accessLevel() [JavassistFieldDeclaration.java <75:5 <75:5  <76:24 76:34> 76:36> 78:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavassistFieldDeclaration.java <76:24 76:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.accessLevel() -> java.lang.Override [JavassistFieldDeclaration.java <75:6 75:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavassistFieldDeclaration.java <76:12 76:22>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<76:38> [JavassistFieldDeclaration.java <76:38 76:38>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<76:38> [JavassistFieldDeclaration.java <78:5 78:5>]
@@ -157,6 +164,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.declaringType() [JavassistFieldDeclaration.java <80:5 <80:5  <81:28 81:40> 81:42> 83:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.declaringType() [JavassistFieldDeclaration.java <81:28 81:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.declaringType() -> java.lang.Override [JavassistFieldDeclaration.java <80:6 80:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistFieldDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [JavassistFieldDeclaration.java <81:12 81:26>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<81:44> [JavassistFieldDeclaration.java <81:44 81:44>]
 LOCAL_SYMBOL: JavassistFieldDeclaration.java<81:44> [JavassistFieldDeclaration.java <83:5 83:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistInterfaceDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistInterfaceDeclaration.txt
index d8804ce6..19ad54a9 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistInterfaceDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistInterfaceDeclaration.txt
@@ -138,6 +138,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.javassistmodel.Javassist
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.toString() [JavassistInterfaceDeclaration.java <51:5 <51:5  <52:19 52:26> 52:28> 57:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavassistInterfaceDeclaration.java <52:19 52:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.toString() -> java.lang.Override [JavassistInterfaceDeclaration.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.toString() -> java.lang.String [JavassistInterfaceDeclaration.java <52:12 52:17>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<52:30> [JavassistInterfaceDeclaration.java <52:30 52:30>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<52:30> [JavassistInterfaceDeclaration.java <57:5 57:5>]
@@ -181,6 +182,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInterfacesExtended() [JavassistInterfaceDeclaration.java <68:5 <68:5  <69:32 69:52> 69:54> 76:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.getInterfacesExtended()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInterfacesExtended() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.getInterfacesExtended() [JavassistInterfaceDeclaration.java <69:32 69:52>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInterfacesExtended() -> java.lang.Override [JavassistInterfaceDeclaration.java <68:6 68:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInterfacesExtended() -> java.util.List<E> [JavassistInterfaceDeclaration.java <69:12 69:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInterfacesExtended() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistInterfaceDeclaration.java <69:17 69:29>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<69:56> [JavassistInterfaceDeclaration.java <69:56 69:56>]
@@ -224,6 +226,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getPackageName() [JavassistInterfaceDeclaration.java <78:5 <78:5  <79:19 79:32> 79:34> 81:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [JavassistInterfaceDeclaration.java <79:19 79:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getPackageName() -> java.lang.Override [JavassistInterfaceDeclaration.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getPackageName() -> java.lang.String [JavassistInterfaceDeclaration.java <79:12 79:17>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<79:36> [JavassistInterfaceDeclaration.java <79:36 79:36>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<79:36> [JavassistInterfaceDeclaration.java <81:5 81:5>]
@@ -233,6 +236,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getClassName() [JavassistInterfaceDeclaration.java <83:5 <83:5  <84:19 84:30> 84:32> 90:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [JavassistInterfaceDeclaration.java <84:19 84:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getClassName() -> java.lang.Override [JavassistInterfaceDeclaration.java <83:6 83:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getClassName() -> java.lang.String [JavassistInterfaceDeclaration.java <84:12 84:17>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<84:34> [JavassistInterfaceDeclaration.java <84:34 84:34>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<84:34> [JavassistInterfaceDeclaration.java <90:5 90:5>]
@@ -258,6 +262,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getQualifiedName() [JavassistInterfaceDeclaration.java <92:5 <92:5  <93:19 93:34> 93:36> 95:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [JavassistInterfaceDeclaration.java <93:19 93:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getQualifiedName() -> java.lang.Override [JavassistInterfaceDeclaration.java <92:6 92:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getQualifiedName() -> java.lang.String [JavassistInterfaceDeclaration.java <93:12 93:17>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<93:38> [JavassistInterfaceDeclaration.java <93:38 93:38>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<93:38> [JavassistInterfaceDeclaration.java <95:5 95:5>]
@@ -265,6 +270,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javassistmode
 REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getQualifiedName() -> java.lang.String javassist.CtClass.getName() [JavassistInterfaceDeclaration.java <94:24 94:30>]
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getQualifiedName() -> javassist.CtClass com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.ctClass [JavassistInterfaceDeclaration.java <94:16 94:22>]
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) [JavassistInterfaceDeclaration.java <97:5 <97:5  <98:34 98:51> 99:110> 102:5>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Deprecated [JavassistInterfaceDeclaration.java <97:6 97:15>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.util.Optional<T> [JavassistInterfaceDeclaration.java <98:12 98:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.methods.MethodUsage [JavassistInterfaceDeclaration.java <98:21 98:31>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver, com.github.javaparser.symbolsolver.core.resolution.Context, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.String [JavassistInterfaceDeclaration.java <98:53 98:58>]
@@ -290,6 +296,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage<2> [JavassistInterfaceDeclaration.java <101:77 101:86>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethodAsUsage<3> [JavassistInterfaceDeclaration.java <101:89 101:105>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) [JavassistInterfaceDeclaration.java <104:5 <104:5  <105:47 105:57> 105:117> 140:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.Deprecated [JavassistInterfaceDeclaration.java <104:6 104:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavassistInterfaceDeclaration.java <105:12 105:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavassistInterfaceDeclaration.java <105:28 105:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.String [JavassistInterfaceDeclaration.java <105:59 105:64>]
@@ -453,6 +460,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolRefere
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavassistInterfaceDeclaration.java <142:5 <142:5  <143:20 143:33> 143:44> 145:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [JavassistInterfaceDeclaration.java <143:20 143:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [JavassistInterfaceDeclaration.java <142:6 142:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [JavassistInterfaceDeclaration.java <143:12 143:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavassistInterfaceDeclaration.java <143:35 143:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy<0> [JavassistInterfaceDeclaration.java <143:40 143:43>]
@@ -464,6 +472,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAllFields() [JavassistInterfaceDeclaration.java <147:5 <147:5  <148:35 148:46> 148:48> 150:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavassistInterfaceDeclaration.java <148:35 148:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAllFields() -> java.lang.Override [JavassistInterfaceDeclaration.java <147:6 147:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAllFields() -> java.util.List<E> [JavassistInterfaceDeclaration.java <148:12 148:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavassistInterfaceDeclaration.java <148:17 148:32>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<148:50> [JavassistInterfaceDeclaration.java <148:50 148:50>]
@@ -474,6 +483,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavassistInterfaceDeclaration.java <152:5 <152:5  <153:20 153:33> 153:65> 155:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [JavassistInterfaceDeclaration.java <153:20 153:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [JavassistInterfaceDeclaration.java <152:6 152:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [JavassistInterfaceDeclaration.java <153:12 153:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistInterfaceDeclaration.java <153:35 153:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.isAssignableBy<0> [JavassistInterfaceDeclaration.java <153:60 153:64>]
@@ -484,6 +494,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAncestors() [JavassistInterfaceDeclaration.java <157:5 <157:5  <158:32 158:43> 158:45> 172:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [JavassistInterfaceDeclaration.java <158:32 158:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAncestors() -> java.lang.Override [JavassistInterfaceDeclaration.java <157:6 157:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAncestors() -> java.util.List<E> [JavassistInterfaceDeclaration.java <158:12 158:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [JavassistInterfaceDeclaration.java <158:17 158:29>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<158:47> [JavassistInterfaceDeclaration.java <158:47 158:47>]
@@ -550,6 +561,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getDeclaredMethods() [JavassistInterfaceDeclaration.java <174:5 <174:5  <175:35 175:52> 175:54> 179:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavassistInterfaceDeclaration.java <175:35 175:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getDeclaredMethods() -> java.lang.Override [JavassistInterfaceDeclaration.java <174:6 174:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getDeclaredMethods() -> java.util.Set<E> [JavassistInterfaceDeclaration.java <175:12 175:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [JavassistInterfaceDeclaration.java <175:16 175:32>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<175:56> [JavassistInterfaceDeclaration.java <175:56 175:56>]
@@ -571,6 +583,7 @@ QUALIFIER: java.util.stream.Collectors [JavassistInterfaceDeclaration.java <178:
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) [JavassistInterfaceDeclaration.java <181:5 <181:5  <182:20 182:40> 182:62> 196:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [JavassistInterfaceDeclaration.java <182:20 182:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [JavassistInterfaceDeclaration.java <181:6 181:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [JavassistInterfaceDeclaration.java <182:12 182:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [JavassistInterfaceDeclaration.java <182:42 182:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasDirectlyAnnotation<0> [JavassistInterfaceDeclaration.java <182:49 182:61>]
@@ -618,6 +631,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getName() [JavassistInterfaceDeclaration.java <198:5 <198:5  <199:19 199:25> 199:27> 202:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistInterfaceDeclaration.java <199:19 199:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getName() -> java.lang.Override [JavassistInterfaceDeclaration.java <198:6 198:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getName() -> java.lang.String [JavassistInterfaceDeclaration.java <199:12 199:17>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<199:29> [JavassistInterfaceDeclaration.java <199:29 199:29>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<199:29> [JavassistInterfaceDeclaration.java <202:5 202:5>]
@@ -636,6 +650,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getTypeParameters() [JavassistInterfaceDeclaration.java <204:5 <204:5  <205:43 205:59> 205:61> 207:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavassistInterfaceDeclaration.java <205:43 205:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getTypeParameters() -> java.lang.Override [JavassistInterfaceDeclaration.java <204:6 204:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getTypeParameters() -> java.util.List<E> [JavassistInterfaceDeclaration.java <205:12 205:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavassistInterfaceDeclaration.java <205:17 205:40>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<205:63> [JavassistInterfaceDeclaration.java <205:63 205:63>]
@@ -646,6 +661,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.accessLevel() [JavassistInterfaceDeclaration.java <209:5 <209:5  <210:24 210:34> 210:36> 212:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavassistInterfaceDeclaration.java <210:24 210:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.accessLevel() -> java.lang.Override [JavassistInterfaceDeclaration.java <209:6 209:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavassistInterfaceDeclaration.java <210:12 210:22>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<210:38> [JavassistInterfaceDeclaration.java <210:38 210:38>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<210:38> [JavassistInterfaceDeclaration.java <212:5 212:5>]
@@ -658,10 +674,12 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.asInterface() [JavassistInterfaceDeclaration.java <214:5 <214:5  <215:33 215:43> 215:45> 217:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asInterface()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.asInterface() -> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asInterface() [JavassistInterfaceDeclaration.java <215:33 215:43>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.asInterface() -> java.lang.Override [JavassistInterfaceDeclaration.java <214:6 214:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.asInterface() -> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration [JavassistInterfaceDeclaration.java <215:12 215:31>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<215:47> [JavassistInterfaceDeclaration.java <215:47 215:47>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<215:47> [JavassistInterfaceDeclaration.java <217:5 217:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavassistInterfaceDeclaration.java <220:5 <220:5  <221:56 221:66> 221:102> 240:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Deprecated [JavassistInterfaceDeclaration.java <220:6 220:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavassistInterfaceDeclaration.java <221:12 221:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [JavassistInterfaceDeclaration.java <221:38 221:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [JavassistInterfaceDeclaration.java <221:68 221:73>]
@@ -730,6 +748,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolR
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.containerType() [JavassistInterfaceDeclaration.java <242:5 <242:5  <243:47 243:59> 243:61> 245:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavassistInterfaceDeclaration.java <243:47 243:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.containerType() -> java.lang.Override [JavassistInterfaceDeclaration.java <242:6 242:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.containerType() -> java.util.Optional<T> [JavassistInterfaceDeclaration.java <243:12 243:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistInterfaceDeclaration.java <243:21 243:44>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<243:63> [JavassistInterfaceDeclaration.java <243:63 243:63>]
@@ -740,6 +759,7 @@ REFERENCE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.decl
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.internalTypes() [JavassistInterfaceDeclaration.java <247:5 <247:5  <248:42 248:54> 248:56> 258:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [JavassistInterfaceDeclaration.java <248:42 248:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.internalTypes() -> java.lang.Override [JavassistInterfaceDeclaration.java <247:6 247:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.internalTypes() -> java.util.Set<E> [JavassistInterfaceDeclaration.java <248:12 248:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistInterfaceDeclaration.java <248:16 248:39>]
 LOCAL_SYMBOL: JavassistInterfaceDeclaration.java<248:58> [JavassistInterfaceDeclaration.java <248:58 248:58>]
@@ -771,6 +791,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInternalType(java.lang.String) [JavassistInterfaceDeclaration.java <260:5 <260:5  <261:37 261:51> 261:64> 270:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInternalType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType(java.lang.String) [JavassistInterfaceDeclaration.java <261:37 261:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInternalType(java.lang.String) -> java.lang.Override [JavassistInterfaceDeclaration.java <260:6 260:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInternalType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistInterfaceDeclaration.java <261:12 261:35>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInternalType(java.lang.String) -> java.lang.String [JavassistInterfaceDeclaration.java <261:53 261:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.getInternalType<0> [JavassistInterfaceDeclaration.java <261:60 261:63>]
@@ -802,6 +823,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfa
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasInternalType(java.lang.String) [JavassistInterfaceDeclaration.java <272:5 <272:5  <273:20 273:34> 273:47> 279:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasInternalType(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType(java.lang.String) [JavassistInterfaceDeclaration.java <273:20 273:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasInternalType(java.lang.String) -> java.lang.Override [JavassistInterfaceDeclaration.java <272:6 272:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasInternalType(java.lang.String) -> boolean [JavassistInterfaceDeclaration.java <273:12 273:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasInternalType(java.lang.String) -> java.lang.String [JavassistInterfaceDeclaration.java <273:36 273:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration.hasInternalType<0> [JavassistInterfaceDeclaration.java <273:43 273:46>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistMethodDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistMethodDeclaration.txt
index 326c83ca..be4b73d9 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistMethodDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistMethodDeclaration.txt
@@ -120,6 +120,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodD
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isDefaultMethod() [JavassistMethodDeclaration.java <49:5 <49:5  <50:20 50:34> 50:36> 52:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isDefaultMethod() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod() [JavassistMethodDeclaration.java <50:20 50:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isDefaultMethod() -> java.lang.Override [JavassistMethodDeclaration.java <49:6 49:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isDefaultMethod() -> boolean [JavassistMethodDeclaration.java <50:12 50:18>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<50:38> [JavassistMethodDeclaration.java <50:38 50:38>]
@@ -134,6 +135,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.javassistmodel.Javassi
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isStatic() [JavassistMethodDeclaration.java <54:5 <54:5  <55:20 55:27> 55:29> 57:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic() [JavassistMethodDeclaration.java <55:20 55:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isStatic() -> java.lang.Override [JavassistMethodDeclaration.java <54:6 54:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isStatic() -> boolean [JavassistMethodDeclaration.java <55:12 55:18>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<55:31> [JavassistMethodDeclaration.java <55:31 55:31>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<55:31> [JavassistMethodDeclaration.java <57:5 57:5>]
@@ -146,6 +148,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.toString() [JavassistMethodDeclaration.java <59:5 <59:5  <60:19 60:26> 60:28> 64:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavassistMethodDeclaration.java <60:19 60:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.toString() -> java.lang.Override [JavassistMethodDeclaration.java <59:6 59:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.toString() -> java.lang.String [JavassistMethodDeclaration.java <60:12 60:17>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<60:30> [JavassistMethodDeclaration.java <60:30 60:30>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<60:30> [JavassistMethodDeclaration.java <64:5 64:5>]
@@ -153,6 +156,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getName() [JavassistMethodDeclaration.java <66:5 <66:5  <67:19 67:25> 67:27> 69:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistMethodDeclaration.java <67:19 67:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getName() -> java.lang.Override [JavassistMethodDeclaration.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getName() -> java.lang.String [JavassistMethodDeclaration.java <67:12 67:17>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<67:29> [JavassistMethodDeclaration.java <67:29 67:29>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<67:29> [JavassistMethodDeclaration.java <69:5 69:5>]
@@ -162,24 +166,28 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isField() [JavassistMethodDeclaration.java <71:5 <71:5  <72:20 72:26> 72:28> 74:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavassistMethodDeclaration.java <72:20 72:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isField() -> java.lang.Override [JavassistMethodDeclaration.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isField() -> boolean [JavassistMethodDeclaration.java <72:12 72:18>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<72:30> [JavassistMethodDeclaration.java <72:30 72:30>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<72:30> [JavassistMethodDeclaration.java <74:5 74:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isParameter() [JavassistMethodDeclaration.java <76:5 <76:5  <77:20 77:30> 77:32> 79:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [JavassistMethodDeclaration.java <77:20 77:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isParameter() -> java.lang.Override [JavassistMethodDeclaration.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isParameter() -> boolean [JavassistMethodDeclaration.java <77:12 77:18>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<77:34> [JavassistMethodDeclaration.java <77:34 77:34>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<77:34> [JavassistMethodDeclaration.java <79:5 79:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isType() [JavassistMethodDeclaration.java <81:5 <81:5  <82:20 82:25> 82:27> 84:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavassistMethodDeclaration.java <82:20 82:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isType() -> java.lang.Override [JavassistMethodDeclaration.java <81:6 81:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isType() -> boolean [JavassistMethodDeclaration.java <82:12 82:18>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<82:29> [JavassistMethodDeclaration.java <82:29 82:29>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<82:29> [JavassistMethodDeclaration.java <84:5 84:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.declaringType() [JavassistMethodDeclaration.java <86:5 <86:5  <87:37 87:49> 87:51> 93:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType() [JavassistMethodDeclaration.java <87:37 87:49>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.declaringType() -> java.lang.Override [JavassistMethodDeclaration.java <86:6 86:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistMethodDeclaration.java <87:12 87:35>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<87:53> [JavassistMethodDeclaration.java <87:53 87:53>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<87:53> [JavassistMethodDeclaration.java <93:5 93:5>]
@@ -205,6 +213,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceT
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getReturnType() [JavassistMethodDeclaration.java <95:5 <95:5  <96:17 96:29> 96:31> 102:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType() [JavassistMethodDeclaration.java <96:17 96:29>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getReturnType() -> java.lang.Override [JavassistMethodDeclaration.java <95:6 95:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavassistMethodDeclaration.java <96:12 96:15>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<96:33> [JavassistMethodDeclaration.java <96:33 96:33>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<96:33> [JavassistMethodDeclaration.java <102:5 102:5>]
@@ -228,6 +237,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodD
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getNumberOfParams() [JavassistMethodDeclaration.java <105:5 <105:5  <106:16 106:32> 106:34> 112:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [JavassistMethodDeclaration.java <106:16 106:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getNumberOfParams() -> java.lang.Override [JavassistMethodDeclaration.java <105:6 105:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getNumberOfParams() -> int [JavassistMethodDeclaration.java <106:12 106:14>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<106:36> [JavassistMethodDeclaration.java <106:36 106:36>]
@@ -249,6 +259,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodD
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getParam(int) [JavassistMethodDeclaration.java <114:5 <114:5  <115:33 115:40> 115:47> 133:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [JavassistMethodDeclaration.java <115:33 115:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getParam(int) -> java.lang.Override [JavassistMethodDeclaration.java <114:6 114:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [JavassistMethodDeclaration.java <115:12 115:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getParam(int) -> int [JavassistMethodDeclaration.java <115:42 115:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getParam<0> [JavassistMethodDeclaration.java <115:46 115:46>]
@@ -354,6 +365,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodD
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isAbstract() [JavassistMethodDeclaration.java <143:5 <143:5  <144:20 144:29> 144:31> 146:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isAbstract() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract() [JavassistMethodDeclaration.java <144:20 144:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isAbstract() -> java.lang.Override [JavassistMethodDeclaration.java <143:6 143:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.isAbstract() -> boolean [JavassistMethodDeclaration.java <144:12 144:18>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<144:33> [JavassistMethodDeclaration.java <144:33 144:33>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<144:33> [JavassistMethodDeclaration.java <146:5 146:5>]
@@ -365,6 +377,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getTypeParameters() [JavassistMethodDeclaration.java <148:5 <148:5  <149:43 149:59> 149:61> 159:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [JavassistMethodDeclaration.java <149:43 149:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getTypeParameters() -> java.lang.Override [JavassistMethodDeclaration.java <148:6 148:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getTypeParameters() -> java.util.List<E> [JavassistMethodDeclaration.java <149:12 149:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavassistMethodDeclaration.java <149:17 149:40>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<149:63> [JavassistMethodDeclaration.java <149:63 149:63>]
@@ -414,6 +427,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodD
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.accessLevel() [JavassistMethodDeclaration.java <161:5 <161:5  <162:24 162:34> 162:36> 164:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [JavassistMethodDeclaration.java <162:24 162:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.accessLevel() -> java.lang.Override [JavassistMethodDeclaration.java <161:6 161:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [JavassistMethodDeclaration.java <162:12 162:22>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<162:38> [JavassistMethodDeclaration.java <162:38 162:38>]
 LOCAL_SYMBOL: JavassistMethodDeclaration.java<162:38> [JavassistMethodDeclaration.java <164:5 164:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistParameterDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistParameterDeclaration.txt
index 727f43a4..6f69424a 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistParameterDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistParameterDeclaration.txt
@@ -89,6 +89,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistParamet
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.toString() [JavassistParameterDeclaration.java <42:5 <42:5  <43:19 43:26> 43:28> 49:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.toString() -> java.lang.String java.lang.Object.toString() [JavassistParameterDeclaration.java <43:19 43:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.toString() -> java.lang.Override [JavassistParameterDeclaration.java <42:6 42:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.toString() -> java.lang.String [JavassistParameterDeclaration.java <43:12 43:17>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<43:30> [JavassistParameterDeclaration.java <43:30 43:30>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<43:30> [JavassistParameterDeclaration.java <49:5 49:5>]
@@ -98,6 +99,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getName() [JavassistParameterDeclaration.java <51:5 <51:5  <52:19 52:25> 52:27> 54:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [JavassistParameterDeclaration.java <52:19 52:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getName() -> java.lang.Override [JavassistParameterDeclaration.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getName() -> java.lang.String [JavassistParameterDeclaration.java <52:12 52:17>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<52:29> [JavassistParameterDeclaration.java <52:29 52:29>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<52:29> [JavassistParameterDeclaration.java <54:5 54:5>]
@@ -107,6 +109,7 @@ REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassi
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isField() [JavassistParameterDeclaration.java <56:5 <56:5  <57:20 57:26> 57:28> 59:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [JavassistParameterDeclaration.java <57:20 57:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isField() -> java.lang.Override [JavassistParameterDeclaration.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isField() -> boolean [JavassistParameterDeclaration.java <57:12 57:18>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<57:30> [JavassistParameterDeclaration.java <57:30 57:30>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<57:30> [JavassistParameterDeclaration.java <59:5 59:5>]
@@ -115,6 +118,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isParameter() [JavassistParameterDeclaration.java <61:5 <61:5  <62:20 62:30> 62:32> 64:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() [JavassistParameterDeclaration.java <62:20 62:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isParameter() -> java.lang.Override [JavassistParameterDeclaration.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isParameter() -> boolean [JavassistParameterDeclaration.java <62:12 62:18>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<62:34> [JavassistParameterDeclaration.java <62:34 62:34>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<62:34> [JavassistParameterDeclaration.java <64:5 64:5>]
@@ -123,6 +127,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isVariadic() [JavassistParameterDeclaration.java <66:5 <66:5  <67:20 67:29> 67:31> 69:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isVariadic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isVariadic() -> boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isVariadic() [JavassistParameterDeclaration.java <67:20 67:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isVariadic() -> java.lang.Override [JavassistParameterDeclaration.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isVariadic() -> boolean [JavassistParameterDeclaration.java <67:12 67:18>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<67:33> [JavassistParameterDeclaration.java <67:33 67:33>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<67:33> [JavassistParameterDeclaration.java <69:5 69:5>]
@@ -130,6 +135,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.Javass
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isType() [JavassistParameterDeclaration.java <71:5 <71:5  <72:20 72:25> 72:27> 74:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [JavassistParameterDeclaration.java <72:20 72:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isType() -> java.lang.Override [JavassistParameterDeclaration.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.isType() -> boolean [JavassistParameterDeclaration.java <72:12 72:18>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<72:29> [JavassistParameterDeclaration.java <72:29 72:29>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<72:29> [JavassistParameterDeclaration.java <74:5 74:5>]
@@ -138,6 +144,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.J
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getType() [JavassistParameterDeclaration.java <76:5 <76:5  <77:17 77:23> 77:25> 79:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [JavassistParameterDeclaration.java <77:17 77:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getType() -> java.lang.Override [JavassistParameterDeclaration.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.javassistmodel.JavassistParameterDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [JavassistParameterDeclaration.java <77:12 77:15>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<77:27> [JavassistParameterDeclaration.java <77:27 77:27>]
 LOCAL_SYMBOL: JavassistParameterDeclaration.java<77:27> [JavassistParameterDeclaration.java <79:5 79:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistTypeParameter.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistTypeParameter.txt
index c06412fc..7cfdc1a7 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistTypeParameter.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javassistmodel_JavassistTypeParameter.txt
@@ -96,6 +96,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistTypePar
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.equals(java.lang.Object) [JavassistTypeParameter.java <46:5 <46:5  <47:20 47:25> 47:35> 64:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [JavassistTypeParameter.java <47:20 47:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.equals(java.lang.Object) -> java.lang.Override [JavassistTypeParameter.java <46:6 46:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.equals(java.lang.Object) -> boolean [JavassistTypeParameter.java <47:12 47:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.equals(java.lang.Object) -> java.lang.Object [JavassistTypeParameter.java <47:27 47:32>]
@@ -132,6 +133,7 @@ LOCAL_SYMBOL: JavassistTypeParameter.java<59:60> [JavassistTypeParameter.java <6
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.toString() [JavassistTypeParameter.java <66:5 <66:5  <67:19 67:26> 67:28> 71:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.toString() -> java.lang.String java.lang.Object.toString() [JavassistTypeParameter.java <67:19 67:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.toString() -> java.lang.Override [JavassistTypeParameter.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.toString() -> java.lang.String [JavassistTypeParameter.java <67:12 67:17>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<67:30> [JavassistTypeParameter.java <67:30 67:30>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<67:30> [JavassistTypeParameter.java <71:5 71:5>]
@@ -141,6 +143,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getName() [JavassistTypeParameter.java <73:5 <73:5  <74:19 74:25> 74:27> 76:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName() [JavassistTypeParameter.java <74:19 74:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getName() -> java.lang.Override [JavassistTypeParameter.java <73:6 73:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getName() -> java.lang.String [JavassistTypeParameter.java <74:12 74:17>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<74:29> [JavassistTypeParameter.java <74:29 74:29>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<74:29> [JavassistTypeParameter.java <76:5 76:5>]
@@ -149,6 +152,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmod
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerQualifiedName() [JavassistTypeParameter.java <78:5 <78:5  <79:19 79:43> 79:45> 86:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName() [JavassistTypeParameter.java <79:19 79:43>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerQualifiedName() -> java.lang.Override [JavassistTypeParameter.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerQualifiedName() -> java.lang.String [JavassistTypeParameter.java <79:12 79:17>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<79:47> [JavassistTypeParameter.java <79:47 79:47>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<79:47> [JavassistTypeParameter.java <86:5 86:5>]
@@ -178,6 +182,7 @@ REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassi
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerId() [JavassistTypeParameter.java <88:5 <88:5  <89:19 89:32> 89:34> 91:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerId() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId() [JavassistTypeParameter.java <89:19 89:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerId() -> java.lang.Override [JavassistTypeParameter.java <88:6 88:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainerId() -> java.lang.String [JavassistTypeParameter.java <89:12 89:17>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<89:36> [JavassistTypeParameter.java <89:36 89:36>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<89:36> [JavassistTypeParameter.java <91:5 91:5>]
@@ -186,6 +191,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.javassistmode
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainer() [JavassistTypeParameter.java <93:5 <93:5  <94:31 94:42> 94:44> 96:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer() [JavassistTypeParameter.java <94:31 94:42>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainer() -> java.lang.Override [JavassistTypeParameter.java <93:6 93:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable [JavassistTypeParameter.java <94:12 94:29>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<94:46> [JavassistTypeParameter.java <94:46 94:46>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<94:46> [JavassistTypeParameter.java <96:5 96:5>]
@@ -194,6 +200,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParame
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavassistTypeParameter.java <98:5 <98:5  <99:49 99:57> 99:80> 108:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavassistTypeParameter.java <99:49 99:57>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [JavassistTypeParameter.java <98:6 98:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<E> [JavassistTypeParameter.java <99:12 99:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound [JavassistTypeParameter.java <99:42 99:46>]
 QUALIFIER: com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [JavassistTypeParameter.java <99:17 99:40>]
@@ -241,6 +248,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistTypePar
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.containerType() [JavassistTypeParameter.java <110:5 <110:5  <111:47 111:59> 111:61> 116:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [JavassistTypeParameter.java <111:47 111:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.containerType() -> java.lang.Override [JavassistTypeParameter.java <110:6 110:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.containerType() -> java.util.Optional<T> [JavassistTypeParameter.java <111:12 111:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeParameter.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavassistTypeParameter.java <111:21 111:44>]
 LOCAL_SYMBOL: JavassistTypeParameter.java<111:63> [JavassistTypeParameter.java <111:63 111:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_LazyType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_LazyType.txt
index 1b1e812a..126966d8 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_LazyType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_LazyType.txt
@@ -64,6 +64,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isArray() [LazyType.java <23:5 <23:5  <24:20 24:26> 24:28> 26:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isArray() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray() [LazyType.java <24:20 24:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isArray() -> java.lang.Override [LazyType.java <23:6 23:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isArray() -> boolean [LazyType.java <24:12 24:18>]
 LOCAL_SYMBOL: LazyType.java<24:30> [LazyType.java <24:30 24:30>]
@@ -74,6 +75,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.model.typesystem.LazyType.arrayLevel() [LazyType.java <28:5 <28:5  <29:16 29:25> 29:27> 31:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.typesystem.Type.arrayLevel()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.model.typesystem.LazyType.arrayLevel() -> int com.github.javaparser.symbolsolver.model.typesystem.Type.arrayLevel() [LazyType.java <29:16 29:25>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.model.typesystem.LazyType.arrayLevel() -> java.lang.Override [LazyType.java <28:6 28:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.LazyType.arrayLevel() -> int [LazyType.java <29:12 29:14>]
 LOCAL_SYMBOL: LazyType.java<29:29> [LazyType.java <29:29 29:29>]
@@ -83,6 +85,7 @@ REFERENCE_CALL int com.github.javaparser.symbolsolver.model.typesystem.LazyType.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isPrimitive() [LazyType.java <33:5 <33:5  <34:20 34:30> 34:32> 36:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isPrimitive() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive() [LazyType.java <34:20 34:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isPrimitive() -> java.lang.Override [LazyType.java <33:6 33:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isPrimitive() -> boolean [LazyType.java <34:12 34:18>]
 LOCAL_SYMBOL: LazyType.java<34:34> [LazyType.java <34:34 34:34>]
 LOCAL_SYMBOL: LazyType.java<34:34> [LazyType.java <36:5 36:5>]
@@ -91,6 +94,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isNull() [LazyType.java <38:5 <38:5  <39:20 39:25> 39:27> 41:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isNull()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isNull() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isNull() [LazyType.java <39:20 39:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isNull() -> java.lang.Override [LazyType.java <38:6 38:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isNull() -> boolean [LazyType.java <39:12 39:18>]
 LOCAL_SYMBOL: LazyType.java<39:29> [LazyType.java <39:29 39:29>]
 LOCAL_SYMBOL: LazyType.java<39:29> [LazyType.java <41:5 41:5>]
@@ -99,6 +103,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReference() [LazyType.java <43:5 <43:5  <44:20 44:30> 44:32> 46:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReference()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReference() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReference() [LazyType.java <44:20 44:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReference() -> java.lang.Override [LazyType.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReference() -> boolean [LazyType.java <44:12 44:18>]
 LOCAL_SYMBOL: LazyType.java<44:34> [LazyType.java <44:34 44:34>]
 LOCAL_SYMBOL: LazyType.java<44:34> [LazyType.java <46:5 46:5>]
@@ -107,6 +112,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReferenceType() [LazyType.java <48:5 <48:5  <49:20 49:34> 49:36> 51:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReferenceType() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType() [LazyType.java <49:20 49:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReferenceType() -> java.lang.Override [LazyType.java <48:6 48:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isReferenceType() -> boolean [LazyType.java <49:12 49:18>]
 LOCAL_SYMBOL: LazyType.java<49:38> [LazyType.java <49:38 49:38>]
 LOCAL_SYMBOL: LazyType.java<49:38> [LazyType.java <51:5 51:5>]
@@ -115,6 +121,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isVoid() [LazyType.java <53:5 <53:5  <54:20 54:25> 54:27> 56:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isVoid()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isVoid() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isVoid() [LazyType.java <54:20 54:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isVoid() -> java.lang.Override [LazyType.java <53:6 53:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isVoid() -> boolean [LazyType.java <54:12 54:18>]
 LOCAL_SYMBOL: LazyType.java<54:29> [LazyType.java <54:29 54:29>]
 LOCAL_SYMBOL: LazyType.java<54:29> [LazyType.java <56:5 56:5>]
@@ -123,6 +130,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isTypeVariable() [LazyType.java <58:5 <58:5  <59:20 59:33> 59:35> 61:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isTypeVariable() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable() [LazyType.java <59:20 59:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isTypeVariable() -> java.lang.Override [LazyType.java <58:6 58:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isTypeVariable() -> boolean [LazyType.java <59:12 59:18>]
 LOCAL_SYMBOL: LazyType.java<59:37> [LazyType.java <59:37 59:37>]
 LOCAL_SYMBOL: LazyType.java<59:37> [LazyType.java <61:5 61:5>]
@@ -131,6 +139,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isWildcard() [LazyType.java <63:5 <63:5  <64:20 64:29> 64:31> 66:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isWildcard()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isWildcard() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isWildcard() [LazyType.java <64:20 64:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isWildcard() -> java.lang.Override [LazyType.java <63:6 63:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isWildcard() -> boolean [LazyType.java <64:12 64:18>]
 LOCAL_SYMBOL: LazyType.java<64:33> [LazyType.java <64:33 64:33>]
 LOCAL_SYMBOL: LazyType.java<64:33> [LazyType.java <66:5 66:5>]
@@ -139,6 +148,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.typesystem.LazyT
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asArrayType() [LazyType.java <68:5 <68:5  <69:22 69:32> 69:34> 71:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.Type.asArrayType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asArrayType() -> com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.Type.asArrayType() [LazyType.java <69:22 69:32>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asArrayType() -> java.lang.Override [LazyType.java <68:6 68:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asArrayType() -> com.github.javaparser.symbolsolver.model.typesystem.ArrayType [LazyType.java <69:12 69:20>]
 LOCAL_SYMBOL: LazyType.java<69:36> [LazyType.java <69:36 69:36>]
 LOCAL_SYMBOL: LazyType.java<69:36> [LazyType.java <71:5 71:5>]
@@ -147,6 +157,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.typesystem.ArrayType com
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asReferenceType() [LazyType.java <73:5 <73:5  <74:26 74:40> 74:42> 76:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.Type.asReferenceType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asReferenceType() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.Type.asReferenceType() [LazyType.java <74:26 74:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asReferenceType() -> java.lang.Override [LazyType.java <73:6 73:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asReferenceType() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [LazyType.java <74:12 74:24>]
 LOCAL_SYMBOL: LazyType.java<74:44> [LazyType.java <74:44 74:44>]
 LOCAL_SYMBOL: LazyType.java<74:44> [LazyType.java <76:5 76:5>]
@@ -155,6 +166,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.typesystem.ReferenceType
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeParameter() [LazyType.java <78:5 <78:5  <79:37 79:51> 79:53> 81:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeParameter()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeParameter() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeParameter() [LazyType.java <79:37 79:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeParameter() -> java.lang.Override [LazyType.java <78:6 78:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeParameter() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [LazyType.java <79:12 79:35>]
 LOCAL_SYMBOL: LazyType.java<79:55> [LazyType.java <79:55 79:55>]
 LOCAL_SYMBOL: LazyType.java<79:55> [LazyType.java <81:5 81:5>]
@@ -163,6 +175,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.declarations.TypeParamet
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeVariable() [LazyType.java <83:5 <83:5  <84:25 84:38> 84:40> 86:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeVariable()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeVariable() -> com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeVariable() [LazyType.java <84:25 84:38>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeVariable() -> java.lang.Override [LazyType.java <83:6 83:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.LazyType.asTypeVariable() -> com.github.javaparser.symbolsolver.model.typesystem.TypeVariable [LazyType.java <84:12 84:23>]
 LOCAL_SYMBOL: LazyType.java<84:42> [LazyType.java <84:42 84:42>]
 LOCAL_SYMBOL: LazyType.java<84:42> [LazyType.java <86:5 86:5>]
@@ -171,6 +184,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.typesystem.TypeVariable
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asPrimitive() [LazyType.java <88:5 <88:5  <89:26 89:36> 89:38> 91:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType com.github.javaparser.symbolsolver.model.typesystem.Type.asPrimitive()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asPrimitive() -> com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType com.github.javaparser.symbolsolver.model.typesystem.Type.asPrimitive() [LazyType.java <89:26 89:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asPrimitive() -> java.lang.Override [LazyType.java <88:6 88:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType com.github.javaparser.symbolsolver.model.typesystem.LazyType.asPrimitive() -> com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType [LazyType.java <89:12 89:24>]
 LOCAL_SYMBOL: LazyType.java<89:40> [LazyType.java <89:40 89:40>]
 LOCAL_SYMBOL: LazyType.java<89:40> [LazyType.java <91:5 91:5>]
@@ -179,6 +193,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.github.javaparser.symbolsolver.model.typesystem.LazyType.asWildcard() [LazyType.java <93:5 <93:5  <94:21 94:30> 94:32> 96:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.github.javaparser.symbolsolver.model.typesystem.Type.asWildcard()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.github.javaparser.symbolsolver.model.typesystem.LazyType.asWildcard() -> com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.github.javaparser.symbolsolver.model.typesystem.Type.asWildcard() [LazyType.java <94:21 94:30>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.github.javaparser.symbolsolver.model.typesystem.LazyType.asWildcard() -> java.lang.Override [LazyType.java <93:6 93:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.github.javaparser.symbolsolver.model.typesystem.LazyType.asWildcard() -> com.github.javaparser.symbolsolver.model.typesystem.Wildcard [LazyType.java <94:12 94:19>]
 LOCAL_SYMBOL: LazyType.java<94:34> [LazyType.java <94:34 94:34>]
 LOCAL_SYMBOL: LazyType.java<94:34> [LazyType.java <96:5 96:5>]
@@ -187,6 +202,7 @@ REFERENCE_CALL com.github.javaparser.symbolsolver.model.typesystem.Wildcard com.
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LazyType.describe() [LazyType.java <98:5 <98:5  <99:19 99:26> 99:28> 101:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LazyType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [LazyType.java <99:19 99:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LazyType.describe() -> java.lang.Override [LazyType.java <98:6 98:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LazyType.describe() -> java.lang.String [LazyType.java <99:12 99:17>]
 LOCAL_SYMBOL: LazyType.java<99:30> [LazyType.java <99:30 99:30>]
 LOCAL_SYMBOL: LazyType.java<99:30> [LazyType.java <101:5 101:5>]
@@ -195,6 +211,7 @@ REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.model.typesys
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [LazyType.java <103:5 <103:5  <104:17 104:36> 104:131> 106:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [LazyType.java <104:17 104:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Override [LazyType.java <103:6 103:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type [LazyType.java <104:12 104:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [LazyType.java <104:38 104:61>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables<0> [LazyType.java <104:63 104:64>]
@@ -214,6 +231,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LazyType.repla
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type) [LazyType.java <108:5 <108:5  <109:17 109:36> 109:80> 111:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type) [LazyType.java <109:17 109:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [LazyType.java <108:6 108:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [LazyType.java <109:12 109:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [LazyType.java <109:38 109:61>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LazyType.replaceTypeVariables<0> [LazyType.java <109:63 109:64>]
@@ -228,6 +246,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LazyType.repla
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [LazyType.java <113:5 <113:5  <114:20 114:33> 114:45> 116:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [LazyType.java <114:20 114:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [LazyType.java <113:6 113:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [LazyType.java <114:12 114:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LazyType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [LazyType.java <114:35 114:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LazyType.isAssignableBy<0> [LazyType.java <114:40 114:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_ReferenceTypeImpl.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_ReferenceTypeImpl.txt
index beb88c03..9d0316fb 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_ReferenceTypeImpl.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_model_typesystem_ReferenceTypeImpl.txt
@@ -131,6 +131,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeI
 SYMBOL_METHOD protected com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReferenceTypeImpl.java <47:5 <47:5  <48:29 48:34> 48:135> 50:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReferenceTypeImpl.java <48:29 48:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ReferenceTypeImpl.java <47:6 47:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReferenceTypeImpl.java <48:15 48:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReferenceTypeImpl.java <48:36 48:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create<0> [ReferenceTypeImpl.java <48:61 48:75>]
@@ -149,6 +150,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeI
 SYMBOL_METHOD protected com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReferenceTypeImpl.java <52:5 <52:5  <53:29 53:34> 53:99> 55:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReferenceTypeImpl.java <53:29 53:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ReferenceTypeImpl.java <52:6 52:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReferenceTypeImpl.java <53:15 53:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReferenceTypeImpl.java <53:36 53:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.create<0> [ReferenceTypeImpl.java <53:61 53:75>]
@@ -192,6 +194,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeI
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.asTypeParameter() [ReferenceTypeImpl.java <65:5 <65:5  <66:37 66:51> 66:53> 72:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeParameter()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.asTypeParameter() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeParameter() [ReferenceTypeImpl.java <66:37 66:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.asTypeParameter() -> java.lang.Override [ReferenceTypeImpl.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.asTypeParameter() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReferenceTypeImpl.java <66:12 66:35>]
 LOCAL_SYMBOL: ReferenceTypeImpl.java<66:55> [ReferenceTypeImpl.java <66:55 66:55>]
 LOCAL_SYMBOL: ReferenceTypeImpl.java<66:55> [ReferenceTypeImpl.java <72:5 72:5>]
@@ -222,6 +225,7 @@ SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReferenceTypeImpl.java <78:20 78:33>]
 COMMENT: comment [ReferenceTypeImpl.java <74:5 76:7>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [ReferenceTypeImpl.java <77:6 77:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [ReferenceTypeImpl.java <78:12 78:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReferenceTypeImpl.java <78:35 78:38>]
@@ -391,6 +395,7 @@ LOCAL_SYMBOL: ReferenceTypeImpl.java<131:16> [ReferenceTypeImpl.java <133:9 133:
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.getDeclaredMethods() [ReferenceTypeImpl.java <136:5 <136:5  <137:29 137:46> 137:48> 145:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.getDeclaredMethods() [ReferenceTypeImpl.java <137:29 137:46>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.getDeclaredMethods() -> java.lang.Override [ReferenceTypeImpl.java <136:6 136:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.getDeclaredMethods() -> java.util.Set<E> [ReferenceTypeImpl.java <137:12 137:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.methods.MethodUsage [ReferenceTypeImpl.java <137:16 137:26>]
 LOCAL_SYMBOL: ReferenceTypeImpl.java<137:50> [ReferenceTypeImpl.java <137:50 137:50>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_MyObjectProvider.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_MyObjectProvider.txt
index 594a471f..aed0f6b4 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_MyObjectProvider.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_MyObjectProvider.txt
@@ -70,6 +70,7 @@ LOCAL_SYMBOL: MyObjectProvider.java<17:32> [MyObjectProvider.java <19:5 19:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.object() [MyObjectProvider.java <21:5 <21:5  <22:26 22:31> 22:33> 24:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.ObjectProvider.object()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.ObjectProvider.object() [MyObjectProvider.java <22:26 22:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.object() -> java.lang.Override [MyObjectProvider.java <21:6 21:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [MyObjectProvider.java <22:12 22:24>]
 LOCAL_SYMBOL: MyObjectProvider.java<22:35> [MyObjectProvider.java <22:35 22:35>]
 LOCAL_SYMBOL: MyObjectProvider.java<22:35> [MyObjectProvider.java <24:5 24:5>]
@@ -88,6 +89,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Referen
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.byName(java.lang.String) [MyObjectProvider.java <26:5 <26:5  <27:26 27:31> 27:53> 34:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.ObjectProvider.byName(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.byName(java.lang.String) -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.ObjectProvider.byName(java.lang.String) [MyObjectProvider.java <27:26 27:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.byName(java.lang.String) -> java.lang.Override [MyObjectProvider.java <26:6 26:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.byName(java.lang.String) -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [MyObjectProvider.java <27:12 27:24>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.byName(java.lang.String) -> java.lang.String [MyObjectProvider.java <27:33 27:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.MyObjectProvider.byName<0> [MyObjectProvider.java <27:40 27:52>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionClassDeclaration.txt
index 2c7d92fd..8bd587a4 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionClassDeclaration.txt
@@ -208,6 +208,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getDeclaredMethods() [ReflectionClassDeclaration.java <83:5 <83:5  <84:35 84:52> 84:54> 86:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [ReflectionClassDeclaration.java <84:35 84:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getDeclaredMethods() -> java.lang.Override [ReflectionClassDeclaration.java <83:6 83:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getDeclaredMethods() -> java.util.Set<E> [ReflectionClassDeclaration.java <84:12 84:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ReflectionClassDeclaration.java <84:16 84:32>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<84:56> [ReflectionClassDeclaration.java <84:56 84:56>]
@@ -218,6 +219,7 @@ REFERENCE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarati
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAncestors() [ReflectionClassDeclaration.java <88:5 <88:5  <89:32 89:43> 89:45> 91:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [ReflectionClassDeclaration.java <89:32 89:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAncestors() -> java.lang.Override [ReflectionClassDeclaration.java <88:6 88:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAncestors() -> java.util.List<E> [ReflectionClassDeclaration.java <89:12 89:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReflectionClassDeclaration.java <89:17 89:29>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<89:47> [ReflectionClassDeclaration.java <89:47 89:47>]
@@ -228,6 +230,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesyst
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.equals(java.lang.Object) [ReflectionClassDeclaration.java <93:5 <93:5  <94:20 94:25> 94:35> 103:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [ReflectionClassDeclaration.java <94:20 94:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.equals(java.lang.Object) -> java.lang.Override [ReflectionClassDeclaration.java <93:6 93:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.equals(java.lang.Object) -> boolean [ReflectionClassDeclaration.java <94:12 94:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.equals(java.lang.Object) -> java.lang.Object [ReflectionClassDeclaration.java <94:27 94:32>]
@@ -255,6 +258,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hashCode() [ReflectionClassDeclaration.java <105:5 <105:5  <106:16 106:23> 106:25> 108:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hashCode() -> int java.lang.Object.hashCode() [ReflectionClassDeclaration.java <106:16 106:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hashCode() -> java.lang.Override [ReflectionClassDeclaration.java <105:6 105:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hashCode() -> int [ReflectionClassDeclaration.java <106:12 106:14>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<106:27> [ReflectionClassDeclaration.java <106:27 106:27>]
@@ -264,6 +268,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.Reflectio
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getPackageName() [ReflectionClassDeclaration.java <111:5 <111:5  <112:19 112:32> 112:34> 117:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [ReflectionClassDeclaration.java <112:19 112:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getPackageName() -> java.lang.Override [ReflectionClassDeclaration.java <111:6 111:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getPackageName() -> java.lang.String [ReflectionClassDeclaration.java <112:12 112:17>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<112:36> [ReflectionClassDeclaration.java <112:36 112:36>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<112:36> [ReflectionClassDeclaration.java <117:5 117:5>]
@@ -279,6 +284,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getClassName() [ReflectionClassDeclaration.java <119:5 <119:5  <120:19 120:30> 120:32> 126:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [ReflectionClassDeclaration.java <120:19 120:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getClassName() -> java.lang.Override [ReflectionClassDeclaration.java <119:6 119:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getClassName() -> java.lang.String [ReflectionClassDeclaration.java <120:12 120:17>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<120:34> [ReflectionClassDeclaration.java <120:34 120:34>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<120:34> [ReflectionClassDeclaration.java <126:5 126:5>]
@@ -302,12 +308,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getQualifiedName() [ReflectionClassDeclaration.java <128:5 <128:5  <129:19 129:34> 129:36> 131:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [ReflectionClassDeclaration.java <129:19 129:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getQualifiedName() -> java.lang.Override [ReflectionClassDeclaration.java <128:6 128:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getQualifiedName() -> java.lang.String [ReflectionClassDeclaration.java <129:12 129:17>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<129:38> [ReflectionClassDeclaration.java <129:38 129:38>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<129:38> [ReflectionClassDeclaration.java <131:5 131:5>]
 REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getQualifiedName() -> java.lang.String java.lang.Class<T>.getCanonicalName() [ReflectionClassDeclaration.java <130:22 130:37>]
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getQualifiedName() -> java.lang.Class<?> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.clazz [ReflectionClassDeclaration.java <130:16 130:20>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) [ReflectionClassDeclaration.java <133:5 <133:5  <134:47 134:57> 134:117> 157:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.Deprecated [ReflectionClassDeclaration.java <133:6 133:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ReflectionClassDeclaration.java <134:12 134:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ReflectionClassDeclaration.java <134:28 134:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.String [ReflectionClassDeclaration.java <134:59 134:64>]
@@ -450,6 +458,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolRefere
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.toString() [ReflectionClassDeclaration.java <159:5 <159:5  <160:19 160:26> 160:28> 164:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.toString() -> java.lang.String java.lang.Object.toString() [ReflectionClassDeclaration.java <160:19 160:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.toString() -> java.lang.Override [ReflectionClassDeclaration.java <159:6 159:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.toString() -> java.lang.String [ReflectionClassDeclaration.java <160:12 160:17>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<160:30> [ReflectionClassDeclaration.java <160:30 160:30>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<160:30> [ReflectionClassDeclaration.java <164:5 164:5>]
@@ -625,6 +634,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionClassDeclaration.java <201:5 <201:5  <202:20 202:34> 202:66> 220:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionClassDeclaration.java <202:20 202:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [ReflectionClassDeclaration.java <201:6 201:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [ReflectionClassDeclaration.java <202:12 202:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionClassDeclaration.java <202:36 202:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.canBeAssignedTo<0> [ReflectionClassDeclaration.java <202:61 202:65>]
@@ -678,6 +688,7 @@ LOCAL_SYMBOL: ReflectionClassDeclaration.java<214:99> [ReflectionClassDeclaratio
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReflectionClassDeclaration.java <222:5 <222:5  <223:20 223:33> 223:44> 225:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReflectionClassDeclaration.java <223:20 223:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [ReflectionClassDeclaration.java <222:6 222:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [ReflectionClassDeclaration.java <223:12 223:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReflectionClassDeclaration.java <223:35 223:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy<0> [ReflectionClassDeclaration.java <223:40 223:43>]
@@ -690,12 +701,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isTypeParameter() [ReflectionClassDeclaration.java <227:5 <227:5  <228:20 228:34> 228:36> 230:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [ReflectionClassDeclaration.java <228:20 228:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isTypeParameter() -> java.lang.Override [ReflectionClassDeclaration.java <227:6 227:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isTypeParameter() -> boolean [ReflectionClassDeclaration.java <228:12 228:18>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<228:38> [ReflectionClassDeclaration.java <228:38 228:38>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<228:38> [ReflectionClassDeclaration.java <230:5 230:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getField(java.lang.String) [ReflectionClassDeclaration.java <232:5 <232:5  <233:29 233:36> 233:49> 235:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String) [ReflectionClassDeclaration.java <233:29 233:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getField(java.lang.String) -> java.lang.Override [ReflectionClassDeclaration.java <232:6 232:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [ReflectionClassDeclaration.java <233:12 233:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getField(java.lang.String) -> java.lang.String [ReflectionClassDeclaration.java <233:38 233:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getField<0> [ReflectionClassDeclaration.java <233:45 233:48>]
@@ -708,6 +721,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() [ReflectionClassDeclaration.java <237:5 <237:5  <238:35 238:46> 238:48> 240:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [ReflectionClassDeclaration.java <238:35 238:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() -> java.lang.Override [ReflectionClassDeclaration.java <237:6 237:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() -> java.util.List<E> [ReflectionClassDeclaration.java <238:12 238:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [ReflectionClassDeclaration.java <238:17 238:32>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<238:50> [ReflectionClassDeclaration.java <238:50 238:50>]
@@ -716,6 +730,7 @@ SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declaratio
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassAdapter.getAllFields() [ReflectionClassDeclaration.java <239:39 239:50>]
 REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassAdapter com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.reflectionClassAdapter [ReflectionClassDeclaration.java <239:16 239:37>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReflectionClassDeclaration.java <242:5 <242:5  <243:56 243:66> 243:102> 250:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Deprecated [ReflectionClassDeclaration.java <242:6 242:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ReflectionClassDeclaration.java <243:12 243:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [ReflectionClassDeclaration.java <243:38 243:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ReflectionClassDeclaration.java <243:68 243:73>]
@@ -753,6 +768,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolR
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasDirectlyAnnotation(java.lang.String) [ReflectionClassDeclaration.java <252:5 <252:5  <253:20 253:40> 253:62> 255:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [ReflectionClassDeclaration.java <253:20 253:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [ReflectionClassDeclaration.java <252:6 252:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [ReflectionClassDeclaration.java <253:12 253:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [ReflectionClassDeclaration.java <253:42 253:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasDirectlyAnnotation<0> [ReflectionClassDeclaration.java <253:49 253:61>]
@@ -765,6 +781,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasField(java.lang.String) [ReflectionClassDeclaration.java <257:5 <257:5  <258:20 258:27> 258:40> 260:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasField(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String) [ReflectionClassDeclaration.java <258:20 258:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasField(java.lang.String) -> java.lang.Override [ReflectionClassDeclaration.java <257:6 257:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasField(java.lang.String) -> boolean [ReflectionClassDeclaration.java <258:12 258:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasField(java.lang.String) -> java.lang.String [ReflectionClassDeclaration.java <258:29 258:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.hasField<0> [ReflectionClassDeclaration.java <258:36 258:39>]
@@ -777,6 +794,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClass
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionClassDeclaration.java <262:5 <262:5  <263:20 263:33> 263:65> 265:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionClassDeclaration.java <263:20 263:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [ReflectionClassDeclaration.java <262:6 262:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [ReflectionClassDeclaration.java <263:12 263:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionClassDeclaration.java <263:35 263:58>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isAssignableBy<0> [ReflectionClassDeclaration.java <263:60 263:64>]
@@ -791,6 +809,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getName() [ReflectionClassDeclaration.java <267:5 <267:5  <268:19 268:25> 268:27> 270:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionClassDeclaration.java <268:19 268:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getName() -> java.lang.Override [ReflectionClassDeclaration.java <267:6 267:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getName() -> java.lang.String [ReflectionClassDeclaration.java <268:12 268:17>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<268:29> [ReflectionClassDeclaration.java <268:29 268:29>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<268:29> [ReflectionClassDeclaration.java <270:5 270:5>]
@@ -800,24 +819,28 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isField() [ReflectionClassDeclaration.java <272:5 <272:5  <273:20 273:26> 273:28> 275:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [ReflectionClassDeclaration.java <273:20 273:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isField() -> java.lang.Override [ReflectionClassDeclaration.java <272:6 272:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isField() -> boolean [ReflectionClassDeclaration.java <273:12 273:18>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<273:30> [ReflectionClassDeclaration.java <273:30 273:30>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<273:30> [ReflectionClassDeclaration.java <275:5 275:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isParameter() [ReflectionClassDeclaration.java <277:5 <277:5  <278:20 278:30> 278:32> 280:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [ReflectionClassDeclaration.java <278:20 278:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isParameter() -> java.lang.Override [ReflectionClassDeclaration.java <277:6 277:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isParameter() -> boolean [ReflectionClassDeclaration.java <278:12 278:18>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<278:34> [ReflectionClassDeclaration.java <278:34 278:34>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<278:34> [ReflectionClassDeclaration.java <280:5 280:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isType() [ReflectionClassDeclaration.java <282:5 <282:5  <283:20 283:25> 283:27> 285:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() [ReflectionClassDeclaration.java <283:20 283:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isType() -> java.lang.Override [ReflectionClassDeclaration.java <282:6 282:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isType() -> boolean [ReflectionClassDeclaration.java <283:12 283:18>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<283:29> [ReflectionClassDeclaration.java <283:29 283:29>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<283:29> [ReflectionClassDeclaration.java <285:5 285:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isClass() [ReflectionClassDeclaration.java <287:5 <287:5  <288:20 288:26> 288:28> 290:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isClass() -> boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass() [ReflectionClassDeclaration.java <288:20 288:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isClass() -> java.lang.Override [ReflectionClassDeclaration.java <287:6 287:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isClass() -> boolean [ReflectionClassDeclaration.java <288:12 288:18>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<288:30> [ReflectionClassDeclaration.java <288:30 288:30>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<288:30> [ReflectionClassDeclaration.java <290:5 290:5>]
@@ -826,6 +849,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getSuperClass() [ReflectionClassDeclaration.java <292:5 <292:5  <293:30 293:42> 293:44> 295:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getSuperClass() [ReflectionClassDeclaration.java <293:30 293:42>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getSuperClass() -> java.lang.Override [ReflectionClassDeclaration.java <292:6 292:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getSuperClass() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl [ReflectionClassDeclaration.java <293:12 293:28>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<293:46> [ReflectionClassDeclaration.java <293:46 293:46>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<293:46> [ReflectionClassDeclaration.java <295:5 295:5>]
@@ -835,6 +859,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceTyp
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getInterfaces() [ReflectionClassDeclaration.java <297:5 <297:5  <298:32 298:44> 298:46> 300:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getInterfaces() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getInterfaces() [ReflectionClassDeclaration.java <298:32 298:44>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getInterfaces() -> java.lang.Override [ReflectionClassDeclaration.java <297:6 297:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getInterfaces() -> java.util.List<E> [ReflectionClassDeclaration.java <298:12 298:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getInterfaces() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReflectionClassDeclaration.java <298:17 298:29>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<298:48> [ReflectionClassDeclaration.java <298:48 298:48>]
@@ -845,6 +870,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesyst
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isInterface() [ReflectionClassDeclaration.java <302:5 <302:5  <303:20 303:30> 303:32> 305:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface() [ReflectionClassDeclaration.java <303:20 303:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isInterface() -> java.lang.Override [ReflectionClassDeclaration.java <302:6 302:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.isInterface() -> boolean [ReflectionClassDeclaration.java <303:12 303:18>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<303:34> [ReflectionClassDeclaration.java <303:34 303:34>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<303:34> [ReflectionClassDeclaration.java <305:5 305:5>]
@@ -853,6 +879,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getTypeParameters() [ReflectionClassDeclaration.java <307:5 <307:5  <308:43 308:59> 308:61> 310:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [ReflectionClassDeclaration.java <308:43 308:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getTypeParameters() -> java.lang.Override [ReflectionClassDeclaration.java <307:6 307:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getTypeParameters() -> java.util.List<E> [ReflectionClassDeclaration.java <308:12 308:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReflectionClassDeclaration.java <308:17 308:40>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<308:63> [ReflectionClassDeclaration.java <308:63 308:63>]
@@ -863,6 +890,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.accessLevel() [ReflectionClassDeclaration.java <312:5 <312:5  <313:24 313:34> 313:36> 315:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [ReflectionClassDeclaration.java <313:24 313:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.accessLevel() -> java.lang.Override [ReflectionClassDeclaration.java <312:6 312:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [ReflectionClassDeclaration.java <313:12 313:22>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<313:38> [ReflectionClassDeclaration.java <313:38 313:38>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<313:38> [ReflectionClassDeclaration.java <315:5 315:5>]
@@ -876,6 +904,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getConstructors() [ReflectionClassDeclaration.java <317:5 <317:5  <318:41 318:55> 318:57> 320:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getConstructors() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getConstructors() [ReflectionClassDeclaration.java <318:41 318:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getConstructors() -> java.lang.Override [ReflectionClassDeclaration.java <317:6 317:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getConstructors() -> java.util.List<E> [ReflectionClassDeclaration.java <318:12 318:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.getConstructors() -> com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration [ReflectionClassDeclaration.java <318:17 318:38>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<318:59> [ReflectionClassDeclaration.java <318:59 318:59>]
@@ -886,6 +915,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.containerType() [ReflectionClassDeclaration.java <322:5 <322:5  <323:47 323:59> 323:61> 325:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [ReflectionClassDeclaration.java <323:47 323:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.containerType() -> java.lang.Override [ReflectionClassDeclaration.java <322:6 322:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.containerType() -> java.util.Optional<T> [ReflectionClassDeclaration.java <323:12 323:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionClassDeclaration.java <323:21 323:44>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<323:63> [ReflectionClassDeclaration.java <323:63 323:63>]
@@ -896,6 +926,7 @@ REFERENCE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.decl
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.internalTypes() [ReflectionClassDeclaration.java <327:5 <327:5  <328:42 328:54> 328:56> 332:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [ReflectionClassDeclaration.java <328:42 328:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.internalTypes() -> java.lang.Override [ReflectionClassDeclaration.java <327:6 327:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.internalTypes() -> java.util.Set<E> [ReflectionClassDeclaration.java <328:12 328:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionClassDeclaration.java <328:16 328:39>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<328:58> [ReflectionClassDeclaration.java <328:58 328:58>]
@@ -921,6 +952,7 @@ QUALIFIER: java.util.stream.Collectors [ReflectionClassDeclaration.java <331:26
 SYMBOL_METHOD protected com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.object() [ReflectionClassDeclaration.java <338:5 <338:5  <339:29 339:34> 339:36> 341:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.object() [ReflectionClassDeclaration.java <339:29 339:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.object() -> java.lang.Override [ReflectionClassDeclaration.java <338:6 338:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration.object() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReflectionClassDeclaration.java <339:15 339:27>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<339:38> [ReflectionClassDeclaration.java <339:38 339:38>]
 LOCAL_SYMBOL: ReflectionClassDeclaration.java<339:38> [ReflectionClassDeclaration.java <341:5 341:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionConstructorDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionConstructorDeclaration.txt
index 8c42fa29..0604dec6 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionConstructorDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionConstructorDeclaration.txt
@@ -67,6 +67,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConst
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.declaringType() [ReflectionConstructorDeclaration.java <41:5 <41:5  <42:29 42:41> 42:43> 44:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() [ReflectionConstructorDeclaration.java <42:29 42:41>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.declaringType() -> java.lang.Override [ReflectionConstructorDeclaration.java <41:6 41:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration [ReflectionConstructorDeclaration.java <42:12 42:27>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<42:45> [ReflectionConstructorDeclaration.java <42:45 42:45>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<42:45> [ReflectionConstructorDeclaration.java <44:5 44:5>]
@@ -80,6 +81,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDecla
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getNumberOfParams() [ReflectionConstructorDeclaration.java <46:5 <46:5  <47:16 47:32> 47:34> 49:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [ReflectionConstructorDeclaration.java <47:16 47:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getNumberOfParams() -> java.lang.Override [ReflectionConstructorDeclaration.java <46:6 46:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getNumberOfParams() -> int [ReflectionConstructorDeclaration.java <47:12 47:14>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<47:36> [ReflectionConstructorDeclaration.java <47:36 47:36>]
@@ -90,6 +92,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.Reflectio
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getParam(int) [ReflectionConstructorDeclaration.java <51:5 <51:5  <52:33 52:40> 52:47> 61:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [ReflectionConstructorDeclaration.java <52:33 52:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getParam(int) -> java.lang.Override [ReflectionConstructorDeclaration.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [ReflectionConstructorDeclaration.java <52:12 52:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getParam(int) -> int [ReflectionConstructorDeclaration.java <52:42 52:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getParam<0> [ReflectionConstructorDeclaration.java <52:46 52:46>]
@@ -137,6 +140,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConst
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getName() [ReflectionConstructorDeclaration.java <63:5 <63:5  <64:19 64:25> 64:27> 66:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionConstructorDeclaration.java <64:19 64:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getName() -> java.lang.Override [ReflectionConstructorDeclaration.java <63:6 63:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getName() -> java.lang.String [ReflectionConstructorDeclaration.java <64:12 64:17>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<64:29> [ReflectionConstructorDeclaration.java <64:29 64:29>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<64:29> [ReflectionConstructorDeclaration.java <66:5 66:5>]
@@ -146,6 +150,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.accessLevel() [ReflectionConstructorDeclaration.java <68:5 <68:5  <69:24 69:34> 69:36> 71:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [ReflectionConstructorDeclaration.java <69:24 69:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.accessLevel() -> java.lang.Override [ReflectionConstructorDeclaration.java <68:6 68:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [ReflectionConstructorDeclaration.java <69:12 69:22>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<69:38> [ReflectionConstructorDeclaration.java <69:38 69:38>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<69:38> [ReflectionConstructorDeclaration.java <71:5 71:5>]
@@ -158,6 +163,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getTypeParameters() [ReflectionConstructorDeclaration.java <73:5 <73:5  <74:43 74:59> 74:61> 76:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [ReflectionConstructorDeclaration.java <74:43 74:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getTypeParameters() -> java.lang.Override [ReflectionConstructorDeclaration.java <73:6 73:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getTypeParameters() -> java.util.List<E> [ReflectionConstructorDeclaration.java <74:12 74:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionConstructorDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReflectionConstructorDeclaration.java <74:17 74:40>]
 LOCAL_SYMBOL: ReflectionConstructorDeclaration.java<74:63> [ReflectionConstructorDeclaration.java <74:63 74:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionEnumDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionEnumDeclaration.txt
index a54b8c01..d4c48f39 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionEnumDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionEnumDeclaration.txt
@@ -162,6 +162,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumD
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.accessLevel() [ReflectionEnumDeclaration.java <73:3 <73:3  <74:22 74:32> 74:34> 76:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [ReflectionEnumDeclaration.java <74:22 74:32>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.accessLevel() -> java.lang.Override [ReflectionEnumDeclaration.java <73:4 73:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [ReflectionEnumDeclaration.java <74:10 74:20>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<74:36> [ReflectionEnumDeclaration.java <74:36 74:36>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<74:36> [ReflectionEnumDeclaration.java <76:3 76:3>]
@@ -175,6 +176,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLeve
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.containerType() [ReflectionEnumDeclaration.java <78:3 <78:3  <79:45 79:57> 79:59> 81:3>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [ReflectionEnumDeclaration.java <79:45 79:57>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.containerType() -> java.lang.Override [ReflectionEnumDeclaration.java <78:4 78:11>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.containerType() -> java.util.Optional<T> [ReflectionEnumDeclaration.java <79:10 79:17>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionEnumDeclaration.java <79:19 79:42>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<79:61> [ReflectionEnumDeclaration.java <79:61 79:61>]
@@ -185,6 +187,7 @@ REFERENCE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.decl
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getPackageName() [ReflectionEnumDeclaration.java <83:3 <83:3  <84:17 84:30> 84:32> 89:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [ReflectionEnumDeclaration.java <84:17 84:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getPackageName() -> java.lang.Override [ReflectionEnumDeclaration.java <83:4 83:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getPackageName() -> java.lang.String [ReflectionEnumDeclaration.java <84:10 84:15>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<84:34> [ReflectionEnumDeclaration.java <84:34 84:34>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<84:34> [ReflectionEnumDeclaration.java <89:3 89:3>]
@@ -200,6 +203,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getClassName() [ReflectionEnumDeclaration.java <91:3 <91:3  <92:17 92:28> 92:30> 98:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [ReflectionEnumDeclaration.java <92:17 92:28>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getClassName() -> java.lang.Override [ReflectionEnumDeclaration.java <91:4 91:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getClassName() -> java.lang.String [ReflectionEnumDeclaration.java <92:10 92:15>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<92:32> [ReflectionEnumDeclaration.java <92:32 92:32>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<92:32> [ReflectionEnumDeclaration.java <98:3 98:3>]
@@ -224,6 +228,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumD
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getQualifiedName() [ReflectionEnumDeclaration.java <100:3 <100:3  <101:17 101:32> 101:34> 103:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [ReflectionEnumDeclaration.java <101:17 101:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getQualifiedName() -> java.lang.Override [ReflectionEnumDeclaration.java <100:4 100:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getQualifiedName() -> java.lang.String [ReflectionEnumDeclaration.java <101:10 101:15>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<101:36> [ReflectionEnumDeclaration.java <101:36 101:36>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<101:36> [ReflectionEnumDeclaration.java <103:3 103:3>]
@@ -232,6 +237,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAncestors() [ReflectionEnumDeclaration.java <105:3 <105:3  <106:30 106:41> 106:43> 108:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [ReflectionEnumDeclaration.java <106:30 106:41>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAncestors() -> java.lang.Override [ReflectionEnumDeclaration.java <105:4 105:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAncestors() -> java.util.List<E> [ReflectionEnumDeclaration.java <106:10 106:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReflectionEnumDeclaration.java <106:15 106:27>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<106:45> [ReflectionEnumDeclaration.java <106:45 106:45>]
@@ -242,6 +248,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesyst
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getField(java.lang.String) [ReflectionEnumDeclaration.java <110:3 <110:3  <111:27 111:34> 111:47> 113:3>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String) [ReflectionEnumDeclaration.java <111:27 111:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getField(java.lang.String) -> java.lang.Override [ReflectionEnumDeclaration.java <110:4 110:11>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [ReflectionEnumDeclaration.java <111:10 111:25>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getField(java.lang.String) -> java.lang.String [ReflectionEnumDeclaration.java <111:36 111:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getField<0> [ReflectionEnumDeclaration.java <111:43 111:46>]
@@ -254,6 +261,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumD
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasField(java.lang.String) [ReflectionEnumDeclaration.java <115:3 <115:3  <116:18 116:25> 116:38> 118:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasField(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String) [ReflectionEnumDeclaration.java <116:18 116:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasField(java.lang.String) -> java.lang.Override [ReflectionEnumDeclaration.java <115:4 115:11>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasField(java.lang.String) -> boolean [ReflectionEnumDeclaration.java <116:10 116:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasField(java.lang.String) -> java.lang.String [ReflectionEnumDeclaration.java <116:27 116:32>]
@@ -267,6 +275,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumD
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAllFields() [ReflectionEnumDeclaration.java <120:3 <120:3  <121:33 121:44> 121:46> 123:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [ReflectionEnumDeclaration.java <121:33 121:44>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAllFields() -> java.lang.Override [ReflectionEnumDeclaration.java <120:4 120:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAllFields() -> java.util.List<E> [ReflectionEnumDeclaration.java <121:10 121:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [ReflectionEnumDeclaration.java <121:15 121:30>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<121:48> [ReflectionEnumDeclaration.java <121:48 121:48>]
@@ -277,6 +286,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getDeclaredMethods() [ReflectionEnumDeclaration.java <125:3 <125:3  <126:33 126:50> 126:52> 128:3>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [ReflectionEnumDeclaration.java <126:33 126:50>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getDeclaredMethods() -> java.lang.Override [ReflectionEnumDeclaration.java <125:4 125:11>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getDeclaredMethods() -> java.util.Set<E> [ReflectionEnumDeclaration.java <126:10 126:12>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ReflectionEnumDeclaration.java <126:14 126:30>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<126:54> [ReflectionEnumDeclaration.java <126:54 126:54>]
@@ -287,6 +297,7 @@ REFERENCE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarati
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReflectionEnumDeclaration.java <130:3 <130:3  <131:18 131:31> 131:42> 133:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReflectionEnumDeclaration.java <131:18 131:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [ReflectionEnumDeclaration.java <130:4 130:11>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [ReflectionEnumDeclaration.java <131:10 131:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReflectionEnumDeclaration.java <131:33 131:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy<0> [ReflectionEnumDeclaration.java <131:38 131:41>]
@@ -299,6 +310,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumD
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionEnumDeclaration.java <135:3 <135:3  <136:18 136:31> 136:63> 138:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionEnumDeclaration.java <136:18 136:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [ReflectionEnumDeclaration.java <135:4 135:11>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [ReflectionEnumDeclaration.java <136:10 136:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionEnumDeclaration.java <136:33 136:56>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.isAssignableBy<0> [ReflectionEnumDeclaration.java <136:58 136:62>]
@@ -314,6 +326,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasDirectlyAnnotation(java.lang.String) [ReflectionEnumDeclaration.java <140:3 <140:3  <141:18 141:38> 141:60> 143:3>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [ReflectionEnumDeclaration.java <141:18 141:38>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [ReflectionEnumDeclaration.java <140:4 140:11>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [ReflectionEnumDeclaration.java <141:10 141:16>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [ReflectionEnumDeclaration.java <141:40 141:45>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.hasDirectlyAnnotation<0> [ReflectionEnumDeclaration.java <141:47 141:59>]
@@ -326,6 +339,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumD
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getName() [ReflectionEnumDeclaration.java <145:3 <145:3  <146:17 146:23> 146:25> 148:3>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionEnumDeclaration.java <146:17 146:23>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getName() -> java.lang.Override [ReflectionEnumDeclaration.java <145:4 145:11>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getName() -> java.lang.String [ReflectionEnumDeclaration.java <146:10 146:15>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<146:27> [ReflectionEnumDeclaration.java <146:27 146:27>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<146:27> [ReflectionEnumDeclaration.java <148:3 148:3>]
@@ -335,6 +349,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getTypeParameters() [ReflectionEnumDeclaration.java <150:3 <150:3  <151:41 151:57> 151:59> 153:3>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [ReflectionEnumDeclaration.java <151:41 151:57>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getTypeParameters() -> java.lang.Override [ReflectionEnumDeclaration.java <150:4 150:11>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getTypeParameters() -> java.util.List<E> [ReflectionEnumDeclaration.java <151:10 151:13>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionEnumDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReflectionEnumDeclaration.java <151:15 151:38>]
 LOCAL_SYMBOL: ReflectionEnumDeclaration.java<151:61> [ReflectionEnumDeclaration.java <151:61 151:61>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionFieldDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionFieldDeclaration.txt
index d3e243fb..6ee1d920 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionFieldDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionFieldDeclaration.txt
@@ -107,6 +107,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionField
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getType() [ReflectionFieldDeclaration.java <49:5 <49:5  <50:17 50:23> 50:25> 52:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [ReflectionFieldDeclaration.java <50:17 50:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getType() -> java.lang.Override [ReflectionFieldDeclaration.java <49:6 49:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReflectionFieldDeclaration.java <50:12 50:15>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<50:27> [ReflectionFieldDeclaration.java <50:27 50:27>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<50:27> [ReflectionFieldDeclaration.java <52:5 52:5>]
@@ -125,6 +126,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getName() [ReflectionFieldDeclaration.java <59:5 <59:5  <60:19 60:25> 60:27> 62:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionFieldDeclaration.java <60:19 60:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getName() -> java.lang.Override [ReflectionFieldDeclaration.java <59:6 59:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.getName() -> java.lang.String [ReflectionFieldDeclaration.java <60:12 60:17>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<60:29> [ReflectionFieldDeclaration.java <60:29 60:29>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<60:29> [ReflectionFieldDeclaration.java <62:5 62:5>]
@@ -134,6 +136,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isStatic() [ReflectionFieldDeclaration.java <64:5 <64:5  <65:20 65:27> 65:29> 67:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isStatic() [ReflectionFieldDeclaration.java <65:20 65:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isStatic() -> java.lang.Override [ReflectionFieldDeclaration.java <64:6 64:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isStatic() -> boolean [ReflectionFieldDeclaration.java <65:12 65:18>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<65:31> [ReflectionFieldDeclaration.java <65:31 65:31>]
@@ -147,12 +150,14 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isField() [ReflectionFieldDeclaration.java <69:5 <69:5  <70:20 70:26> 70:28> 72:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() [ReflectionFieldDeclaration.java <70:20 70:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isField() -> java.lang.Override [ReflectionFieldDeclaration.java <69:6 69:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isField() -> boolean [ReflectionFieldDeclaration.java <70:12 70:18>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<70:30> [ReflectionFieldDeclaration.java <70:30 70:30>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<70:30> [ReflectionFieldDeclaration.java <72:5 72:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.declaringType() [ReflectionFieldDeclaration.java <74:5 <74:5  <75:28 75:40> 75:42> 77:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.declaringType() [ReflectionFieldDeclaration.java <75:28 75:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.declaringType() -> java.lang.Override [ReflectionFieldDeclaration.java <74:6 74:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [ReflectionFieldDeclaration.java <75:12 75:26>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<75:44> [ReflectionFieldDeclaration.java <75:44 75:44>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<75:44> [ReflectionFieldDeclaration.java <77:5 77:5>]
@@ -178,18 +183,21 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionField
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isParameter() [ReflectionFieldDeclaration.java <83:5 <83:5  <84:20 84:30> 84:32> 86:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [ReflectionFieldDeclaration.java <84:20 84:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isParameter() -> java.lang.Override [ReflectionFieldDeclaration.java <83:6 83:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isParameter() -> boolean [ReflectionFieldDeclaration.java <84:12 84:18>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<84:34> [ReflectionFieldDeclaration.java <84:34 84:34>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<84:34> [ReflectionFieldDeclaration.java <86:5 86:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isType() [ReflectionFieldDeclaration.java <88:5 <88:5  <89:20 89:25> 89:27> 91:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [ReflectionFieldDeclaration.java <89:20 89:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isType() -> java.lang.Override [ReflectionFieldDeclaration.java <88:6 88:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.isType() -> boolean [ReflectionFieldDeclaration.java <89:12 89:18>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<89:29> [ReflectionFieldDeclaration.java <89:29 89:29>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<89:29> [ReflectionFieldDeclaration.java <91:5 91:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.accessLevel() [ReflectionFieldDeclaration.java <93:5 <93:5  <94:24 94:34> 94:36> 96:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [ReflectionFieldDeclaration.java <94:24 94:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.accessLevel() -> java.lang.Override [ReflectionFieldDeclaration.java <93:6 93:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFieldDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [ReflectionFieldDeclaration.java <94:12 94:22>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<94:38> [ReflectionFieldDeclaration.java <94:38 94:38>]
 LOCAL_SYMBOL: ReflectionFieldDeclaration.java<94:38> [ReflectionFieldDeclaration.java <96:5 96:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionInterfaceDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionInterfaceDeclaration.txt
index 5b3e8a5a..eb0b4416 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionInterfaceDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionInterfaceDeclaration.txt
@@ -166,6 +166,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionInterfaceDeclaration.java <69:5 <69:5  <70:20 70:33> 70:65> 72:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionInterfaceDeclaration.java <70:20 70:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [ReflectionInterfaceDeclaration.java <69:6 69:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [ReflectionInterfaceDeclaration.java <70:12 70:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionInterfaceDeclaration.java <70:35 70:58>]
@@ -182,6 +183,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getPackageName() [ReflectionInterfaceDeclaration.java <74:5 <74:5  <75:19 75:32> 75:34> 80:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getPackageName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getPackageName() [ReflectionInterfaceDeclaration.java <75:19 75:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getPackageName() -> java.lang.Override [ReflectionInterfaceDeclaration.java <74:6 74:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getPackageName() -> java.lang.String [ReflectionInterfaceDeclaration.java <75:12 75:17>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<75:36> [ReflectionInterfaceDeclaration.java <75:36 75:36>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<75:36> [ReflectionInterfaceDeclaration.java <80:5 80:5>]
@@ -197,6 +199,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getClassName() [ReflectionInterfaceDeclaration.java <82:5 <82:5  <83:19 83:30> 83:32> 89:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getClassName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getClassName() [ReflectionInterfaceDeclaration.java <83:19 83:30>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getClassName() -> java.lang.Override [ReflectionInterfaceDeclaration.java <82:6 82:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getClassName() -> java.lang.String [ReflectionInterfaceDeclaration.java <83:12 83:17>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<83:34> [ReflectionInterfaceDeclaration.java <83:34 83:34>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<83:34> [ReflectionInterfaceDeclaration.java <89:5 89:5>]
@@ -221,12 +224,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getQualifiedName() [ReflectionInterfaceDeclaration.java <91:5 <91:5  <92:19 92:34> 92:36> 94:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getQualifiedName() [ReflectionInterfaceDeclaration.java <92:19 92:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getQualifiedName() -> java.lang.Override [ReflectionInterfaceDeclaration.java <91:6 91:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getQualifiedName() -> java.lang.String [ReflectionInterfaceDeclaration.java <92:12 92:17>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<92:38> [ReflectionInterfaceDeclaration.java <92:38 92:38>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<92:38> [ReflectionInterfaceDeclaration.java <94:5 94:5>]
 REFERENCE_CALL java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getQualifiedName() -> java.lang.String java.lang.Class<T>.getCanonicalName() [ReflectionInterfaceDeclaration.java <93:22 93:37>]
 REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getQualifiedName() -> java.lang.Class<?> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.clazz [ReflectionInterfaceDeclaration.java <93:16 93:20>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) [ReflectionInterfaceDeclaration.java <96:5 <96:5  <97:47 97:57> 97:117> 100:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.Deprecated [ReflectionInterfaceDeclaration.java <96:6 96:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ReflectionInterfaceDeclaration.java <97:12 97:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ReflectionInterfaceDeclaration.java <97:28 97:44>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveMethod(java.lang.String, java.util.List<com.github.javaparser.symbolsolver.model.typesystem.Type>, boolean) -> java.lang.String [ReflectionInterfaceDeclaration.java <97:59 97:64>]
@@ -249,6 +254,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolRefere
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.toString() [ReflectionInterfaceDeclaration.java <102:5 <102:5  <103:19 103:26> 103:28> 107:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.toString() -> java.lang.String java.lang.Object.toString() [ReflectionInterfaceDeclaration.java <103:19 103:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.toString() -> java.lang.Override [ReflectionInterfaceDeclaration.java <102:6 102:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.toString() -> java.lang.String [ReflectionInterfaceDeclaration.java <103:12 103:17>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<103:30> [ReflectionInterfaceDeclaration.java <103:30 103:30>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<103:30> [ReflectionInterfaceDeclaration.java <107:5 107:5>]
@@ -266,6 +272,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.equals(java.lang.Object) [ReflectionInterfaceDeclaration.java <113:5 <113:5  <114:20 114:25> 114:35> 127:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [ReflectionInterfaceDeclaration.java <114:20 114:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.equals(java.lang.Object) -> java.lang.Override [ReflectionInterfaceDeclaration.java <113:6 113:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.equals(java.lang.Object) -> boolean [ReflectionInterfaceDeclaration.java <114:12 114:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.equals(java.lang.Object) -> java.lang.Object [ReflectionInterfaceDeclaration.java <114:27 114:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.equals<0> [ReflectionInterfaceDeclaration.java <114:34 114:34>]
@@ -296,6 +303,7 @@ LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<122:68> [ReflectionInterfaceDe
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hashCode() [ReflectionInterfaceDeclaration.java <129:5 <129:5  <130:16 130:23> 130:25> 132:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hashCode() -> int java.lang.Object.hashCode() [ReflectionInterfaceDeclaration.java <130:16 130:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hashCode() -> java.lang.Override [ReflectionInterfaceDeclaration.java <129:6 129:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hashCode() -> int [ReflectionInterfaceDeclaration.java <130:12 130:14>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<130:27> [ReflectionInterfaceDeclaration.java <130:27 130:27>]
@@ -432,6 +440,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionInterfaceDeclaration.java <165:5 <165:5  <166:20 166:34> 166:66> 188:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) [ReflectionInterfaceDeclaration.java <166:20 166:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> java.lang.Override [ReflectionInterfaceDeclaration.java <165:6 165:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> boolean [ReflectionInterfaceDeclaration.java <166:12 166:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.canBeAssignedTo(com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionInterfaceDeclaration.java <166:36 166:59>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.canBeAssignedTo<0> [ReflectionInterfaceDeclaration.java <166:61 166:65>]
@@ -490,6 +499,7 @@ LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<183:79> [ReflectionInterfaceDe
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReflectionInterfaceDeclaration.java <190:5 <190:5  <191:20 191:33> 191:44> 213:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReflectionInterfaceDeclaration.java <191:20 191:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [ReflectionInterfaceDeclaration.java <190:6 190:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [ReflectionInterfaceDeclaration.java <191:12 191:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReflectionInterfaceDeclaration.java <191:35 191:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isAssignableBy<0> [ReflectionInterfaceDeclaration.java <191:40 191:43>]
@@ -536,12 +546,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isTypeParameter() [ReflectionInterfaceDeclaration.java <215:5 <215:5  <216:20 216:34> 216:36> 218:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isTypeParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isTypeParameter() [ReflectionInterfaceDeclaration.java <216:20 216:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isTypeParameter() -> java.lang.Override [ReflectionInterfaceDeclaration.java <215:6 215:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isTypeParameter() -> boolean [ReflectionInterfaceDeclaration.java <216:12 216:18>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<216:38> [ReflectionInterfaceDeclaration.java <216:38 216:38>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<216:38> [ReflectionInterfaceDeclaration.java <218:5 218:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getField(java.lang.String) [ReflectionInterfaceDeclaration.java <220:5 <220:5  <221:29 221:36> 221:49> 223:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getField(java.lang.String) [ReflectionInterfaceDeclaration.java <221:29 221:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getField(java.lang.String) -> java.lang.Override [ReflectionInterfaceDeclaration.java <220:6 220:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getField(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [ReflectionInterfaceDeclaration.java <221:12 221:27>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getField(java.lang.String) -> java.lang.String [ReflectionInterfaceDeclaration.java <221:38 221:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getField<0> [ReflectionInterfaceDeclaration.java <221:45 221:48>]
@@ -554,6 +566,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() [ReflectionInterfaceDeclaration.java <225:5 <225:5  <226:35 226:46> 226:48> 228:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [ReflectionInterfaceDeclaration.java <226:35 226:46>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() -> java.lang.Override [ReflectionInterfaceDeclaration.java <225:6 225:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() -> java.util.List<E> [ReflectionInterfaceDeclaration.java <226:12 226:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [ReflectionInterfaceDeclaration.java <226:17 226:32>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<226:50> [ReflectionInterfaceDeclaration.java <226:50 226:50>]
@@ -562,6 +575,7 @@ SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declaratio
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassAdapter.getAllFields() [ReflectionInterfaceDeclaration.java <227:39 227:50>]
 REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassAdapter com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.reflectionClassAdapter [ReflectionInterfaceDeclaration.java <227:16 227:37>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReflectionInterfaceDeclaration.java <230:5 <230:5  <231:56 231:66> 231:102> 238:5>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Deprecated [ReflectionInterfaceDeclaration.java <230:6 230:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ReflectionInterfaceDeclaration.java <231:12 231:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [ReflectionInterfaceDeclaration.java <231:38 231:53>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.solveSymbol(java.lang.String, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.String [ReflectionInterfaceDeclaration.java <231:68 231:73>]
@@ -599,6 +613,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolR
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAncestors() [ReflectionInterfaceDeclaration.java <240:5 <240:5  <241:32 241:43> 241:45> 243:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAncestors() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAncestors() [ReflectionInterfaceDeclaration.java <241:32 241:43>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAncestors() -> java.lang.Override [ReflectionInterfaceDeclaration.java <240:6 240:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAncestors() -> java.util.List<E> [ReflectionInterfaceDeclaration.java <241:12 241:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getAncestors() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReflectionInterfaceDeclaration.java <241:17 241:29>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<241:47> [ReflectionInterfaceDeclaration.java <241:47 241:47>]
@@ -609,6 +624,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesyst
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getDeclaredMethods() [ReflectionInterfaceDeclaration.java <245:5 <245:5  <246:35 246:52> 246:54> 248:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [ReflectionInterfaceDeclaration.java <246:35 246:52>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getDeclaredMethods() -> java.lang.Override [ReflectionInterfaceDeclaration.java <245:6 245:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getDeclaredMethods() -> java.util.Set<E> [ReflectionInterfaceDeclaration.java <246:12 246:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getDeclaredMethods() -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [ReflectionInterfaceDeclaration.java <246:16 246:32>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<246:56> [ReflectionInterfaceDeclaration.java <246:56 246:56>]
@@ -619,6 +635,7 @@ REFERENCE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarati
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasField(java.lang.String) [ReflectionInterfaceDeclaration.java <250:5 <250:5  <251:20 251:27> 251:40> 253:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasField(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasField(java.lang.String) [ReflectionInterfaceDeclaration.java <251:20 251:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasField(java.lang.String) -> java.lang.Override [ReflectionInterfaceDeclaration.java <250:6 250:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasField(java.lang.String) -> boolean [ReflectionInterfaceDeclaration.java <251:12 251:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasField(java.lang.String) -> java.lang.String [ReflectionInterfaceDeclaration.java <251:29 251:34>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasField<0> [ReflectionInterfaceDeclaration.java <251:36 251:39>]
@@ -631,6 +648,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getName() [ReflectionInterfaceDeclaration.java <255:5 <255:5  <256:19 256:25> 256:27> 258:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionInterfaceDeclaration.java <256:19 256:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getName() -> java.lang.Override [ReflectionInterfaceDeclaration.java <255:6 255:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getName() -> java.lang.String [ReflectionInterfaceDeclaration.java <256:12 256:17>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<256:29> [ReflectionInterfaceDeclaration.java <256:29 256:29>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<256:29> [ReflectionInterfaceDeclaration.java <258:5 258:5>]
@@ -640,12 +658,14 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isInterface() [ReflectionInterfaceDeclaration.java <260:5 <260:5  <261:20 261:30> 261:32> 263:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface() [ReflectionInterfaceDeclaration.java <261:20 261:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isInterface() -> java.lang.Override [ReflectionInterfaceDeclaration.java <260:6 260:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.isInterface() -> boolean [ReflectionInterfaceDeclaration.java <261:12 261:18>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<261:34> [ReflectionInterfaceDeclaration.java <261:34 261:34>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<261:34> [ReflectionInterfaceDeclaration.java <263:5 263:5>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getInterfacesExtended() [ReflectionInterfaceDeclaration.java <265:5 <265:5  <266:32 266:52> 266:54> 272:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.getInterfacesExtended()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getInterfacesExtended() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.getInterfacesExtended() [ReflectionInterfaceDeclaration.java <266:32 266:52>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getInterfacesExtended() -> java.lang.Override [ReflectionInterfaceDeclaration.java <265:6 265:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getInterfacesExtended() -> java.util.List<E> [ReflectionInterfaceDeclaration.java <266:12 266:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getInterfacesExtended() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReflectionInterfaceDeclaration.java <266:17 266:29>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<266:56> [ReflectionInterfaceDeclaration.java <266:56 266:56>]
@@ -675,6 +695,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.containerType() [ReflectionInterfaceDeclaration.java <274:5 <274:5  <275:47 275:59> 275:61> 277:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [ReflectionInterfaceDeclaration.java <275:47 275:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.containerType() -> java.lang.Override [ReflectionInterfaceDeclaration.java <274:6 274:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.containerType() -> java.util.Optional<T> [ReflectionInterfaceDeclaration.java <275:12 275:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionInterfaceDeclaration.java <275:21 275:44>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<275:63> [ReflectionInterfaceDeclaration.java <275:63 275:63>]
@@ -685,6 +706,7 @@ REFERENCE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.decl
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.internalTypes() [ReflectionInterfaceDeclaration.java <279:5 <279:5  <280:42 280:54> 280:56> 284:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.internalTypes() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.internalTypes() [ReflectionInterfaceDeclaration.java <280:42 280:54>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.internalTypes() -> java.lang.Override [ReflectionInterfaceDeclaration.java <279:6 279:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.internalTypes() -> java.util.Set<E> [ReflectionInterfaceDeclaration.java <280:12 280:14>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.internalTypes() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionInterfaceDeclaration.java <280:16 280:39>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<280:58> [ReflectionInterfaceDeclaration.java <280:58 280:58>]
@@ -712,12 +734,14 @@ QUALIFIER: java.util.stream.Collectors [ReflectionInterfaceDeclaration.java <283
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.asInterface() [ReflectionInterfaceDeclaration.java <286:5 <286:5  <287:33 287:43> 287:45> 289:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asInterface()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.asInterface() -> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asInterface() [ReflectionInterfaceDeclaration.java <287:33 287:43>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.asInterface() -> java.lang.Override [ReflectionInterfaceDeclaration.java <286:6 286:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.asInterface() -> com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration [ReflectionInterfaceDeclaration.java <287:12 287:31>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<287:47> [ReflectionInterfaceDeclaration.java <287:47 287:47>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<287:47> [ReflectionInterfaceDeclaration.java <289:5 289:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) [ReflectionInterfaceDeclaration.java <291:5 <291:5  <292:20 292:40> 292:62> 294:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasDirectlyAnnotation(java.lang.String) [ReflectionInterfaceDeclaration.java <292:20 292:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.Override [ReflectionInterfaceDeclaration.java <291:6 291:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> boolean [ReflectionInterfaceDeclaration.java <292:12 292:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasDirectlyAnnotation(java.lang.String) -> java.lang.String [ReflectionInterfaceDeclaration.java <292:42 292:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.hasDirectlyAnnotation<0> [ReflectionInterfaceDeclaration.java <292:49 292:61>]
@@ -730,6 +754,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInter
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getTypeParameters() [ReflectionInterfaceDeclaration.java <296:5 <296:5  <297:43 297:59> 297:61> 299:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [ReflectionInterfaceDeclaration.java <297:43 297:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getTypeParameters() -> java.lang.Override [ReflectionInterfaceDeclaration.java <296:6 296:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getTypeParameters() -> java.util.List<E> [ReflectionInterfaceDeclaration.java <297:12 297:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReflectionInterfaceDeclaration.java <297:17 297:40>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<297:63> [ReflectionInterfaceDeclaration.java <297:63 297:63>]
@@ -740,6 +765,7 @@ REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarat
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.accessLevel() [ReflectionInterfaceDeclaration.java <301:5 <301:5  <302:24 302:34> 302:36> 304:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [ReflectionInterfaceDeclaration.java <302:24 302:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.accessLevel() -> java.lang.Override [ReflectionInterfaceDeclaration.java <301:6 301:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [ReflectionInterfaceDeclaration.java <302:12 302:22>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<302:38> [ReflectionInterfaceDeclaration.java <302:38 302:38>]
 LOCAL_SYMBOL: ReflectionInterfaceDeclaration.java<302:38> [ReflectionInterfaceDeclaration.java <304:5 304:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionMethodDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionMethodDeclaration.txt
index 6c84f2a5..88966cf9 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionMethodDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionMethodDeclaration.txt
@@ -114,6 +114,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMetho
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getName() [ReflectionMethodDeclaration.java <48:5 <48:5  <49:19 49:25> 49:27> 51:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionMethodDeclaration.java <49:19 49:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getName() -> java.lang.Override [ReflectionMethodDeclaration.java <48:6 48:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getName() -> java.lang.String [ReflectionMethodDeclaration.java <49:12 49:17>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<49:29> [ReflectionMethodDeclaration.java <49:29 49:29>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<49:29> [ReflectionMethodDeclaration.java <51:5 51:5>]
@@ -123,6 +124,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isField() [ReflectionMethodDeclaration.java <53:5 <53:5  <54:20 54:26> 54:28> 56:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [ReflectionMethodDeclaration.java <54:20 54:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isField() -> java.lang.Override [ReflectionMethodDeclaration.java <53:6 53:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isField() -> boolean [ReflectionMethodDeclaration.java <54:12 54:18>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<54:30> [ReflectionMethodDeclaration.java <54:30 54:30>]
@@ -130,12 +132,14 @@ LOCAL_SYMBOL: ReflectionMethodDeclaration.java<54:30> [ReflectionMethodDeclarati
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isParameter() [ReflectionMethodDeclaration.java <58:5 <58:5  <59:20 59:30> 59:32> 61:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [ReflectionMethodDeclaration.java <59:20 59:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isParameter() -> java.lang.Override [ReflectionMethodDeclaration.java <58:6 58:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isParameter() -> boolean [ReflectionMethodDeclaration.java <59:12 59:18>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<59:34> [ReflectionMethodDeclaration.java <59:34 59:34>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<59:34> [ReflectionMethodDeclaration.java <61:5 61:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.toString() [ReflectionMethodDeclaration.java <63:5 <63:5  <64:19 64:26> 64:28> 68:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.toString() -> java.lang.String java.lang.Object.toString() [ReflectionMethodDeclaration.java <64:19 64:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.toString() -> java.lang.Override [ReflectionMethodDeclaration.java <63:6 63:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.toString() -> java.lang.String [ReflectionMethodDeclaration.java <64:12 64:17>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<64:30> [ReflectionMethodDeclaration.java <64:30 64:30>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<64:30> [ReflectionMethodDeclaration.java <68:5 68:5>]
@@ -143,12 +147,14 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isType() [ReflectionMethodDeclaration.java <70:5 <70:5  <71:20 71:25> 71:27> 73:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [ReflectionMethodDeclaration.java <71:20 71:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isType() -> java.lang.Override [ReflectionMethodDeclaration.java <70:6 70:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isType() -> boolean [ReflectionMethodDeclaration.java <71:12 71:18>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<71:29> [ReflectionMethodDeclaration.java <71:29 71:29>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<71:29> [ReflectionMethodDeclaration.java <73:5 73:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.declaringType() [ReflectionMethodDeclaration.java <75:5 <75:5  <76:37 76:49> 76:51> 85:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType() [ReflectionMethodDeclaration.java <76:37 76:49>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.declaringType() -> java.lang.Override [ReflectionMethodDeclaration.java <75:6 75:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionMethodDeclaration.java <76:12 76:35>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<76:53> [ReflectionMethodDeclaration.java <76:53 76:53>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<76:53> [ReflectionMethodDeclaration.java <85:5 85:5>]
@@ -188,6 +194,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceT
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getReturnType() [ReflectionMethodDeclaration.java <87:5 <87:5  <88:17 88:29> 88:31> 90:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.getReturnType() [ReflectionMethodDeclaration.java <88:17 88:29>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getReturnType() -> java.lang.Override [ReflectionMethodDeclaration.java <87:6 87:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getReturnType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReflectionMethodDeclaration.java <88:12 88:15>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<88:33> [ReflectionMethodDeclaration.java <88:33 88:33>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<88:33> [ReflectionMethodDeclaration.java <90:5 90:5>]
@@ -201,6 +208,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getNumberOfParams() [ReflectionMethodDeclaration.java <92:5 <92:5  <93:16 93:32> 93:34> 95:5>]
 SYMBOL_METHOD int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getNumberOfParams() -> int com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getNumberOfParams() [ReflectionMethodDeclaration.java <93:16 93:32>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getNumberOfParams() -> java.lang.Override [ReflectionMethodDeclaration.java <92:6 92:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getNumberOfParams() -> int [ReflectionMethodDeclaration.java <93:12 93:14>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<93:36> [ReflectionMethodDeclaration.java <93:36 93:36>]
@@ -213,6 +221,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.Reflectio
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getParam(int) [ReflectionMethodDeclaration.java <97:5 <97:5  <98:33 98:40> 98:47> 104:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.getParam(int) [ReflectionMethodDeclaration.java <98:33 98:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getParam(int) -> java.lang.Override [ReflectionMethodDeclaration.java <97:6 97:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getParam(int) -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [ReflectionMethodDeclaration.java <98:12 98:31>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getParam(int) -> int [ReflectionMethodDeclaration.java <98:42 98:44>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getParam<0> [ReflectionMethodDeclaration.java <98:46 98:46>]
@@ -245,6 +254,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMetho
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getTypeParameters() [ReflectionMethodDeclaration.java <106:5 <106:5  <107:43 107:59> 107:61> 109:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getTypeParameters() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.getTypeParameters() [ReflectionMethodDeclaration.java <107:43 107:59>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getTypeParameters() -> java.lang.Override [ReflectionMethodDeclaration.java <106:6 106:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getTypeParameters() -> java.util.List<E> [ReflectionMethodDeclaration.java <107:12 107:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.getTypeParameters() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReflectionMethodDeclaration.java <107:17 107:40>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<107:63> [ReflectionMethodDeclaration.java <107:63 107:63>]
@@ -288,6 +298,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMetho
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isAbstract() [ReflectionMethodDeclaration.java <115:5 <115:5  <116:20 116:29> 116:31> 118:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isAbstract() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isAbstract() [ReflectionMethodDeclaration.java <116:20 116:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isAbstract() -> java.lang.Override [ReflectionMethodDeclaration.java <115:6 115:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isAbstract() -> boolean [ReflectionMethodDeclaration.java <116:12 116:18>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<116:33> [ReflectionMethodDeclaration.java <116:33 116:33>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<116:33> [ReflectionMethodDeclaration.java <118:5 118:5>]
@@ -300,6 +311,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isDefaultMethod() [ReflectionMethodDeclaration.java <120:5 <120:5  <121:20 121:34> 121:36> 123:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isDefaultMethod() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isDefaultMethod() [ReflectionMethodDeclaration.java <121:20 121:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isDefaultMethod() -> java.lang.Override [ReflectionMethodDeclaration.java <120:6 120:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isDefaultMethod() -> boolean [ReflectionMethodDeclaration.java <121:12 121:18>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<121:38> [ReflectionMethodDeclaration.java <121:38 121:38>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<121:38> [ReflectionMethodDeclaration.java <123:5 123:5>]
@@ -309,6 +321,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isStatic() [ReflectionMethodDeclaration.java <125:5 <125:5  <126:20 126:27> 126:29> 128:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isStatic() -> boolean com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration.isStatic() [ReflectionMethodDeclaration.java <126:20 126:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isStatic() -> java.lang.Override [ReflectionMethodDeclaration.java <125:6 125:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.isStatic() -> boolean [ReflectionMethodDeclaration.java <126:12 126:18>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<126:31> [ReflectionMethodDeclaration.java <126:31 126:31>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<126:31> [ReflectionMethodDeclaration.java <128:5 128:5>]
@@ -320,6 +333,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.accessLevel() [ReflectionMethodDeclaration.java <130:5 <130:5  <131:24 131:34> 131:36> 133:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.model.declarations.HasAccessLevel.accessLevel() [ReflectionMethodDeclaration.java <131:24 131:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.accessLevel() -> java.lang.Override [ReflectionMethodDeclaration.java <130:6 130:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.AccessLevel com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration.accessLevel() -> com.github.javaparser.symbolsolver.model.declarations.AccessLevel [ReflectionMethodDeclaration.java <131:12 131:22>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<131:38> [ReflectionMethodDeclaration.java <131:38 131:38>]
 LOCAL_SYMBOL: ReflectionMethodDeclaration.java<131:38> [ReflectionMethodDeclaration.java <133:5 133:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionParameterDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionParameterDeclaration.txt
index 446bb444..7ddc27aa 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionParameterDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionParameterDeclaration.txt
@@ -82,6 +82,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParam
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getName() [ReflectionParameterDeclaration.java <39:5 <39:5  <40:19 40:25> 40:27> 42:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.Declaration.getName() [ReflectionParameterDeclaration.java <40:19 40:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getName() -> java.lang.Override [ReflectionParameterDeclaration.java <39:6 39:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getName() -> java.lang.String [ReflectionParameterDeclaration.java <40:12 40:17>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<40:29> [ReflectionParameterDeclaration.java <40:29 40:29>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<40:29> [ReflectionParameterDeclaration.java <42:5 42:5>]
@@ -91,6 +92,7 @@ REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflect
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.toString() [ReflectionParameterDeclaration.java <44:5 <44:5  <45:19 45:26> 45:28> 49:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.toString() -> java.lang.String java.lang.Object.toString() [ReflectionParameterDeclaration.java <45:19 45:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.toString() -> java.lang.Override [ReflectionParameterDeclaration.java <44:6 44:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.toString() -> java.lang.String [ReflectionParameterDeclaration.java <45:12 45:17>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<45:30> [ReflectionParameterDeclaration.java <45:30 45:30>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<45:30> [ReflectionParameterDeclaration.java <49:5 49:5>]
@@ -98,18 +100,21 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isField() [ReflectionParameterDeclaration.java <51:5 <51:5  <52:20 52:26> 52:28> 54:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [ReflectionParameterDeclaration.java <52:20 52:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isField() -> java.lang.Override [ReflectionParameterDeclaration.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isField() -> boolean [ReflectionParameterDeclaration.java <52:12 52:18>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<52:30> [ReflectionParameterDeclaration.java <52:30 52:30>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<52:30> [ReflectionParameterDeclaration.java <54:5 54:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isParameter() [ReflectionParameterDeclaration.java <56:5 <56:5  <57:20 57:30> 57:32> 59:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() [ReflectionParameterDeclaration.java <57:20 57:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isParameter() -> java.lang.Override [ReflectionParameterDeclaration.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isParameter() -> boolean [ReflectionParameterDeclaration.java <57:12 57:18>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<57:34> [ReflectionParameterDeclaration.java <57:34 57:34>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<57:34> [ReflectionParameterDeclaration.java <59:5 59:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isVariadic() [ReflectionParameterDeclaration.java <61:5 <61:5  <62:20 62:29> 62:31> 64:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isVariadic()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isVariadic() -> boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isVariadic() [ReflectionParameterDeclaration.java <62:20 62:29>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isVariadic() -> java.lang.Override [ReflectionParameterDeclaration.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isVariadic() -> boolean [ReflectionParameterDeclaration.java <62:12 62:18>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<62:33> [ReflectionParameterDeclaration.java <62:33 62:33>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<62:33> [ReflectionParameterDeclaration.java <64:5 64:5>]
@@ -117,12 +122,14 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.Refle
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isType() [ReflectionParameterDeclaration.java <66:5 <66:5  <67:20 67:25> 67:27> 69:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [ReflectionParameterDeclaration.java <67:20 67:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isType() -> java.lang.Override [ReflectionParameterDeclaration.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.isType() -> boolean [ReflectionParameterDeclaration.java <67:12 67:18>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<67:29> [ReflectionParameterDeclaration.java <67:29 67:29>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<67:29> [ReflectionParameterDeclaration.java <69:5 69:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getType() [ReflectionParameterDeclaration.java <71:5 <71:5  <72:17 72:23> 72:25> 74:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration.getType() [ReflectionParameterDeclaration.java <72:17 72:23>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getType() -> java.lang.Override [ReflectionParameterDeclaration.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.reflectionmodel.ReflectionParameterDeclaration.getType() -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReflectionParameterDeclaration.java <72:12 72:15>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<72:27> [ReflectionParameterDeclaration.java <72:27 72:27>]
 LOCAL_SYMBOL: ReflectionParameterDeclaration.java<72:27> [ReflectionParameterDeclaration.java <74:5 74:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionTypeParameter.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionTypeParameter.txt
index 25e365c5..af855466 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionTypeParameter.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_ReflectionTypeParameter.txt
@@ -148,6 +148,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeP
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.equals(java.lang.Object) [ReflectionTypeParameter.java <56:5 <56:5  <57:20 57:25> 57:35> 74:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [ReflectionTypeParameter.java <57:20 57:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.equals(java.lang.Object) -> java.lang.Override [ReflectionTypeParameter.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.equals(java.lang.Object) -> boolean [ReflectionTypeParameter.java <57:12 57:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.equals(java.lang.Object) -> java.lang.Object [ReflectionTypeParameter.java <57:27 57:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.equals<0> [ReflectionTypeParameter.java <57:34 57:34>]
@@ -183,6 +184,7 @@ LOCAL_SYMBOL: ReflectionTypeParameter.java<69:60> [ReflectionTypeParameter.java
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.hashCode() [ReflectionTypeParameter.java <76:5 <76:5  <77:16 77:23> 77:25> 81:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.hashCode() -> int java.lang.Object.hashCode() [ReflectionTypeParameter.java <77:16 77:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.hashCode() -> java.lang.Override [ReflectionTypeParameter.java <76:6 76:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.hashCode() -> int [ReflectionTypeParameter.java <77:12 77:14>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<77:27> [ReflectionTypeParameter.java <77:27 77:27>]
@@ -199,6 +201,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeP
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getName() [ReflectionTypeParameter.java <83:5 <83:5  <84:19 84:25> 84:27> 86:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName() [ReflectionTypeParameter.java <84:19 84:25>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getName() -> java.lang.Override [ReflectionTypeParameter.java <83:6 83:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getName() -> java.lang.String [ReflectionTypeParameter.java <84:12 84:17>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<84:29> [ReflectionTypeParameter.java <84:29 84:29>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<84:29> [ReflectionTypeParameter.java <86:5 86:5>]
@@ -208,6 +211,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerQualifiedName() [ReflectionTypeParameter.java <88:5 <88:5  <89:19 89:43> 89:45> 95:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName() [ReflectionTypeParameter.java <89:19 89:43>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerQualifiedName() -> java.lang.Override [ReflectionTypeParameter.java <88:6 88:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerQualifiedName() -> java.lang.String [ReflectionTypeParameter.java <89:12 89:17>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<89:47> [ReflectionTypeParameter.java <89:47 89:47>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<89:47> [ReflectionTypeParameter.java <95:5 95:5>]
@@ -228,6 +232,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerId() [ReflectionTypeParameter.java <97:5 <97:5  <98:19 98:32> 98:34> 104:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerId() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId() [ReflectionTypeParameter.java <98:19 98:32>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerId() -> java.lang.Override [ReflectionTypeParameter.java <97:6 97:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainerId() -> java.lang.String [ReflectionTypeParameter.java <98:12 98:17>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<98:36> [ReflectionTypeParameter.java <98:36 98:36>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<98:36> [ReflectionTypeParameter.java <104:5 104:5>]
@@ -247,6 +252,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainer() [ReflectionTypeParameter.java <106:5 <106:5  <107:31 107:42> 107:44> 109:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer() [ReflectionTypeParameter.java <107:31 107:42>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainer() -> java.lang.Override [ReflectionTypeParameter.java <106:6 106:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable [ReflectionTypeParameter.java <107:12 107:29>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<107:46> [ReflectionTypeParameter.java <107:46 107:46>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<107:46> [ReflectionTypeParameter.java <109:5 109:5>]
@@ -255,6 +261,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParame
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReflectionTypeParameter.java <111:5 <111:5  <112:24 112:32> 112:55> 114:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReflectionTypeParameter.java <112:24 112:32>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ReflectionTypeParameter.java <111:6 111:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<E> [ReflectionTypeParameter.java <112:12 112:15>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound [ReflectionTypeParameter.java <112:17 112:21>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [ReflectionTypeParameter.java <112:34 112:43>]
@@ -286,6 +293,7 @@ QUALIFIER: java.util.stream.Collectors [ReflectionTypeParameter.java <113:148 11
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.toString() [ReflectionTypeParameter.java <116:5 <116:5  <117:19 117:26> 117:28> 121:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.toString() -> java.lang.String java.lang.Object.toString() [ReflectionTypeParameter.java <117:19 117:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.toString() -> java.lang.Override [ReflectionTypeParameter.java <116:6 116:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.toString() -> java.lang.String [ReflectionTypeParameter.java <117:12 117:17>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<117:30> [ReflectionTypeParameter.java <117:30 117:30>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<117:30> [ReflectionTypeParameter.java <121:5 121:5>]
@@ -293,6 +301,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.reflectionmo
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.containerType() [ReflectionTypeParameter.java <123:5 <123:5  <124:47 124:59> 124:61> 129:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [ReflectionTypeParameter.java <124:47 124:59>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.containerType() -> java.lang.Override [ReflectionTypeParameter.java <123:6 123:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.containerType() -> java.util.Optional<T> [ReflectionTypeParameter.java <124:12 124:19>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.reflectionmodel.ReflectionTypeParameter.containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionTypeParameter.java <124:21 124:44>]
 LOCAL_SYMBOL: ReflectionTypeParameter.java<124:63> [ReflectionTypeParameter.java <124:63 124:63>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ClassComparator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ClassComparator.txt
index 1f512cee..6fd7889f 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ClassComparator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ClassComparator.txt
@@ -23,6 +23,7 @@ REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.reflectionmodel.compa
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ClassComparator.compare(java.lang.Class<?>, java.lang.Class<?>) [ClassComparator.java <10:5 <10:5  <11:16 11:22> 11:48> 24:5>]
 SYMBOL_METHOD int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T)
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ClassComparator.compare(java.lang.Class<?>, java.lang.Class<?>) -> int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T) [ClassComparator.java <11:16 11:22>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ClassComparator.compare(java.lang.Class<?>, java.lang.Class<?>) -> java.lang.Override [ClassComparator.java <10:6 10:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ClassComparator.compare(java.lang.Class<?>, java.lang.Class<?>) -> int [ClassComparator.java <11:12 11:14>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ClassComparator.compare(java.lang.Class<?>, java.lang.Class<?>) -> java.lang.Class<T> [ClassComparator.java <11:24 11:28>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_MethodComparator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_MethodComparator.txt
index ee263ad1..cb1768a7 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_MethodComparator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_MethodComparator.txt
@@ -28,6 +28,7 @@ REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.reflectionmodel.compa
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.comparators.MethodComparator.compare(java.lang.reflect.Method, java.lang.reflect.Method) [MethodComparator.java <11:5 <11:5  <12:16 12:22> 12:44> 24:5>]
 SYMBOL_METHOD int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T)
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.MethodComparator.compare(java.lang.reflect.Method, java.lang.reflect.Method) -> int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T) [MethodComparator.java <12:16 12:22>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.MethodComparator.compare(java.lang.reflect.Method, java.lang.reflect.Method) -> java.lang.Override [MethodComparator.java <11:6 11:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.MethodComparator.compare(java.lang.reflect.Method, java.lang.reflect.Method) -> int [MethodComparator.java <12:12 12:14>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.MethodComparator.compare(java.lang.reflect.Method, java.lang.reflect.Method) -> java.lang.reflect.Method [MethodComparator.java <12:24 12:29>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ParameterComparator.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ParameterComparator.txt
index be691a14..b6efbce4 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ParameterComparator.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_reflectionmodel_comparators_ParameterComparator.txt
@@ -28,6 +28,7 @@ REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.reflectionmodel.compa
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ParameterComparator.compare(java.lang.reflect.Parameter, java.lang.reflect.Parameter) [ParameterComparator.java <11:5 <11:5  <12:16 12:22> 12:50> 18:5>]
 SYMBOL_METHOD int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T)
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ParameterComparator.compare(java.lang.reflect.Parameter, java.lang.reflect.Parameter) -> int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T) [ParameterComparator.java <12:16 12:22>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ParameterComparator.compare(java.lang.reflect.Parameter, java.lang.reflect.Parameter) -> java.lang.Override [ParameterComparator.java <11:6 11:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ParameterComparator.compare(java.lang.reflect.Parameter, java.lang.reflect.Parameter) -> int [ParameterComparator.java <12:12 12:14>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.reflectionmodel.comparators.ParameterComparator.compare(java.lang.reflect.Parameter, java.lang.reflect.Parameter) -> java.lang.reflect.Parameter [ParameterComparator.java <12:24 12:32>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_MethodResolutionLogic.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_MethodResolutionLogic.txt
index cb140883..91d65cfc 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_MethodResolutionLogic.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_MethodResolutionLogic.txt
@@ -1180,6 +1180,7 @@ REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.resolution.MethodReso
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.getMethodsWithoutDuplicates.anonymous class (MethodResolutionLogic.java<343:103>).compare(com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration, com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration) [MethodResolutionLogic.java <344:13 <344:13  <345:24 345:30> 345:74> 351:13>]
 SYMBOL_METHOD int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T)
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.getMethodsWithoutDuplicates.anonymous class (MethodResolutionLogic.java<343:103>).compare(com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration, com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration) -> int java.util.Comparator<T>.compare(java.util.Comparator<T>.T, java.util.Comparator<T>.T) [MethodResolutionLogic.java <345:24 345:30>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.getMethodsWithoutDuplicates.anonymous class (MethodResolutionLogic.java<343:103>).compare(com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration, com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration) -> java.lang.Override [MethodResolutionLogic.java <344:14 344:21>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.getMethodsWithoutDuplicates.anonymous class (MethodResolutionLogic.java<343:103>).compare(com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration, com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration) -> int [MethodResolutionLogic.java <345:20 345:22>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.getMethodsWithoutDuplicates.anonymous class (MethodResolutionLogic.java<343:103>).compare(com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration, com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration) -> com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration [MethodResolutionLogic.java <345:32 345:48>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.getMethodsWithoutDuplicates.anonymous class (MethodResolutionLogic.java<343:103>).compare<2> [MethodResolutionLogic.java <345:50 345:51>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_SymbolSolver.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_SymbolSolver.txt
index f08d981a..d2453089 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_SymbolSolver.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_SymbolSolver.txt
@@ -515,6 +515,7 @@ QUALIFIER: com.github.javaparser.symbolsolver.model.resolution.SymbolReference [
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<? extends ValueDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolSolver.solveSymbolInType(com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration, java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration [SymbolSolver.java <148:41 148:56>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolSolver.solveTypeInType(com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration, java.lang.String) [SymbolSolver.java <154:1 <154:1  <155:45 155:59> 155:105> 163:5>]
 COMMENT: comment [SymbolSolver.java <151:5 153:7>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolSolver.solveTypeInType(com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration, java.lang.String) -> java.lang.Deprecated [SymbolSolver.java <154:6 154:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolSolver.solveTypeInType(com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration, java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [SymbolSolver.java <155:12 155:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolSolver.solveTypeInType(com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration, java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [SymbolSolver.java <155:28 155:42>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration> com.github.javaparser.symbolsolver.resolution.SymbolSolver.solveTypeInType(com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration, java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [SymbolSolver.java <155:61 155:75>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_CombinedTypeSolver.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_CombinedTypeSolver.txt
index 864e6fcf..65089109 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_CombinedTypeSolver.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_CombinedTypeSolver.txt
@@ -76,6 +76,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.Combined
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.getParent() [CombinedTypeSolver.java <41:5 <41:5  <42:23 42:31> 42:33> 44:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent() [CombinedTypeSolver.java <42:23 42:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.getParent() -> java.lang.Override [CombinedTypeSolver.java <41:6 41:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [CombinedTypeSolver.java <42:12 42:21>]
 LOCAL_SYMBOL: CombinedTypeSolver.java<42:35> [CombinedTypeSolver.java <42:35 42:35>]
 LOCAL_SYMBOL: CombinedTypeSolver.java<42:35> [CombinedTypeSolver.java <44:5 44:5>]
@@ -84,6 +85,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver c
 SYMBOL_METHOD public void com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CombinedTypeSolver.java <46:5 <46:5  <47:17 47:25> 47:44> 49:5>]
 SYMBOL_METHOD void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE void com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [CombinedTypeSolver.java <47:17 47:25>]
+REFERENCE_ANNOTATION_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [CombinedTypeSolver.java <46:6 46:13>]
 SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void [CombinedTypeSolver.java <47:12 47:15>]
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [CombinedTypeSolver.java <47:27 47:36>]
@@ -110,6 +112,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.Combined
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.tryToSolveType(java.lang.String) [CombinedTypeSolver.java <56:5 <56:5  <57:54 57:67> 57:80> 65:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String) [CombinedTypeSolver.java <57:54 57:67>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.tryToSolveType(java.lang.String) -> java.lang.Override [CombinedTypeSolver.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [CombinedTypeSolver.java <57:12 57:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [CombinedTypeSolver.java <57:28 57:51>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.tryToSolveType(java.lang.String) -> java.lang.String [CombinedTypeSolver.java <57:69 57:74>]
@@ -140,6 +143,7 @@ REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolR
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.solveType(java.lang.String) [CombinedTypeSolver.java <67:5 <67:5  <68:37 68:45> 68:89> 75:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.resolution.TypeSolver.solveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.solveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.resolution.TypeSolver.solveType(java.lang.String) [CombinedTypeSolver.java <68:37 68:45>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.solveType(java.lang.String) -> java.lang.Override [CombinedTypeSolver.java <67:6 67:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.solveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [CombinedTypeSolver.java <68:12 68:35>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.solveType(java.lang.String) -> java.lang.String [CombinedTypeSolver.java <68:47 68:52>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.solveType<0> [CombinedTypeSolver.java <68:54 68:57>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JarTypeSolver.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JarTypeSolver.txt
index 18b506ef..f0818b14 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JarTypeSolver.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JarTypeSolver.txt
@@ -212,6 +212,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeS
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.getParent() [JarTypeSolver.java <77:5 <77:5  <78:23 78:31> 78:33> 80:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent() [JarTypeSolver.java <78:23 78:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.getParent() -> java.lang.Override [JarTypeSolver.java <77:6 77:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [JarTypeSolver.java <78:12 78:21>]
 LOCAL_SYMBOL: JarTypeSolver.java<78:35> [JarTypeSolver.java <78:35 78:35>]
 LOCAL_SYMBOL: JarTypeSolver.java<78:35> [JarTypeSolver.java <80:5 80:5>]
@@ -220,6 +221,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver c
 SYMBOL_METHOD public void com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JarTypeSolver.java <82:5 <82:5  <83:17 83:25> 83:44> 85:5>]
 SYMBOL_METHOD void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE void com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JarTypeSolver.java <83:17 83:25>]
+REFERENCE_ANNOTATION_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [JarTypeSolver.java <82:6 82:13>]
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void [JarTypeSolver.java <83:12 83:15>]
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [JarTypeSolver.java <83:27 83:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.setParent<0> [JarTypeSolver.java <83:38 83:43>]
@@ -261,6 +263,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeS
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.tryToSolveType(java.lang.String) [JarTypeSolver.java <97:5 <97:5  <98:54 98:67> 98:80> 109:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String) [JarTypeSolver.java <98:54 98:67>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.tryToSolveType(java.lang.String) -> java.lang.Override [JarTypeSolver.java <97:6 97:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JarTypeSolver.java <98:12 98:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JarTypeSolver.java <98:28 98:51>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.tryToSolveType(java.lang.String) -> java.lang.String [JarTypeSolver.java <98:69 98:74>]
@@ -305,6 +308,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeS
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.solveType(java.lang.String) [JarTypeSolver.java <111:5 <111:5  <112:37 112:45> 112:89> 119:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.resolution.TypeSolver.solveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.solveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.resolution.TypeSolver.solveType(java.lang.String) [JarTypeSolver.java <112:37 112:45>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.solveType(java.lang.String) -> java.lang.Override [JarTypeSolver.java <111:6 111:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.solveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JarTypeSolver.java <112:12 112:35>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.solveType(java.lang.String) -> java.lang.String [JarTypeSolver.java <112:47 112:52>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver.solveType<0> [JarTypeSolver.java <112:54 112:57>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JavaParserTypeSolver.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JavaParserTypeSolver.txt
index f362fb53..f67ffdbc 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JavaParserTypeSolver.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_JavaParserTypeSolver.txt
@@ -123,6 +123,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JavaPars
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.toString() [JavaParserTypeSolver.java <52:5 <52:5  <53:19 53:26> 53:28> 58:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.toString() -> java.lang.String java.lang.Object.toString() [JavaParserTypeSolver.java <53:19 53:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.toString() -> java.lang.Override [JavaParserTypeSolver.java <52:6 52:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.toString() -> java.lang.String [JavaParserTypeSolver.java <53:12 53:17>]
 LOCAL_SYMBOL: JavaParserTypeSolver.java<53:30> [JavaParserTypeSolver.java <53:30 53:30>]
 LOCAL_SYMBOL: JavaParserTypeSolver.java<53:30> [JavaParserTypeSolver.java <58:5 58:5>]
@@ -132,6 +133,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.resolution.t
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.getParent() [JavaParserTypeSolver.java <60:5 <60:5  <61:23 61:31> 61:33> 63:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent() [JavaParserTypeSolver.java <61:23 61:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.getParent() -> java.lang.Override [JavaParserTypeSolver.java <60:6 60:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [JavaParserTypeSolver.java <61:12 61:21>]
 LOCAL_SYMBOL: JavaParserTypeSolver.java<61:35> [JavaParserTypeSolver.java <61:35 61:35>]
 LOCAL_SYMBOL: JavaParserTypeSolver.java<61:35> [JavaParserTypeSolver.java <63:5 63:5>]
@@ -139,6 +141,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver c
 SYMBOL_METHOD public void com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserTypeSolver.java <65:5 <65:5  <66:17 66:25> 66:44> 68:5>]
 SYMBOL_METHOD void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE void com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserTypeSolver.java <66:17 66:25>]
+REFERENCE_ANNOTATION_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [JavaParserTypeSolver.java <65:6 65:13>]
 SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void [JavaParserTypeSolver.java <66:12 66:15>]
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [JavaParserTypeSolver.java <66:27 66:36>]
@@ -242,6 +245,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.JavaPars
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.tryToSolveType(java.lang.String) [JavaParserTypeSolver.java <94:5 <94:5  <95:54 95:67> 95:80> 111:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String) [JavaParserTypeSolver.java <95:54 95:67>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.tryToSolveType(java.lang.String) -> java.lang.Override [JavaParserTypeSolver.java <94:6 94:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [JavaParserTypeSolver.java <95:12 95:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [JavaParserTypeSolver.java <95:28 95:51>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver.tryToSolveType(java.lang.String) -> java.lang.String [JavaParserTypeSolver.java <95:69 95:74>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_MemoryTypeSolver.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_MemoryTypeSolver.txt
index 960f7bc1..551bfd40 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_MemoryTypeSolver.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_MemoryTypeSolver.txt
@@ -57,6 +57,7 @@ REFERENCE_TYPE_USAGE java.util.Map<java.lang.String, com.github.javaparser.symbo
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.toString() [MemoryTypeSolver.java <36:5 <36:5  <37:19 37:26> 37:28> 42:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.toString() -> java.lang.String java.lang.Object.toString() [MemoryTypeSolver.java <37:19 37:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.toString() -> java.lang.Override [MemoryTypeSolver.java <36:6 36:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.toString() -> java.lang.String [MemoryTypeSolver.java <37:12 37:17>]
 LOCAL_SYMBOL: MemoryTypeSolver.java<37:30> [MemoryTypeSolver.java <37:30 37:30>]
 LOCAL_SYMBOL: MemoryTypeSolver.java<37:30> [MemoryTypeSolver.java <42:5 42:5>]
@@ -67,6 +68,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.resolution.t
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.equals(java.lang.Object) [MemoryTypeSolver.java <44:5 <44:5  <45:20 45:25> 45:35> 54:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [MemoryTypeSolver.java <45:20 45:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.equals(java.lang.Object) -> java.lang.Override [MemoryTypeSolver.java <44:6 44:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.equals(java.lang.Object) -> boolean [MemoryTypeSolver.java <45:12 45:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.equals(java.lang.Object) -> java.lang.Object [MemoryTypeSolver.java <45:27 45:32>]
@@ -98,6 +100,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.resolution.typesolver
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.hashCode() [MemoryTypeSolver.java <56:5 <56:5  <57:16 57:23> 57:25> 61:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.hashCode() -> int java.lang.Object.hashCode() [MemoryTypeSolver.java <57:16 57:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.hashCode() -> java.lang.Override [MemoryTypeSolver.java <56:6 56:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.hashCode() -> int [MemoryTypeSolver.java <57:12 57:14>]
 LOCAL_SYMBOL: MemoryTypeSolver.java<57:27> [MemoryTypeSolver.java <57:27 57:27>]
@@ -117,6 +120,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTy
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.getParent() [MemoryTypeSolver.java <63:5 <63:5  <64:23 64:31> 64:33> 66:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent() [MemoryTypeSolver.java <64:23 64:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.getParent() -> java.lang.Override [MemoryTypeSolver.java <63:6 63:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [MemoryTypeSolver.java <64:12 64:21>]
 LOCAL_SYMBOL: MemoryTypeSolver.java<64:35> [MemoryTypeSolver.java <64:35 64:35>]
 LOCAL_SYMBOL: MemoryTypeSolver.java<64:35> [MemoryTypeSolver.java <66:5 66:5>]
@@ -124,6 +128,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver c
 SYMBOL_METHOD public void com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MemoryTypeSolver.java <68:5 <68:5  <69:17 69:25> 69:44> 71:5>]
 SYMBOL_METHOD void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE void com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [MemoryTypeSolver.java <69:17 69:25>]
+REFERENCE_ANNOTATION_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [MemoryTypeSolver.java <68:6 68:13>]
 SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void [MemoryTypeSolver.java <69:12 69:15>]
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [MemoryTypeSolver.java <69:27 69:36>]
@@ -150,6 +155,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTy
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.tryToSolveType(java.lang.String) [MemoryTypeSolver.java <77:5 <77:5  <78:54 78:67> 78:80> 84:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String) [MemoryTypeSolver.java <78:54 78:67>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.tryToSolveType(java.lang.String) -> java.lang.Override [MemoryTypeSolver.java <77:6 77:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [MemoryTypeSolver.java <78:12 78:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [MemoryTypeSolver.java <78:28 78:51>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver.tryToSolveType(java.lang.String) -> java.lang.String [MemoryTypeSolver.java <78:69 78:74>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_ReflectionTypeSolver.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_ReflectionTypeSolver.txt
index 55f8a612..493113ca 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_ReflectionTypeSolver.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_resolution_typesolvers_ReflectionTypeSolver.txt
@@ -73,6 +73,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.resolution.types
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.getParent() [ReflectionTypeSolver.java <43:5 <43:5  <44:23 44:31> 44:33> 46:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.model.resolution.TypeSolver.getParent() [ReflectionTypeSolver.java <44:23 44:31>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.getParent() -> java.lang.Override [ReflectionTypeSolver.java <43:6 43:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.getParent() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [ReflectionTypeSolver.java <44:12 44:21>]
 LOCAL_SYMBOL: ReflectionTypeSolver.java<44:35> [ReflectionTypeSolver.java <44:35 44:35>]
 LOCAL_SYMBOL: ReflectionTypeSolver.java<44:35> [ReflectionTypeSolver.java <46:5 46:5>]
@@ -81,6 +82,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.resolution.TypeSolver c
 SYMBOL_METHOD public void com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReflectionTypeSolver.java <48:5 <48:5  <49:17 49:25> 49:44> 51:5>]
 SYMBOL_METHOD void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE void com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void com.github.javaparser.symbolsolver.model.resolution.TypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [ReflectionTypeSolver.java <49:17 49:25>]
+REFERENCE_ANNOTATION_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [ReflectionTypeSolver.java <48:6 48:13>]
 SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> void [ReflectionTypeSolver.java <49:12 49:15>]
 REFERENCE_TYPE_USAGE void com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.setParent(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [ReflectionTypeSolver.java <49:27 49:36>]
@@ -93,6 +95,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.Reflecti
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType(java.lang.String) [ReflectionTypeSolver.java <53:5 <53:5  <54:54 54:67> 54:80> 92:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.resolution.TypeSolver.tryToSolveType(java.lang.String) [ReflectionTypeSolver.java <54:54 54:67>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType(java.lang.String) -> java.lang.Override [ReflectionTypeSolver.java <53:6 53:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S> [ReflectionTypeSolver.java <54:12 54:26>]
 REFERENCE_TYPE_ARGUMENT com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReflectionTypeSolver.java <54:28 54:51>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.resolution.SymbolReference<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType(java.lang.String) -> java.lang.String [ReflectionTypeSolver.java <54:69 54:74>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractClassDeclaration.txt
index cef27de2..03091a38 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractClassDeclaration.txt
@@ -47,6 +47,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.logic.AbstractClassDecl
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.hasName() [AbstractClassDeclaration.java <37:5 <37:5  <38:20 38:26> 38:28> 40:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.hasName()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.hasName() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.hasName() [AbstractClassDeclaration.java <38:20 38:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.hasName() -> java.lang.Override [AbstractClassDeclaration.java <37:6 37:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.hasName() -> boolean [AbstractClassDeclaration.java <38:12 38:18>]
 LOCAL_SYMBOL: AbstractClassDeclaration.java<38:30> [AbstractClassDeclaration.java <38:30 38:30>]
@@ -56,6 +57,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.logic.AbstractClassDec
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses() [AbstractClassDeclaration.java <42:5 <42:5  <43:38 43:55> 43:57> 55:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getAllSuperClasses()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getAllSuperClasses() [AbstractClassDeclaration.java <43:38 43:55>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses() -> java.lang.Override [AbstractClassDeclaration.java <42:6 42:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses() -> java.util.List<E> [AbstractClassDeclaration.java <43:18 43:21>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [AbstractClassDeclaration.java <43:23 43:35>]
 LOCAL_SYMBOL: AbstractClassDeclaration.java<43:59> [AbstractClassDeclaration.java <43:59 43:59>]
@@ -105,6 +107,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllInterfaces() [AbstractClassDeclaration.java <57:5 <57:5  <58:38 58:53> 58:55> 69:5>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getAllInterfaces()
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllInterfaces() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.getAllInterfaces() [AbstractClassDeclaration.java <58:38 58:53>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllInterfaces() -> java.lang.Override [AbstractClassDeclaration.java <57:6 57:13>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllInterfaces() -> java.util.List<E> [AbstractClassDeclaration.java <58:18 58:21>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllInterfaces() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [AbstractClassDeclaration.java <58:23 58:35>]
 LOCAL_SYMBOL: AbstractClassDeclaration.java<58:57> [AbstractClassDeclaration.java <58:57 58:57>]
@@ -143,6 +146,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.asClass() [AbstractClassDeclaration.java <71:5 <71:5  <72:35 72:41> 72:43> 74:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asClass()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.asClass() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asClass() [AbstractClassDeclaration.java <72:35 72:41>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.asClass() -> java.lang.Override [AbstractClassDeclaration.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.asClass() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration [AbstractClassDeclaration.java <72:18 72:33>]
 LOCAL_SYMBOL: AbstractClassDeclaration.java<72:45> [AbstractClassDeclaration.java <72:45 72:45>]
 LOCAL_SYMBOL: AbstractClassDeclaration.java<72:45> [AbstractClassDeclaration.java <74:5 74:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractTypeDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractTypeDeclaration.txt
index 64a43c23..6fc037f6 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractTypeDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_AbstractTypeDeclaration.txt
@@ -64,6 +64,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.logic.AbstractTypeDecla
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.getAllMethods() [AbstractTypeDeclaration.java <36:5 <36:5  <37:35 37:47> 37:49> 58:5>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.getAllMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllMethods() [AbstractTypeDeclaration.java <37:35 37:47>]
+REFERENCE_ANNOTATION_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.getAllMethods() -> java.lang.Override [AbstractTypeDeclaration.java <36:6 36:13>]
 REFERENCE_TYPE_USAGE java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.getAllMethods() -> java.util.Set<E> [AbstractTypeDeclaration.java <37:18 37:20>]
 REFERENCE_TYPE_ARGUMENT java.util.Set<com.github.javaparser.symbolsolver.model.methods.MethodUsage> com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.getAllMethods() -> com.github.javaparser.symbolsolver.model.methods.MethodUsage [AbstractTypeDeclaration.java <37:22 37:32>]
 LOCAL_SYMBOL: AbstractTypeDeclaration.java<37:51> [AbstractTypeDeclaration.java <37:51 37:51>]
@@ -132,6 +133,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.g
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.isFunctionalInterface() [AbstractTypeDeclaration.java <60:5 <60:5  <61:26 61:46> 61:48> 63:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isFunctionalInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.isFunctionalInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isFunctionalInterface() [AbstractTypeDeclaration.java <61:26 61:46>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.isFunctionalInterface() -> java.lang.Override [AbstractTypeDeclaration.java <60:6 60:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration.isFunctionalInterface() -> boolean [AbstractTypeDeclaration.java <61:18 61:24>]
 LOCAL_SYMBOL: AbstractTypeDeclaration.java<61:50> [AbstractTypeDeclaration.java <61:50 61:50>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_InferenceVariableType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_InferenceVariableType.txt
index 241b4d32..eea30e51 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_InferenceVariableType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-logic_com_github_javaparser_symbolsolver_logic_InferenceVariableType.txt
@@ -65,6 +65,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.logic.InferenceVariable
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.toString() [InferenceVariableType.java <35:5 <35:5  <36:19 36:26> 36:28> 40:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.toString() -> java.lang.String java.lang.Object.toString() [InferenceVariableType.java <36:19 36:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.toString() -> java.lang.Override [InferenceVariableType.java <35:6 35:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.toString() -> java.lang.String [InferenceVariableType.java <36:12 36:17>]
 LOCAL_SYMBOL: InferenceVariableType.java<36:30> [InferenceVariableType.java <36:30 36:30>]
 LOCAL_SYMBOL: InferenceVariableType.java<36:30> [InferenceVariableType.java <40:5 40:5>]
@@ -109,6 +110,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.reg
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.equals(java.lang.Object) [InferenceVariableType.java <56:5 <56:5  <57:20 57:25> 57:35> 65:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [InferenceVariableType.java <57:20 57:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.equals(java.lang.Object) -> java.lang.Override [InferenceVariableType.java <56:6 56:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.equals(java.lang.Object) -> boolean [InferenceVariableType.java <57:12 57:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.equals(java.lang.Object) -> java.lang.Object [InferenceVariableType.java <57:27 57:32>]
@@ -128,6 +130,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariab
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.logic.InferenceVariableType.hashCode() [InferenceVariableType.java <67:5 <67:5  <68:16 68:23> 68:25> 70:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.logic.InferenceVariableType.hashCode() -> int java.lang.Object.hashCode() [InferenceVariableType.java <68:16 68:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.logic.InferenceVariableType.hashCode() -> java.lang.Override [InferenceVariableType.java <67:6 67:13>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.logic.InferenceVariableType.hashCode() -> int [InferenceVariableType.java <68:12 68:14>]
 LOCAL_SYMBOL: InferenceVariableType.java<68:27> [InferenceVariableType.java <68:27 68:27>]
 LOCAL_SYMBOL: InferenceVariableType.java<68:27> [InferenceVariableType.java <70:5 70:5>]
@@ -194,6 +197,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.fro
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.describe() [InferenceVariableType.java <91:5 <91:5  <92:19 92:26> 92:28> 94:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [InferenceVariableType.java <92:19 92:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.describe() -> java.lang.Override [InferenceVariableType.java <91:6 91:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.logic.InferenceVariableType.describe() -> java.lang.String [InferenceVariableType.java <92:12 92:17>]
 LOCAL_SYMBOL: InferenceVariableType.java<92:30> [InferenceVariableType.java <92:30 92:30>]
 LOCAL_SYMBOL: InferenceVariableType.java<92:30> [InferenceVariableType.java <94:5 94:5>]
@@ -201,6 +205,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.logic.Infere
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [InferenceVariableType.java <96:5 <96:5  <97:20 97:33> 97:45> 99:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [InferenceVariableType.java <97:20 97:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [InferenceVariableType.java <96:6 96:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [InferenceVariableType.java <97:12 97:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.logic.InferenceVariableType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [InferenceVariableType.java <97:35 97:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.isAssignableBy<0> [InferenceVariableType.java <97:40 97:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ClassDeclaration.txt
index 1326df80..9dc27ed2 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ClassDeclaration.txt
@@ -33,6 +33,7 @@ SYMBOL_METHOD default boolean com.github.javaparser.symbolsolver.model.declarati
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isClass()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isClass() [ClassDeclaration.java <34:21 34:27>]
 COMMENT: comment [ClassDeclaration.java <30:5 32:7>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass() -> java.lang.Override [ClassDeclaration.java <33:6 33:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration.isClass() -> boolean [ClassDeclaration.java <34:13 34:19>]
 LOCAL_SYMBOL: ClassDeclaration.java<34:31> [ClassDeclaration.java <34:31 34:31>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ConstructorDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ConstructorDeclaration.txt
index fd1b7848..21d45d8a 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ConstructorDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ConstructorDeclaration.txt
@@ -18,5 +18,6 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.model.declarations.Cons
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() [ConstructorDeclaration.java <26:5 <26:5  <27:22 27:34> 27:36> 27:37>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.declaringType() [ConstructorDeclaration.java <27:22 27:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() -> java.lang.Override [ConstructorDeclaration.java <26:6 26:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration com.github.javaparser.symbolsolver.model.declarations.ConstructorDeclaration.declaringType() -> com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration [ConstructorDeclaration.java <27:5 27:20>]
 COMMENT: comment [ConstructorDeclaration.java <1:1 15:3>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_EnumDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_EnumDeclaration.txt
index de97e529..3a708583 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_EnumDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_EnumDeclaration.txt
@@ -19,6 +19,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.model.declarations.Enum
 SYMBOL_METHOD default boolean com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.isEnum() [EnumDeclaration.java <26:5 <26:5  <27:21 27:26> 27:28> 29:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isEnum()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.isEnum() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isEnum() [EnumDeclaration.java <27:21 27:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.isEnum() -> java.lang.Override [EnumDeclaration.java <26:6 26:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.isEnum() -> boolean [EnumDeclaration.java <27:13 27:19>]
 LOCAL_SYMBOL: EnumDeclaration.java<27:30> [EnumDeclaration.java <27:30 27:30>]
@@ -26,6 +27,7 @@ LOCAL_SYMBOL: EnumDeclaration.java<27:30> [EnumDeclaration.java <29:5 29:5>]
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.asEnum() [EnumDeclaration.java <31:5 <31:5  <32:29 32:34> 32:36> 34:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asEnum()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.asEnum() -> com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asEnum() [EnumDeclaration.java <32:29 32:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.asEnum() -> java.lang.Override [EnumDeclaration.java <31:6 31:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration.asEnum() -> com.github.javaparser.symbolsolver.model.declarations.EnumDeclaration [EnumDeclaration.java <32:13 32:27>]
 LOCAL_SYMBOL: EnumDeclaration.java<32:38> [EnumDeclaration.java <32:38 32:38>]
 LOCAL_SYMBOL: EnumDeclaration.java<32:38> [EnumDeclaration.java <34:5 34:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_FieldDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_FieldDeclaration.txt
index 36a0d8cf..6af58f33 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_FieldDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_FieldDeclaration.txt
@@ -23,12 +23,14 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declaratio
 SYMBOL_METHOD default boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() [FieldDeclaration.java <31:5 <31:5  <32:21 32:27> 32:29> 34:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isField() [FieldDeclaration.java <32:21 32:27>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() -> java.lang.Override [FieldDeclaration.java <31:6 31:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.isField() -> boolean [FieldDeclaration.java <32:13 32:19>]
 LOCAL_SYMBOL: FieldDeclaration.java<32:31> [FieldDeclaration.java <32:31 32:31>]
 LOCAL_SYMBOL: FieldDeclaration.java<32:31> [FieldDeclaration.java <34:5 34:5>]
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.asField() [FieldDeclaration.java <36:5 <36:5  <37:30 37:36> 37:38> 39:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asField()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.asField() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asField() [FieldDeclaration.java <37:30 37:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.asField() -> java.lang.Override [FieldDeclaration.java <36:6 36:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration.asField() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [FieldDeclaration.java <37:13 37:28>]
 LOCAL_SYMBOL: FieldDeclaration.java<37:40> [FieldDeclaration.java <37:40 37:40>]
 LOCAL_SYMBOL: FieldDeclaration.java<37:40> [FieldDeclaration.java <39:5 39:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_InterfaceDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_InterfaceDeclaration.txt
index 569854b8..686cca13 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_InterfaceDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_InterfaceDeclaration.txt
@@ -35,6 +35,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.model.declarations.Inte
 SYMBOL_METHOD default boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface() [InterfaceDeclaration.java <31:5 <31:5  <32:21 32:31> 32:33> 34:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isInterface() [InterfaceDeclaration.java <32:21 32:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface() -> java.lang.Override [InterfaceDeclaration.java <31:6 31:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration.isInterface() -> boolean [InterfaceDeclaration.java <32:13 32:19>]
 LOCAL_SYMBOL: InterfaceDeclaration.java<32:35> [InterfaceDeclaration.java <32:35 32:35>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_MethodLikeDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_MethodLikeDeclaration.txt
index c2fddbbe..af9c45d7 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_MethodLikeDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_MethodLikeDeclaration.txt
@@ -144,6 +144,7 @@ REFERENCE_CALL boolean com.github.javaparser.symbolsolver.model.declarations.Met
 SYMBOL_METHOD default java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.findTypeParameter(java.lang.String) [MethodLikeDeclaration.java <113:5 <113:5  <114:48 114:64> 114:77> 121:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.findTypeParameter(java.lang.String)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.findTypeParameter(java.lang.String) -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.findTypeParameter(java.lang.String) [MethodLikeDeclaration.java <114:48 114:64>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.findTypeParameter(java.lang.String) -> java.lang.Override [MethodLikeDeclaration.java <113:6 113:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.findTypeParameter(java.lang.String) -> java.util.Optional<T> [MethodLikeDeclaration.java <114:13 114:20>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.findTypeParameter(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [MethodLikeDeclaration.java <114:22 114:45>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration.findTypeParameter(java.lang.String) -> java.lang.String [MethodLikeDeclaration.java <114:66 114:71>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ParameterDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ParameterDeclaration.txt
index 4f13c243..450605bb 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ParameterDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ParameterDeclaration.txt
@@ -18,6 +18,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.model.declarations.Para
 SYMBOL_METHOD default boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() [ParameterDeclaration.java <26:5 <26:5  <27:21 27:31> 27:33> 29:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isParameter() [ParameterDeclaration.java <27:21 27:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() -> java.lang.Override [ParameterDeclaration.java <26:6 26:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.isParameter() -> boolean [ParameterDeclaration.java <27:13 27:19>]
 LOCAL_SYMBOL: ParameterDeclaration.java<27:35> [ParameterDeclaration.java <27:35 27:35>]
@@ -25,6 +26,7 @@ LOCAL_SYMBOL: ParameterDeclaration.java<27:35> [ParameterDeclaration.java <29:5
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.asParameter() [ParameterDeclaration.java <31:5 <31:5  <32:34 32:44> 32:46> 34:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asParameter()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.asParameter() -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asParameter() [ParameterDeclaration.java <32:34 32:44>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.asParameter() -> java.lang.Override [ParameterDeclaration.java <31:6 31:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration.asParameter() -> com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration [ParameterDeclaration.java <32:13 32:32>]
 LOCAL_SYMBOL: ParameterDeclaration.java<32:48> [ParameterDeclaration.java <32:48 32:48>]
 LOCAL_SYMBOL: ParameterDeclaration.java<32:48> [ParameterDeclaration.java <34:5 34:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ReferenceTypeDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ReferenceTypeDeclaration.txt
index 355b91c2..a991ca69 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ReferenceTypeDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_ReferenceTypeDeclaration.txt
@@ -68,6 +68,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.model.declarations.Refe
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.asReferenceType() [ReferenceTypeDeclaration.java <19:5 <19:5  <20:38 20:52> 20:54> 22:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asReferenceType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.asReferenceType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asReferenceType() [ReferenceTypeDeclaration.java <20:38 20:52>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.asReferenceType() -> java.lang.Override [ReferenceTypeDeclaration.java <19:6 19:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.asReferenceType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [ReferenceTypeDeclaration.java <20:13 20:36>]
 LOCAL_SYMBOL: ReferenceTypeDeclaration.java<20:56> [ReferenceTypeDeclaration.java <20:56 20:56>]
 LOCAL_SYMBOL: ReferenceTypeDeclaration.java<20:56> [ReferenceTypeDeclaration.java <22:5 22:5>]
@@ -372,6 +373,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declaratio
 SYMBOL_METHOD default java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.findTypeParameter(java.lang.String) [ReferenceTypeDeclaration.java <213:5 <213:5  <214:48 214:64> 214:77> 224:5>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.findTypeParameter(java.lang.String)
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.findTypeParameter(java.lang.String) -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable.findTypeParameter(java.lang.String) [ReferenceTypeDeclaration.java <214:48 214:64>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.findTypeParameter(java.lang.String) -> java.lang.Override [ReferenceTypeDeclaration.java <213:6 213:13>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.findTypeParameter(java.lang.String) -> java.util.Optional<T> [ReferenceTypeDeclaration.java <214:13 214:20>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.findTypeParameter(java.lang.String) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReferenceTypeDeclaration.java <214:22 214:45>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.findTypeParameter(java.lang.String) -> java.lang.String [ReferenceTypeDeclaration.java <214:66 214:71>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeDeclaration.txt
index de73d002..286d1b19 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeDeclaration.txt
@@ -122,12 +122,14 @@ LOCAL_SYMBOL: TypeDeclaration.java<98:39> [TypeDeclaration.java <100:5 100:5>]
 SYMBOL_METHOD default boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() [TypeDeclaration.java <102:5 <102:5  <103:21 103:26> 103:28> 105:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() -> boolean com.github.javaparser.symbolsolver.model.declarations.Declaration.isType() [TypeDeclaration.java <103:21 103:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() -> java.lang.Override [TypeDeclaration.java <102:6 102:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.isType() -> boolean [TypeDeclaration.java <103:13 103:19>]
 LOCAL_SYMBOL: TypeDeclaration.java<103:30> [TypeDeclaration.java <103:30 103:30>]
 LOCAL_SYMBOL: TypeDeclaration.java<103:30> [TypeDeclaration.java <105:5 105:5>]
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asType() [TypeDeclaration.java <107:5 <107:5  <108:29 108:34> 108:36> 110:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.Declaration.asType() [TypeDeclaration.java <108:29 108:34>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asType() -> java.lang.Override [TypeDeclaration.java <107:6 107:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.asType() -> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration [TypeDeclaration.java <108:13 108:27>]
 LOCAL_SYMBOL: TypeDeclaration.java<108:38> [TypeDeclaration.java <108:38 108:38>]
 LOCAL_SYMBOL: TypeDeclaration.java<108:38> [TypeDeclaration.java <110:5 110:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeParameterDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeParameterDeclaration.txt
index 8293eb2f..a66143b7 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeParameterDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_declarations_TypeParameterDeclaration.txt
@@ -57,6 +57,7 @@ REFERENCE_INHERITANCE com.github.javaparser.symbolsolver.model.declarations.Type
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getName() [TypeParameterDeclaration.java <43:13 <43:13  <44:27 44:33> 44:35> 46:13>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getName() [TypeParameterDeclaration.java <44:27 44:33>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getName() -> java.lang.Override [TypeParameterDeclaration.java <43:14 43:21>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getName() -> java.lang.String [TypeParameterDeclaration.java <44:20 44:25>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<44:37> [TypeParameterDeclaration.java <44:37 44:37>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<44:37> [TypeParameterDeclaration.java <46:13 46:13>]
@@ -64,6 +65,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeParamete
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnType() [TypeParameterDeclaration.java <48:13 <48:13  <49:28 49:41> 49:43> 51:13>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.declaredOnType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnType() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.declaredOnType() [TypeParameterDeclaration.java <49:28 49:41>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnType() -> java.lang.Override [TypeParameterDeclaration.java <48:14 48:21>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnType() -> boolean [TypeParameterDeclaration.java <49:20 49:26>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<49:45> [TypeParameterDeclaration.java <49:45 49:45>]
@@ -71,18 +73,21 @@ LOCAL_SYMBOL: TypeParameterDeclaration.java<49:45> [TypeParameterDeclaration.jav
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnMethod() [TypeParameterDeclaration.java <53:13 <53:13  <54:28 54:43> 54:45> 56:13>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.declaredOnMethod()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnMethod() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.declaredOnMethod() [TypeParameterDeclaration.java <54:28 54:43>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnMethod() -> java.lang.Override [TypeParameterDeclaration.java <53:14 53:21>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnMethod() -> boolean [TypeParameterDeclaration.java <54:20 54:26>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<54:47> [TypeParameterDeclaration.java <54:47 54:47>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<54:47> [TypeParameterDeclaration.java <56:13 56:13>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnConstructor() [TypeParameterDeclaration.java <58:13 <58:13  <59:28 59:48> 59:50> 61:13>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.declaredOnConstructor()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnConstructor() -> boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.declaredOnConstructor() [TypeParameterDeclaration.java <59:28 59:48>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnConstructor() -> java.lang.Override [TypeParameterDeclaration.java <58:14 58:21>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).declaredOnConstructor() -> boolean [TypeParameterDeclaration.java <59:20 59:26>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<59:52> [TypeParameterDeclaration.java <59:52 59:52>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<59:52> [TypeParameterDeclaration.java <61:13 61:13>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerQualifiedName() [TypeParameterDeclaration.java <63:13 <63:13  <64:27 64:51> 64:53> 66:13>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerQualifiedName() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerQualifiedName() [TypeParameterDeclaration.java <64:27 64:51>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerQualifiedName() -> java.lang.Override [TypeParameterDeclaration.java <63:14 63:21>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerQualifiedName() -> java.lang.String [TypeParameterDeclaration.java <64:20 64:25>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<64:55> [TypeParameterDeclaration.java <64:55 64:55>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<64:55> [TypeParameterDeclaration.java <66:13 66:13>]
@@ -90,6 +95,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeParamete
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerId() [TypeParameterDeclaration.java <68:13 <68:13  <69:27 69:40> 69:42> 71:13>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerId() -> java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainerId() [TypeParameterDeclaration.java <69:27 69:40>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerId() -> java.lang.Override [TypeParameterDeclaration.java <68:14 68:21>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainerId() -> java.lang.String [TypeParameterDeclaration.java <69:20 69:25>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<69:44> [TypeParameterDeclaration.java <69:44 69:44>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<69:44> [TypeParameterDeclaration.java <71:13 71:13>]
@@ -97,12 +103,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeParamete
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainer() [TypeParameterDeclaration.java <73:13 <73:13  <74:39 74:50> 74:52> 76:13>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getContainer() [TypeParameterDeclaration.java <74:39 74:50>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainer() -> java.lang.Override [TypeParameterDeclaration.java <73:14 73:21>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getContainer() -> com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable [TypeParameterDeclaration.java <74:20 74:37>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<74:54> [TypeParameterDeclaration.java <74:54 74:54>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<74:54> [TypeParameterDeclaration.java <76:13 76:13>]
 SYMBOL_METHOD public java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TypeParameterDeclaration.java <78:13 <78:13  <79:32 79:40> 79:63> 81:13>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_OVERRIDE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [TypeParameterDeclaration.java <79:32 79:40>]
+REFERENCE_ANNOTATION_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.lang.Override [TypeParameterDeclaration.java <78:14 78:21>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> java.util.List<E> [TypeParameterDeclaration.java <79:20 79:23>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound [TypeParameterDeclaration.java <79:25 79:29>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.Bound> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).getBounds(com.github.javaparser.symbolsolver.model.resolution.TypeSolver) -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver [TypeParameterDeclaration.java <79:42 79:51>]
@@ -113,6 +121,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeParamete
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).toString() [TypeParameterDeclaration.java <83:13 <83:13  <84:27 84:34> 84:36> 86:13>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).toString() -> java.lang.String java.lang.Object.toString() [TypeParameterDeclaration.java <84:27 84:34>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).toString() -> java.lang.Override [TypeParameterDeclaration.java <83:14 83:21>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).toString() -> java.lang.String [TypeParameterDeclaration.java <84:20 84:25>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<84:38> [TypeParameterDeclaration.java <84:38 84:38>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<84:38> [TypeParameterDeclaration.java <86:13 86:13>]
@@ -120,6 +129,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeParamete
 SYMBOL_METHOD public java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).containerType() [TypeParameterDeclaration.java <88:13 <88:13  <89:55 89:67> 89:69> 91:13>]
 SYMBOL_METHOD java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType()
 REFERENCE_OVERRIDE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).containerType() -> java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.containerType() [TypeParameterDeclaration.java <89:55 89:67>]
+REFERENCE_ANNOTATION_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).containerType() -> java.lang.Override [TypeParameterDeclaration.java <88:14 88:21>]
 REFERENCE_TYPE_USAGE java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).containerType() -> java.util.Optional<T> [TypeParameterDeclaration.java <89:20 89:27>]
 REFERENCE_TYPE_ARGUMENT java.util.Optional<com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration.onType.anonymous class (TypeParameterDeclaration.java<42:47>).containerType() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration [TypeParameterDeclaration.java <89:29 89:52>]
 LOCAL_SYMBOL: TypeParameterDeclaration.java<89:71> [TypeParameterDeclaration.java <89:71 89:71>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_methods_MethodUsage.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_methods_MethodUsage.txt
index 37ac0f7e..a2329ff3 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_methods_MethodUsage.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_methods_MethodUsage.txt
@@ -161,6 +161,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.methods.MethodUsage.Metho
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.methods.MethodUsage.toString() [MethodUsage.java <60:5 <60:5  <61:19 61:26> 61:28> 66:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.methods.MethodUsage.toString() -> java.lang.String java.lang.Object.toString() [MethodUsage.java <61:19 61:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.methods.MethodUsage.toString() -> java.lang.Override [MethodUsage.java <60:6 60:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.methods.MethodUsage.toString() -> java.lang.String [MethodUsage.java <61:12 61:17>]
 LOCAL_SYMBOL: MethodUsage.java<61:30> [MethodUsage.java <61:30 61:30>]
 LOCAL_SYMBOL: MethodUsage.java<61:30> [MethodUsage.java <66:5 66:5>]
@@ -350,6 +351,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.methods.MethodUsage.repla
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.methods.MethodUsage.typeParametersMap() [MethodUsage.java <139:5 <139:5  <140:30 140:46> 140:48> 142:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametrized.typeParametersMap()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.methods.MethodUsage.typeParametersMap() -> com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametrized.typeParametersMap() [MethodUsage.java <140:30 140:46>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.methods.MethodUsage.typeParametersMap() -> java.lang.Override [MethodUsage.java <139:6 139:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.methods.MethodUsage.typeParametersMap() -> com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap [MethodUsage.java <140:12 140:28>]
 LOCAL_SYMBOL: MethodUsage.java<140:50> [MethodUsage.java <140:50 140:50>]
 LOCAL_SYMBOL: MethodUsage.java<140:50> [MethodUsage.java <142:5 142:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_SymbolReference.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_SymbolReference.txt
index 38ce19cd..dc4a8c3f 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_SymbolReference.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_SymbolReference.txt
@@ -84,6 +84,7 @@ REFERENCE_TYPE_ARGUMENT static com.github.javaparser.symbolsolver.model.resoluti
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S>.toString() [SymbolReference.java <51:5 <51:5  <52:19 52:26> 52:28> 54:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S>.toString() -> java.lang.String java.lang.Object.toString() [SymbolReference.java <52:19 52:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S>.toString() -> java.lang.Override [SymbolReference.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.resolution.SymbolReference<S>.toString() -> java.lang.String [SymbolReference.java <52:12 52:17>]
 LOCAL_SYMBOL: SymbolReference.java<52:30> [SymbolReference.java <52:30 52:30>]
 LOCAL_SYMBOL: SymbolReference.java<52:30> [SymbolReference.java <54:5 54:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_UnsolvedSymbolException.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_UnsolvedSymbolException.txt
index e6cfacfd..86159c2f 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_UnsolvedSymbolException.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_UnsolvedSymbolException.txt
@@ -73,6 +73,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbol
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException.toString() [UnsolvedSymbolException.java <48:5 <48:5  <49:19 49:26> 49:28> 55:5>]
 SYMBOL_METHOD java.lang.String java.lang.Throwable.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException.toString() -> java.lang.String java.lang.Throwable.toString() [UnsolvedSymbolException.java <49:19 49:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException.toString() -> java.lang.Override [UnsolvedSymbolException.java <48:6 48:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException.toString() -> java.lang.String [UnsolvedSymbolException.java <49:12 49:17>]
 LOCAL_SYMBOL: UnsolvedSymbolException.java<49:30> [UnsolvedSymbolException.java <49:30 49:30>]
 LOCAL_SYMBOL: UnsolvedSymbolException.java<49:30> [UnsolvedSymbolException.java <55:5 55:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_Value.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_Value.txt
index 9e32334f..fecfbee6 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_Value.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_resolution_Value.txt
@@ -71,6 +71,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.resolution.Value.from<0>
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.resolution.Value.toString() [Value.java <44:5 <44:5  <45:19 45:26> 45:28> 50:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.resolution.Value.toString() -> java.lang.String java.lang.Object.toString() [Value.java <45:19 45:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.resolution.Value.toString() -> java.lang.Override [Value.java <44:6 44:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.resolution.Value.toString() -> java.lang.String [Value.java <45:12 45:17>]
 LOCAL_SYMBOL: Value.java<45:30> [Value.java <45:30 45:30>]
 LOCAL_SYMBOL: Value.java<45:30> [Value.java <50:5 50:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ArrayType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ArrayType.txt
index 2f7718db..67d52384 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ArrayType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ArrayType.txt
@@ -41,6 +41,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ArrayType.Arra
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.equals(java.lang.Object) [ArrayType.java <40:5 <40:5  <41:20 41:25> 41:35> 50:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [ArrayType.java <41:20 41:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.equals(java.lang.Object) -> java.lang.Override [ArrayType.java <40:6 40:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.equals(java.lang.Object) -> boolean [ArrayType.java <41:12 41:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.equals(java.lang.Object) -> java.lang.Object [ArrayType.java <41:27 41:32>]
@@ -64,6 +65,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Arra
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.model.typesystem.ArrayType.hashCode() [ArrayType.java <52:5 <52:5  <53:16 53:23> 53:25> 55:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.model.typesystem.ArrayType.hashCode() -> int java.lang.Object.hashCode() [ArrayType.java <53:16 53:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.model.typesystem.ArrayType.hashCode() -> java.lang.Override [ArrayType.java <52:6 52:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.ArrayType.hashCode() -> int [ArrayType.java <53:12 53:14>]
 LOCAL_SYMBOL: ArrayType.java<53:27> [ArrayType.java <53:27 53:27>]
@@ -73,6 +75,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.ArrayTyp
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.toString() [ArrayType.java <57:5 <57:5  <58:19 58:26> 58:28> 60:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.toString() -> java.lang.String java.lang.Object.toString() [ArrayType.java <58:19 58:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.toString() -> java.lang.Override [ArrayType.java <57:6 57:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.toString() -> java.lang.String [ArrayType.java <58:12 58:17>]
 LOCAL_SYMBOL: ArrayType.java<58:30> [ArrayType.java <58:30 58:30>]
 LOCAL_SYMBOL: ArrayType.java<58:30> [ArrayType.java <60:5 60:5>]
@@ -80,18 +83,21 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesy
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.ArrayType.asArrayType() [ArrayType.java <66:5 <66:5  <67:22 67:32> 67:34> 69:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.Type.asArrayType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.ArrayType.asArrayType() -> com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.Type.asArrayType() [ArrayType.java <67:22 67:32>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.ArrayType.asArrayType() -> java.lang.Override [ArrayType.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ArrayType com.github.javaparser.symbolsolver.model.typesystem.ArrayType.asArrayType() -> com.github.javaparser.symbolsolver.model.typesystem.ArrayType [ArrayType.java <67:12 67:20>]
 LOCAL_SYMBOL: ArrayType.java<67:36> [ArrayType.java <67:36 67:36>]
 LOCAL_SYMBOL: ArrayType.java<67:36> [ArrayType.java <69:5 69:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isArray() [ArrayType.java <71:5 <71:5  <72:20 72:26> 72:28> 74:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isArray() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray() [ArrayType.java <72:20 72:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isArray() -> java.lang.Override [ArrayType.java <71:6 71:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isArray() -> boolean [ArrayType.java <72:12 72:18>]
 LOCAL_SYMBOL: ArrayType.java<72:30> [ArrayType.java <72:30 72:30>]
 LOCAL_SYMBOL: ArrayType.java<72:30> [ArrayType.java <74:5 74:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.describe() [ArrayType.java <76:5 <76:5  <77:19 77:26> 77:28> 79:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [ArrayType.java <77:19 77:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.describe() -> java.lang.Override [ArrayType.java <76:6 76:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ArrayType.describe() -> java.lang.String [ArrayType.java <77:12 77:17>]
 LOCAL_SYMBOL: ArrayType.java<77:30> [ArrayType.java <77:30 77:30>]
 LOCAL_SYMBOL: ArrayType.java<77:30> [ArrayType.java <79:5 79:5>]
@@ -105,6 +111,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ArrayType.java <85:5 <85:5  <86:20 86:33> 86:45> 96:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ArrayType.java <86:20 86:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [ArrayType.java <85:6 85:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [ArrayType.java <86:12 86:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ArrayType.java <86:35 86:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ArrayType.isAssignableBy<0> [ArrayType.java <86:40 86:44>]
@@ -142,6 +149,7 @@ LOCAL_SYMBOL: ArrayType.java<92:36> [ArrayType.java <94:9 94:9>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ArrayType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [ArrayType.java <98:5 <98:5  <99:17 99:36> 99:140> 106:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ArrayType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [ArrayType.java <99:17 99:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ArrayType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Override [ArrayType.java <98:6 98:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ArrayType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ArrayType.java <99:12 99:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ArrayType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ArrayType.java <99:38 99:61>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ArrayType.replaceTypeVariables<0> [ArrayType.java <99:63 99:73>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_LambdaConstraintType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_LambdaConstraintType.txt
index 41f3c6a5..a756cd56 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_LambdaConstraintType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_LambdaConstraintType.txt
@@ -28,6 +28,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LambdaConstrai
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.describe() [LambdaConstraintType.java <10:5 <10:5  <11:19 11:26> 11:28> 13:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [LambdaConstraintType.java <11:19 11:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.describe() -> java.lang.Override [LambdaConstraintType.java <10:6 10:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.describe() -> java.lang.String [LambdaConstraintType.java <11:12 11:17>]
 LOCAL_SYMBOL: LambdaConstraintType.java<11:30> [LambdaConstraintType.java <11:30 11:30>]
 LOCAL_SYMBOL: LambdaConstraintType.java<11:30> [LambdaConstraintType.java <13:5 13:5>]
@@ -41,6 +42,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isConstraint() [LambdaConstraintType.java <19:5 <19:5  <20:20 20:31> 20:33> 22:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isConstraint()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isConstraint() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isConstraint() [LambdaConstraintType.java <20:20 20:31>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isConstraint() -> java.lang.Override [LambdaConstraintType.java <19:6 19:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isConstraint() -> boolean [LambdaConstraintType.java <20:12 20:18>]
 LOCAL_SYMBOL: LambdaConstraintType.java<20:35> [LambdaConstraintType.java <20:35 20:35>]
@@ -48,6 +50,7 @@ LOCAL_SYMBOL: LambdaConstraintType.java<20:35> [LambdaConstraintType.java <22:5
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.asConstraintType() [LambdaConstraintType.java <24:5 <24:5  <25:33 25:48> 25:50> 27:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType com.github.javaparser.symbolsolver.model.typesystem.Type.asConstraintType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.asConstraintType() -> com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType com.github.javaparser.symbolsolver.model.typesystem.Type.asConstraintType() [LambdaConstraintType.java <25:33 25:48>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.asConstraintType() -> java.lang.Override [LambdaConstraintType.java <24:6 24:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.asConstraintType() -> com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType [LambdaConstraintType.java <25:12 25:31>]
 LOCAL_SYMBOL: LambdaConstraintType.java<25:52> [LambdaConstraintType.java <25:52 25:52>]
 LOCAL_SYMBOL: LambdaConstraintType.java<25:52> [LambdaConstraintType.java <27:5 27:5>]
@@ -64,6 +67,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LambdaConstrai
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [LambdaConstraintType.java <33:5 <33:5  <34:20 34:33> 34:45> 36:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [LambdaConstraintType.java <34:20 34:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [LambdaConstraintType.java <33:6 33:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [LambdaConstraintType.java <34:12 34:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [LambdaConstraintType.java <34:35 34:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.LambdaConstraintType.isAssignableBy<0> [LambdaConstraintType.java <34:40 34:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_NullType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_NullType.txt
index 40f840f6..66db45bd 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_NullType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_NullType.txt
@@ -26,6 +26,7 @@ LOCAL_SYMBOL: NullType.java<28:24> [NullType.java <30:5 30:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isArray() [NullType.java <32:5 <32:5  <33:20 33:26> 33:28> 35:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isArray() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray() [NullType.java <33:20 33:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isArray() -> java.lang.Override [NullType.java <32:6 32:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isArray() -> boolean [NullType.java <33:12 33:18>]
 LOCAL_SYMBOL: NullType.java<33:30> [NullType.java <33:30 33:30>]
@@ -33,6 +34,7 @@ LOCAL_SYMBOL: NullType.java<33:30> [NullType.java <35:5 35:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isPrimitive() [NullType.java <37:5 <37:5  <38:20 38:30> 38:32> 40:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isPrimitive() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive() [NullType.java <38:20 38:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isPrimitive() -> java.lang.Override [NullType.java <37:6 37:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isPrimitive() -> boolean [NullType.java <38:12 38:18>]
 LOCAL_SYMBOL: NullType.java<38:34> [NullType.java <38:34 38:34>]
 LOCAL_SYMBOL: NullType.java<38:34> [NullType.java <40:5 40:5>]
@@ -45,24 +47,28 @@ LOCAL_SYMBOL: NullType.java<42:29> [NullType.java <44:5 44:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isReferenceType() [NullType.java <46:5 <46:5  <47:20 47:34> 47:36> 49:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isReferenceType() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType() [NullType.java <47:20 47:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isReferenceType() -> java.lang.Override [NullType.java <46:6 46:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isReferenceType() -> boolean [NullType.java <47:12 47:18>]
 LOCAL_SYMBOL: NullType.java<47:38> [NullType.java <47:38 47:38>]
 LOCAL_SYMBOL: NullType.java<47:38> [NullType.java <49:5 49:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.NullType.describe() [NullType.java <51:5 <51:5  <52:19 52:26> 52:28> 54:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.NullType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [NullType.java <52:19 52:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.NullType.describe() -> java.lang.Override [NullType.java <51:6 51:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.NullType.describe() -> java.lang.String [NullType.java <52:12 52:17>]
 LOCAL_SYMBOL: NullType.java<52:30> [NullType.java <52:30 52:30>]
 LOCAL_SYMBOL: NullType.java<52:30> [NullType.java <54:5 54:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isTypeVariable() [NullType.java <56:5 <56:5  <57:20 57:33> 57:35> 59:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isTypeVariable() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable() [NullType.java <57:20 57:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isTypeVariable() -> java.lang.Override [NullType.java <56:6 56:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isTypeVariable() -> boolean [NullType.java <57:12 57:18>]
 LOCAL_SYMBOL: NullType.java<57:37> [NullType.java <57:37 57:37>]
 LOCAL_SYMBOL: NullType.java<57:37> [NullType.java <59:5 59:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [NullType.java <61:5 <61:5  <62:20 62:33> 62:45> 64:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [NullType.java <62:20 62:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [NullType.java <61:6 61:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [NullType.java <62:12 62:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.NullType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [NullType.java <62:35 62:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.NullType.isAssignableBy<0> [NullType.java <62:40 62:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_PrimitiveType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_PrimitiveType.txt
index b0eac9c5..76b10de7 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_PrimitiveType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_PrimitiveType.txt
@@ -199,6 +199,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.toString() [PrimitiveType.java <66:5 <66:5  <67:19 67:26> 67:28> 71:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.toString() -> java.lang.String java.lang.Object.toString() [PrimitiveType.java <67:19 67:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.toString() -> java.lang.Override [PrimitiveType.java <66:6 66:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.toString() -> java.lang.String [PrimitiveType.java <67:12 67:17>]
 LOCAL_SYMBOL: PrimitiveType.java<67:30> [PrimitiveType.java <67:30 67:30>]
 LOCAL_SYMBOL: PrimitiveType.java<67:30> [PrimitiveType.java <71:5 71:5>]
@@ -212,6 +213,7 @@ LOCAL_SYMBOL: PrimitiveType.java<73:40> [PrimitiveType.java <75:5 75:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isArray() [PrimitiveType.java <77:5 <77:5  <78:20 78:26> 78:28> 80:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isArray() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray() [PrimitiveType.java <78:20 78:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isArray() -> java.lang.Override [PrimitiveType.java <77:6 77:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isArray() -> boolean [PrimitiveType.java <78:12 78:18>]
 LOCAL_SYMBOL: PrimitiveType.java<78:30> [PrimitiveType.java <78:30 78:30>]
@@ -219,18 +221,21 @@ LOCAL_SYMBOL: PrimitiveType.java<78:30> [PrimitiveType.java <80:5 80:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isPrimitive() [PrimitiveType.java <82:5 <82:5  <83:20 83:30> 83:32> 85:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isPrimitive() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive() [PrimitiveType.java <83:20 83:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isPrimitive() -> java.lang.Override [PrimitiveType.java <82:6 82:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isPrimitive() -> boolean [PrimitiveType.java <83:12 83:18>]
 LOCAL_SYMBOL: PrimitiveType.java<83:34> [PrimitiveType.java <83:34 83:34>]
 LOCAL_SYMBOL: PrimitiveType.java<83:34> [PrimitiveType.java <85:5 85:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isReferenceType() [PrimitiveType.java <87:5 <87:5  <88:20 88:34> 88:36> 90:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isReferenceType() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType() [PrimitiveType.java <88:20 88:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isReferenceType() -> java.lang.Override [PrimitiveType.java <87:6 87:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isReferenceType() -> boolean [PrimitiveType.java <88:12 88:18>]
 LOCAL_SYMBOL: PrimitiveType.java<88:38> [PrimitiveType.java <88:38 88:38>]
 LOCAL_SYMBOL: PrimitiveType.java<88:38> [PrimitiveType.java <90:5 90:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.describe() [PrimitiveType.java <92:5 <92:5  <93:19 93:26> 93:28> 95:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [PrimitiveType.java <93:19 93:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.describe() -> java.lang.Override [PrimitiveType.java <92:6 92:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.describe() -> java.lang.String [PrimitiveType.java <93:12 93:17>]
 LOCAL_SYMBOL: PrimitiveType.java<93:30> [PrimitiveType.java <93:30 93:30>]
 LOCAL_SYMBOL: PrimitiveType.java<93:30> [PrimitiveType.java <95:5 95:5>]
@@ -238,12 +243,14 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesy
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isTypeVariable() [PrimitiveType.java <97:5 <97:5  <98:20 98:33> 98:35> 100:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isTypeVariable() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable() [PrimitiveType.java <98:20 98:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isTypeVariable() -> java.lang.Override [PrimitiveType.java <97:6 97:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isTypeVariable() -> boolean [PrimitiveType.java <98:12 98:18>]
 LOCAL_SYMBOL: PrimitiveType.java<98:37> [PrimitiveType.java <98:37 98:37>]
 LOCAL_SYMBOL: PrimitiveType.java<98:37> [PrimitiveType.java <100:5 100:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [PrimitiveType.java <102:5 <102:5  <103:20 103:33> 103:45> 121:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [PrimitiveType.java <103:20 103:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [PrimitiveType.java <102:6 102:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [PrimitiveType.java <103:12 103:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [PrimitiveType.java <103:35 103:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType.isAssignableBy<0> [PrimitiveType.java <103:40 103:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ReferenceType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ReferenceType.txt
index 20949528..d8c29844 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ReferenceType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_ReferenceType.txt
@@ -200,6 +200,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.equals(java.lang.Object) [ReferenceType.java <80:5 <80:5  <81:20 81:25> 81:35> 91:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [ReferenceType.java <81:20 81:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.equals(java.lang.Object) -> java.lang.Override [ReferenceType.java <80:6 80:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.equals(java.lang.Object) -> boolean [ReferenceType.java <81:12 81:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.equals(java.lang.Object) -> java.lang.Object [ReferenceType.java <81:27 81:32>]
@@ -228,6 +229,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Refe
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.hashCode() [ReferenceType.java <93:5 <93:5  <94:16 94:23> 94:25> 98:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.hashCode() -> int java.lang.Object.hashCode() [ReferenceType.java <94:16 94:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.hashCode() -> java.lang.Override [ReferenceType.java <93:6 93:13>]
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.hashCode() -> int [ReferenceType.java <94:12 94:14>]
 LOCAL_SYMBOL: ReferenceType.java<94:27> [ReferenceType.java <94:27 94:27>]
 LOCAL_SYMBOL: ReferenceType.java<94:27> [ReferenceType.java <98:5 98:5>]
@@ -244,6 +246,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.toString() [ReferenceType.java <100:5 <100:5  <101:19 101:26> 101:28> 105:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.toString() -> java.lang.String java.lang.Object.toString() [ReferenceType.java <101:19 101:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.toString() -> java.lang.Override [ReferenceType.java <100:6 100:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.toString() -> java.lang.String [ReferenceType.java <101:12 101:17>]
 LOCAL_SYMBOL: ReferenceType.java<101:30> [ReferenceType.java <101:30 101:30>]
 LOCAL_SYMBOL: ReferenceType.java<101:30> [ReferenceType.java <105:5 105:5>]
@@ -253,18 +256,21 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesy
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isReferenceType() [ReferenceType.java <111:5 <111:5  <112:26 112:40> 112:42> 114:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isReferenceType() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType() [ReferenceType.java <112:26 112:40>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isReferenceType() -> java.lang.Override [ReferenceType.java <111:6 111:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isReferenceType() -> boolean [ReferenceType.java <112:18 112:24>]
 LOCAL_SYMBOL: ReferenceType.java<112:44> [ReferenceType.java <112:44 112:44>]
 LOCAL_SYMBOL: ReferenceType.java<112:44> [ReferenceType.java <114:5 114:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.asReferenceType() [ReferenceType.java <120:5 <120:5  <121:26 121:40> 121:42> 123:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.Type.asReferenceType()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.asReferenceType() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.Type.asReferenceType() [ReferenceType.java <121:26 121:40>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.asReferenceType() -> java.lang.Override [ReferenceType.java <120:6 120:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.asReferenceType() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType [ReferenceType.java <121:12 121:24>]
 LOCAL_SYMBOL: ReferenceType.java<121:44> [ReferenceType.java <121:44 121:44>]
 LOCAL_SYMBOL: ReferenceType.java<121:44> [ReferenceType.java <123:5 123:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.describe() [ReferenceType.java <129:5 <129:5  <130:19 130:26> 130:28> 145:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [ReferenceType.java <130:19 130:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.describe() -> java.lang.Override [ReferenceType.java <129:6 129:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.describe() -> java.lang.String [ReferenceType.java <130:12 130:17>]
 LOCAL_SYMBOL: ReferenceType.java<130:30> [ReferenceType.java <130:30 130:30>]
 LOCAL_SYMBOL: ReferenceType.java<130:30> [ReferenceType.java <145:5 145:5>]
@@ -372,6 +378,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [ReferenceType.java <170:5 <170:5  <171:17 171:36> 171:140> 201:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [ReferenceType.java <171:17 171:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Override [ReferenceType.java <170:6 170:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReferenceType.java <171:12 171:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [ReferenceType.java <171:38 171:61>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.replaceTypeVariables<0> [ReferenceType.java <171:63 171:73>]
@@ -479,6 +486,7 @@ SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [ReferenceType.java <211:29 211:42>]
 COMMENT: comment [ReferenceType.java <207:5 209:7>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [ReferenceType.java <210:6 210:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [ReferenceType.java <211:21 211:27>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [ReferenceType.java <211:44 211:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.isAssignableBy<0> [ReferenceType.java <211:49 211:53>]
@@ -668,6 +676,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.typeParametersMap() [ReferenceType.java <298:5 <298:5  <299:30 299:46> 299:48> 301:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametrized.typeParametersMap()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.typeParametersMap() -> com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametrized.typeParametersMap() [ReferenceType.java <299:30 299:46>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.typeParametersMap() -> java.lang.Override [ReferenceType.java <298:6 298:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.typeParametersMap() -> com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap [ReferenceType.java <299:12 299:28>]
 LOCAL_SYMBOL: ReferenceType.java<299:50> [ReferenceType.java <299:50 299:50>]
 LOCAL_SYMBOL: ReferenceType.java<299:50> [ReferenceType.java <301:5 301:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeTransformer.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeTransformer.txt
index 855c040a..530740d1 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeTransformer.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeTransformer.txt
@@ -14,6 +14,7 @@ SYMBOL_INTERFACE public com.github.javaparser.symbolsolver.model.typesystem.Type
 LOCAL_SYMBOL: TypeTransformer.java<23:34> [TypeTransformer.java <23:34 23:34>]
 LOCAL_SYMBOL: TypeTransformer.java<23:34> [TypeTransformer.java <25:1 25:1>]
 COMMENT: comment [TypeTransformer.java <19:1 21:3>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer -> java.lang.FunctionalInterface [TypeTransformer.java <22:2 22:20>]
 SYMBOL_METHOD default com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform(com.github.javaparser.symbolsolver.model.typesystem.Type) [TypeTransformer.java <24:5 <24:5  <24:10 24:18> 24:29> 24:30>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeTransformer.java <24:5 24:8>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeTransformer.java <24:20 24:23>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeVariable.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeVariable.txt
index fb846e16..ff9a9331 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeVariable.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_TypeVariable.txt
@@ -41,6 +41,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.T
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.toString() [TypeVariable.java <37:5 <37:5  <38:19 38:26> 38:28> 40:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.toString() -> java.lang.String java.lang.Object.toString() [TypeVariable.java <38:19 38:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.toString() -> java.lang.Override [TypeVariable.java <37:6 37:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.toString() -> java.lang.String [TypeVariable.java <38:12 38:17>]
 LOCAL_SYMBOL: TypeVariable.java<38:30> [TypeVariable.java <38:30 38:30>]
 LOCAL_SYMBOL: TypeVariable.java<38:30> [TypeVariable.java <40:5 40:5>]
@@ -57,6 +58,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesy
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.equals(java.lang.Object) [TypeVariable.java <46:5 <46:5  <47:20 47:25> 47:35> 58:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [TypeVariable.java <47:20 47:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.equals(java.lang.Object) -> java.lang.Override [TypeVariable.java <46:6 46:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.equals(java.lang.Object) -> boolean [TypeVariable.java <47:12 47:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.equals(java.lang.Object) -> java.lang.Object [TypeVariable.java <47:27 47:32>]
@@ -96,6 +98,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Type
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.hashCode() [TypeVariable.java <60:5 <60:5  <61:16 61:23> 61:25> 63:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.hashCode() -> int java.lang.Object.hashCode() [TypeVariable.java <61:16 61:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.hashCode() -> java.lang.Override [TypeVariable.java <60:6 60:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.hashCode() -> int [TypeVariable.java <61:12 61:14>]
 LOCAL_SYMBOL: TypeVariable.java<61:27> [TypeVariable.java <61:27 61:27>]
@@ -105,18 +108,21 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.TypeVari
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isArray() [TypeVariable.java <65:5 <65:5  <66:20 66:26> 66:28> 68:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isArray() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isArray() [TypeVariable.java <66:20 66:26>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isArray() -> java.lang.Override [TypeVariable.java <65:6 65:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isArray() -> boolean [TypeVariable.java <66:12 66:18>]
 LOCAL_SYMBOL: TypeVariable.java<66:30> [TypeVariable.java <66:30 66:30>]
 LOCAL_SYMBOL: TypeVariable.java<66:30> [TypeVariable.java <68:5 68:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isPrimitive() [TypeVariable.java <70:5 <70:5  <71:20 71:30> 71:32> 73:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isPrimitive() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isPrimitive() [TypeVariable.java <71:20 71:30>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isPrimitive() -> java.lang.Override [TypeVariable.java <70:6 70:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isPrimitive() -> boolean [TypeVariable.java <71:12 71:18>]
 LOCAL_SYMBOL: TypeVariable.java<71:34> [TypeVariable.java <71:34 71:34>]
 LOCAL_SYMBOL: TypeVariable.java<71:34> [TypeVariable.java <73:5 73:5>]
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [TypeVariable.java <75:5 <75:5  <76:17 76:36> 76:143> 83:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [TypeVariable.java <76:17 76:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Override [TypeVariable.java <75:6 75:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeVariable.java <76:12 76:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [TypeVariable.java <76:38 76:61>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.replaceTypeVariables<0> [TypeVariable.java <76:63 76:76>]
@@ -149,12 +155,14 @@ LOCAL_SYMBOL: TypeVariable.java<80:16> [TypeVariable.java <82:9 82:9>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isReferenceType() [TypeVariable.java <85:5 <85:5  <86:20 86:34> 86:36> 88:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isReferenceType() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isReferenceType() [TypeVariable.java <86:20 86:34>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isReferenceType() -> java.lang.Override [TypeVariable.java <85:6 85:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isReferenceType() -> boolean [TypeVariable.java <86:12 86:18>]
 LOCAL_SYMBOL: TypeVariable.java<86:38> [TypeVariable.java <86:38 86:38>]
 LOCAL_SYMBOL: TypeVariable.java<86:38> [TypeVariable.java <88:5 88:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.describe() [TypeVariable.java <90:5 <90:5  <91:19 91:26> 91:28> 93:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [TypeVariable.java <91:19 91:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.describe() -> java.lang.Override [TypeVariable.java <90:6 90:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.describe() -> java.lang.String [TypeVariable.java <91:12 91:17>]
 LOCAL_SYMBOL: TypeVariable.java<91:30> [TypeVariable.java <91:30 91:30>]
 LOCAL_SYMBOL: TypeVariable.java<91:30> [TypeVariable.java <93:5 93:5>]
@@ -163,6 +171,7 @@ REFERENCE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesy
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeParameter() [TypeVariable.java <95:5 <95:5  <96:37 96:51> 96:53> 98:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeParameter()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeParameter() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeParameter() [TypeVariable.java <96:37 96:51>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeParameter() -> java.lang.Override [TypeVariable.java <95:6 95:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeParameter() -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [TypeVariable.java <96:12 96:35>]
 LOCAL_SYMBOL: TypeVariable.java<96:55> [TypeVariable.java <96:55 96:55>]
 LOCAL_SYMBOL: TypeVariable.java<96:55> [TypeVariable.java <98:5 98:5>]
@@ -170,18 +179,21 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.declarations.TypeParame
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeVariable() [TypeVariable.java <100:5 <100:5  <101:25 101:38> 101:40> 103:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeVariable()
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeVariable() -> com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.Type.asTypeVariable() [TypeVariable.java <101:25 101:38>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeVariable() -> java.lang.Override [TypeVariable.java <100:6 100:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.TypeVariable com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.asTypeVariable() -> com.github.javaparser.symbolsolver.model.typesystem.TypeVariable [TypeVariable.java <101:12 101:23>]
 LOCAL_SYMBOL: TypeVariable.java<101:42> [TypeVariable.java <101:42 101:42>]
 LOCAL_SYMBOL: TypeVariable.java<101:42> [TypeVariable.java <103:5 103:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isTypeVariable() [TypeVariable.java <105:5 <105:5  <106:20 106:33> 106:35> 108:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isTypeVariable() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isTypeVariable() [TypeVariable.java <106:20 106:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isTypeVariable() -> java.lang.Override [TypeVariable.java <105:6 105:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isTypeVariable() -> boolean [TypeVariable.java <106:12 106:18>]
 LOCAL_SYMBOL: TypeVariable.java<106:37> [TypeVariable.java <106:37 106:37>]
 LOCAL_SYMBOL: TypeVariable.java<106:37> [TypeVariable.java <108:5 108:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [TypeVariable.java <110:5 <110:5  <111:20 111:33> 111:45> 117:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [TypeVariable.java <111:20 111:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [TypeVariable.java <110:6 110:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [TypeVariable.java <111:12 111:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [TypeVariable.java <111:35 111:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeVariable.isAssignableBy<0> [TypeVariable.java <111:40 111:44>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_VoidType.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_VoidType.txt
index fc953d56..b5d33e7b 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_VoidType.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_VoidType.txt
@@ -26,12 +26,14 @@ LOCAL_SYMBOL: VoidType.java<27:24> [VoidType.java <28:5 28:5>]
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.VoidType.describe() [VoidType.java <30:5 <30:5  <31:19 31:26> 31:28> 33:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.VoidType.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [VoidType.java <31:19 31:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.VoidType.describe() -> java.lang.Override [VoidType.java <30:6 30:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.VoidType.describe() -> java.lang.String [VoidType.java <31:12 31:17>]
 LOCAL_SYMBOL: VoidType.java<31:30> [VoidType.java <31:30 31:30>]
 LOCAL_SYMBOL: VoidType.java<31:30> [VoidType.java <33:5 33:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [VoidType.java <35:5 <35:5  <36:20 36:33> 36:45> 38:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [VoidType.java <36:20 36:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [VoidType.java <35:6 35:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [VoidType.java <36:12 36:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [VoidType.java <36:35 36:38>]
@@ -44,6 +46,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isVoid() [VoidType.java <40:5 <40:5  <41:20 41:25> 41:27> 43:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isVoid()
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isVoid() -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isVoid() [VoidType.java <41:20 41:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isVoid() -> java.lang.Override [VoidType.java <40:6 40:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.VoidType.isVoid() -> boolean [VoidType.java <41:12 41:18>]
 LOCAL_SYMBOL: VoidType.java<41:29> [VoidType.java <41:29 41:29>]
 LOCAL_SYMBOL: VoidType.java<41:29> [VoidType.java <43:5 43:5>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_Wildcard.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_Wildcard.txt
index 8031125e..6c06ecf9 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_Wildcard.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_Wildcard.txt
@@ -91,6 +91,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.Wildcard.exten
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.toString() [Wildcard.java <58:5 <58:5  <59:19 59:26> 59:28> 64:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.toString() -> java.lang.String java.lang.Object.toString() [Wildcard.java <59:19 59:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.toString() -> java.lang.Override [Wildcard.java <58:6 58:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.toString() -> java.lang.String [Wildcard.java <59:12 59:17>]
 LOCAL_SYMBOL: Wildcard.java<59:30> [Wildcard.java <59:30 59:30>]
 LOCAL_SYMBOL: Wildcard.java<59:30> [Wildcard.java <64:5 64:5>]
@@ -112,6 +113,7 @@ LOCAL_SYMBOL: Wildcard.java<70:34> [Wildcard.java <72:5 72:5>]
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.equals(java.lang.Object) [Wildcard.java <74:5 <74:5  <75:20 75:25> 75:35> 85:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [Wildcard.java <75:20 75:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.equals(java.lang.Object) -> java.lang.Override [Wildcard.java <74:6 74:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.equals(java.lang.Object) -> boolean [Wildcard.java <75:12 75:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.equals(java.lang.Object) -> java.lang.Object [Wildcard.java <75:27 75:32>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.Wildcard.equals<0> [Wildcard.java <75:34 75:34>]
@@ -137,6 +139,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wild
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.model.typesystem.Wildcard.hashCode() [Wildcard.java <87:5 <87:5  <88:16 88:23> 88:25> 92:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.model.typesystem.Wildcard.hashCode() -> int java.lang.Object.hashCode() [Wildcard.java <88:16 88:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.model.typesystem.Wildcard.hashCode() -> java.lang.Override [Wildcard.java <87:6 87:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.Wildcard.hashCode() -> int [Wildcard.java <88:12 88:14>]
 LOCAL_SYMBOL: Wildcard.java<88:27> [Wildcard.java <88:27 88:27>]
@@ -156,6 +159,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.Wildcard.hashC
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.describe() [Wildcard.java <94:5 <94:5  <95:19 95:26> 95:28> 105:5>]
 SYMBOL_METHOD java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.describe() -> java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Type.describe() [Wildcard.java <95:19 95:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.describe() -> java.lang.Override [Wildcard.java <94:6 94:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.Wildcard.describe() -> java.lang.String [Wildcard.java <95:12 95:17>]
 LOCAL_SYMBOL: Wildcard.java<95:30> [Wildcard.java <95:30 95:30>]
 LOCAL_SYMBOL: Wildcard.java<95:30> [Wildcard.java <105:5 105:5>]
@@ -217,6 +221,7 @@ REFERENCE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.git
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [Wildcard.java <126:5 <126:5  <127:20 127:33> 127:45> 138:5>]
 SYMBOL_METHOD boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean com.github.javaparser.symbolsolver.model.typesystem.Type.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) [Wildcard.java <127:20 127:33>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> java.lang.Override [Wildcard.java <126:6 126:13>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> boolean [Wildcard.java <127:12 127:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.Wildcard.isAssignableBy(com.github.javaparser.symbolsolver.model.typesystem.Type) -> com.github.javaparser.symbolsolver.model.typesystem.Type [Wildcard.java <127:35 127:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.Wildcard.isAssignableBy<0> [Wildcard.java <127:40 127:44>]
@@ -246,6 +251,7 @@ REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem
 SYMBOL_METHOD public com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Wildcard.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [Wildcard.java <140:5 <140:5  <141:17 141:36> 141:140> 157:5>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>)
 REFERENCE_OVERRIDE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Wildcard.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Type.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) [Wildcard.java <141:17 141:36>]
+REFERENCE_ANNOTATION_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Wildcard.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> java.lang.Override [Wildcard.java <140:6 140:13>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Wildcard.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.typesystem.Type [Wildcard.java <141:12 141:15>]
 REFERENCE_TYPE_USAGE com.github.javaparser.symbolsolver.model.typesystem.Type com.github.javaparser.symbolsolver.model.typesystem.Wildcard.replaceTypeVariables(com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type, java.util.Map<com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration, com.github.javaparser.symbolsolver.model.typesystem.Type>) -> com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration [Wildcard.java <141:38 141:61>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.Wildcard.replaceTypeVariables<0> [Wildcard.java <141:63 141:73>]
diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_parametrization_TypeParametersMap.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_parametrization_TypeParametersMap.txt
index 36654af5..7d2e5d21 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_parametrization_TypeParametersMap.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-model_com_github_javaparser_symbolsolver_model_typesystem_parametrization_TypeParametersMap.txt
@@ -128,6 +128,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.parametrizatio
 SYMBOL_METHOD public boolean com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.equals(java.lang.Object) [TypeParametersMap.java <61:5 <61:5  <62:20 62:25> 62:35> 70:5>]
 SYMBOL_METHOD boolean java.lang.Object.equals(java.lang.Object)
 REFERENCE_OVERRIDE boolean com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.equals(java.lang.Object) -> boolean java.lang.Object.equals(java.lang.Object) [TypeParametersMap.java <62:20 62:25>]
+REFERENCE_ANNOTATION_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.equals(java.lang.Object) -> java.lang.Override [TypeParametersMap.java <61:6 61:13>]
 SYMBOL_BUILTIN_TYPE boolean
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.equals(java.lang.Object) -> boolean [TypeParametersMap.java <62:12 62:18>]
 REFERENCE_TYPE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.equals(java.lang.Object) -> java.lang.Object [TypeParametersMap.java <62:27 62:32>]
@@ -155,6 +156,7 @@ REFERENCE_USAGE boolean com.github.javaparser.symbolsolver.model.typesystem.para
 SYMBOL_METHOD public int com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.hashCode() [TypeParametersMap.java <72:5 <72:5  <73:16 73:23> 73:25> 75:5>]
 SYMBOL_METHOD int java.lang.Object.hashCode()
 REFERENCE_OVERRIDE int com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.hashCode() -> int java.lang.Object.hashCode() [TypeParametersMap.java <73:16 73:23>]
+REFERENCE_ANNOTATION_USAGE int com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.hashCode() -> java.lang.Override [TypeParametersMap.java <72:6 72:13>]
 SYMBOL_BUILTIN_TYPE int
 REFERENCE_TYPE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.hashCode() -> int [TypeParametersMap.java <73:12 73:14>]
 LOCAL_SYMBOL: TypeParametersMap.java<73:27> [TypeParametersMap.java <73:27 73:27>]
@@ -165,6 +167,7 @@ REFERENCE_USAGE int com.github.javaparser.symbolsolver.model.typesystem.parametr
 SYMBOL_METHOD public java.lang.String com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.toString() [TypeParametersMap.java <77:5 <77:5  <78:19 78:26> 78:28> 82:5>]
 SYMBOL_METHOD java.lang.String java.lang.Object.toString()
 REFERENCE_OVERRIDE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.toString() -> java.lang.String java.lang.Object.toString() [TypeParametersMap.java <78:19 78:26>]
+REFERENCE_ANNOTATION_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.toString() -> java.lang.Override [TypeParametersMap.java <77:6 77:13>]
 REFERENCE_TYPE_USAGE java.lang.String com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap.toString() -> java.lang.String [TypeParametersMap.java <78:12 78:17>]
 LOCAL_SYMBOL: TypeParametersMap.java<78:30> [TypeParametersMap.java <78:30 78:30>]
 LOCAL_SYMBOL: TypeParametersMap.java<78:30> [TypeParametersMap.java <82:5 82:5>]
diff --git a/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java b/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java
index 6c14e0ec..189673df 100644
--- a/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java
+++ b/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java
@@ -8,6 +8,9 @@ import java.util.Stack;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;
+import org.eclipse.jdt.core.dom.Annotation;
+import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
 import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
 import org.eclipse.jdt.core.dom.ArrayInitializer;
 import org.eclipse.jdt.core.dom.Block;
@@ -21,6 +24,7 @@ import org.eclipse.jdt.core.dom.EnumDeclaration;
 import org.eclipse.jdt.core.dom.ExpressionMethodReference;
 import org.eclipse.jdt.core.dom.FieldAccess;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.IAnnotationBinding;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.IPackageBinding;
@@ -29,16 +33,20 @@ import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.ImportDeclaration;
 import org.eclipse.jdt.core.dom.Javadoc;
 import org.eclipse.jdt.core.dom.LineComment;
+import org.eclipse.jdt.core.dom.MarkerAnnotation;
+import org.eclipse.jdt.core.dom.MemberValuePair;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.NameQualifiedType;
+import org.eclipse.jdt.core.dom.NormalAnnotation;
 import org.eclipse.jdt.core.dom.PackageDeclaration;
 import org.eclipse.jdt.core.dom.PrimitiveType;
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.QualifiedType;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SimpleType;
+import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
 import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
 import org.eclipse.jdt.core.dom.SuperFieldAccess;
 import org.eclipse.jdt.core.dom.SuperMethodInvocation;
@@ -116,7 +124,60 @@ public abstract class AstVisitor extends ASTVisitor
 		
 		return true;
 	}
+	
+	
+	@Override 
+	public boolean visit(AnnotationTypeDeclaration node)
+	{
+		DeclName symbolName = DeclNameResolver.getQualifiedDeclName(node, m_filePath, m_compilationUnit);
+		Range scopeRange = getRange(node);
+		
+		m_client.recordSymbolWithLocationAndScope(
+				symbolName.toNameHierarchy(), 
+				SymbolKind.ANNOTATION,
+				getRange(node.getName()), 
+				scopeRange, 
+				AccessKind.fromModifiers(node.getModifiers()),
+				DefinitionKind.EXPLICIT);
+		
+		scopeRange.begin = m_fileContent.findStartPosition("{", scopeRange.begin);
+		recordScope(scopeRange);
 
+		m_contextStack.push(Arrays.asList(symbolName));
+		
+		return true;
+	}
+	
+	@Override 
+	public void endVisit(AnnotationTypeDeclaration node)
+	{
+		m_contextStack.pop();
+	}
+	
+	
+	@Override 
+	public boolean visit(AnnotationTypeMemberDeclaration node)
+	{
+		DeclName symbolName = BindingNameResolver.getQualifiedName(node.resolveBinding(), m_filePath, m_compilationUnit).orElse(DeclName.unsolved());
+		
+		m_client.recordSymbolWithLocation(
+				symbolName.toNameHierarchy(), 
+				SymbolKind.FIELD, 
+				getRange(node.getName()),
+				AccessKind.fromModifiers(node.getModifiers()), 
+				DefinitionKind.EXPLICIT);
+
+		m_contextStack.push(Arrays.asList(symbolName));
+		
+		return true;
+	}
+	
+	@Override 
+	public void endVisit(AnnotationTypeMemberDeclaration node)
+	{
+		m_contextStack.pop();
+	}
+	
 
 	@Override 
 	public boolean visit(TypeDeclaration node)
@@ -153,7 +214,8 @@ public abstract class AstVisitor extends ASTVisitor
 		DeclName symbolName = BindingNameResolver.getQualifiedName(node.resolveBinding(), m_filePath, m_compilationUnit).map(tn -> tn.toDeclName()).orElse(DeclName.unsolved());
 		
 		m_client.recordSymbolWithLocation(
-				symbolName.toNameHierarchy(), SymbolKind.TYPE_PARAMETER, 
+				symbolName.toNameHierarchy(), 
+				SymbolKind.TYPE_PARAMETER, 
 				getRange(node.getName()),
 				AccessKind.TYPE_PARAMETER, 
 				DefinitionKind.EXPLICIT);
@@ -316,7 +378,8 @@ public abstract class AstVisitor extends ASTVisitor
 				DeclName symbolName = DeclNameResolver.getQualifiedDeclName(fragment, m_filePath, m_compilationUnit);
 				
 				m_client.recordSymbolWithLocation(
-						symbolName.toNameHierarchy(), SymbolKind.FIELD, 
+						symbolName.toNameHierarchy(), 
+						SymbolKind.FIELD, 
 						getRange(fragment.getName()),
 						AccessKind.fromModifiers(node.getModifiers()), 
 						DefinitionKind.EXPLICIT);
@@ -389,6 +452,70 @@ public abstract class AstVisitor extends ASTVisitor
 		
 		return true;
 	}
+
+	@Override 
+	public boolean visit(SingleMemberAnnotation node)
+	{
+		return recordAnnotation(node);
+	}
+
+	@Override 
+	public boolean visit(NormalAnnotation node)
+	{
+		for (Object value: node.values())
+		{
+			if (value instanceof MemberValuePair)
+			{
+				SimpleName name = ((MemberValuePair)value).getName();
+				IBinding binding = name.resolveBinding();
+				if (binding instanceof IMethodBinding)
+				{
+					DeclName symbolName = BindingNameResolver.getQualifiedName((IMethodBinding) binding, m_filePath, m_compilationUnit).orElse(DeclName.unsolved());
+
+					for (SymbolName context: m_contextStack.peek())
+					{
+						m_client.recordReference(ReferenceKind.USAGE, symbolName.toNameHierarchy(), context.toNameHierarchy(), getRange(name));
+					}
+				}
+			}
+		}
+		
+		return recordAnnotation(node);
+	}
+
+	@Override 
+	public boolean visit(MarkerAnnotation node)
+	{
+		return recordAnnotation(node);
+	}
+	
+	private boolean recordAnnotation(Annotation node)
+	{
+		for (SymbolName context: m_contextStack.peek())
+		{
+			IAnnotationBinding annotationBinding = node.resolveAnnotationBinding();
+			ITypeBinding typeBinding = null;
+			if (annotationBinding != null)
+			{
+				typeBinding = annotationBinding.getAnnotationType();
+			}
+			
+			Range range = getRange(node.getTypeName());
+			if (node.getTypeName() instanceof QualifiedName)
+			{
+				range = getRange(((QualifiedName) node.getTypeName()).getName());
+			}
+			
+			m_client.recordReference(
+					ReferenceKind.ANNOTATION_USAGE, 
+					BindingNameResolver.getQualifiedName(typeBinding, m_filePath, m_compilationUnit).orElse(TypeName.unsolved()).toDeclName().toNameHierarchy(),
+					context.toNameHierarchy(), 
+					range);
+		}
+		
+		return true;
+	}
+	
 	
 	@Override 
 	public boolean visit(SimpleType node)
diff --git a/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java b/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java
index f424bc0c..10d7498f 100644
--- a/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java
+++ b/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java
@@ -15,7 +15,8 @@ public enum ReferenceKind
 	TEMPLATE_MEMBER_SPECIALIZATION_OF(10),
 	INCLUDE(11),
 	IMPORT(12),
-	MACRO_USAGE(13);
+	MACRO_USAGE(13),
+	ANNOTATION_USAGE(14);
 	
 	private final int m_value;
 	
diff --git a/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java b/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java
index 49393908..7f821ad7 100644
--- a/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java
+++ b/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java
@@ -2,26 +2,27 @@ package com.sourcetrail;
 
 public enum SymbolKind
 { // these values need to be the same as SymbolKind in C++ code
-	BUILTIN_TYPE(1),
-	CLASS(2),
-	ENUM(3),
-	ENUM_CONSTANT(4),
-	FIELD(5),
-	FUNCTION(6),
-	GLOBAL_VARIABLE(7),
-	INTERFACE(8),
-	LOCAL_VARIABLE(9),
-	MACRO(10),
-	METHOD(11),
-	NAMESPACE(12),
-	PACKAGE(13),
-	PARAMETER(14),
-	STRUCT(15),
-	TEMPLATE_PARAMETER(16),
-	TYPEDEF(17),
-	TYPE_PARAMETER(18),
-	UNION(19),
-	TYPE_MAX(20);
+	ANNOTATION(1),
+	BUILTIN_TYPE(2),
+	CLASS(3),
+	ENUM(4),
+	ENUM_CONSTANT(5),
+	FIELD(6),
+	FUNCTION(7),
+	GLOBAL_VARIABLE(8),
+	INTERFACE(9),
+	LOCAL_VARIABLE(10),
+	MACRO(11),
+	METHOD(12),
+	NAMESPACE(13),
+	PACKAGE(14),
+	PARAMETER(15),
+	STRUCT(16),
+	TEMPLATE_PARAMETER(17),
+	TYPEDEF(18),
+	TYPE_PARAMETER(19),
+	UNION(20),
+	TYPE_MAX(21);
 	
 	private final int m_value;
 	
diff --git a/java_indexer/src/main/java/com/sourcetrail/name/resolver/BindingNameResolver.java b/java_indexer/src/main/java/com/sourcetrail/name/resolver/BindingNameResolver.java
index fdc670a6..7a20e3cb 100644
--- a/java_indexer/src/main/java/com/sourcetrail/name/resolver/BindingNameResolver.java
+++ b/java_indexer/src/main/java/com/sourcetrail/name/resolver/BindingNameResolver.java
@@ -200,21 +200,31 @@ public class BindingNameResolver extends NameResolver
 			}
 		}
 		
-		ContextList ignoredContexts = m_ignoredContexts.copy();
-		ignoredContexts.add(binding);
-		
-		TypeName returnTypeName = binding.isConstructor() ? null : getQualifiedName(binding.getReturnType(), m_currentFile, m_compilationUnit, ignoredContexts).orElse(TypeName.unsolved());
-		
-		List<TypeName> parameterTypeNames =  new ArrayList<>();
-		for (ITypeBinding parameterType: binding.getParameterTypes())
+		DeclName declName = null;
 		{
-			parameterTypeNames.add(getQualifiedName(parameterType, m_currentFile, m_compilationUnit, ignoredContexts).orElse(TypeName.unsolved()));
+			boolean isStatic = Modifier.isStatic(binding.getModifiers());
+
+			ContextList ignoredContexts = m_ignoredContexts.copy();
+			ignoredContexts.add(binding);
+			
+			TypeName returnTypeName = binding.isConstructor() ? null : getQualifiedName(binding.getReturnType(), m_currentFile, m_compilationUnit, ignoredContexts).orElse(TypeName.unsolved());
+			
+			if (binding.isAnnotationMember())
+			{
+				declName = new VariableDeclName(name, returnTypeName, isStatic);
+			}
+			else
+			{
+				List<TypeName> parameterTypeNames =  new ArrayList<>();
+				for (ITypeBinding parameterType: binding.getParameterTypes())
+				{
+					parameterTypeNames.add(getQualifiedName(parameterType, m_currentFile, m_compilationUnit, ignoredContexts).orElse(TypeName.unsolved()));
+				}
+				
+				declName = new FunctionDeclName(name, typeParameterNames, returnTypeName, parameterTypeNames, isStatic);
+			}
 		}
 		
-		boolean isStatic = Modifier.isStatic(binding.getModifiers());
-		
-		FunctionDeclName declName = new FunctionDeclName(name, typeParameterNames, returnTypeName, parameterTypeNames, isStatic);
-		
 		DeclName parentDeclName = getQualifiedContextName(binding);
 		if (parentDeclName != null)
 		{
diff --git a/java_indexer/src/main/java/com/sourcetrail/name/resolver/DeclNameResolver.java b/java_indexer/src/main/java/com/sourcetrail/name/resolver/DeclNameResolver.java
index f6158345..360754ba 100644
--- a/java_indexer/src/main/java/com/sourcetrail/name/resolver/DeclNameResolver.java
+++ b/java_indexer/src/main/java/com/sourcetrail/name/resolver/DeclNameResolver.java
@@ -151,7 +151,7 @@ public class DeclNameResolver extends NameResolver
 		{
 			if (decl instanceof AnnotationTypeDeclaration)
 			{
-				declName = new DeclName("AnnotationTypeDeclaration");
+				declName = new DeclName(((AnnotationTypeDeclaration) decl).getName().getIdentifier());
 			}
 			else if (decl instanceof EnumDeclaration)
 			{
@@ -174,7 +174,7 @@ public class DeclNameResolver extends NameResolver
 			}
 			else if (decl instanceof AnnotationTypeMemberDeclaration)
 			{
-				declName = new DeclName("AnnotationTypeMemberDeclaration");
+				declName = new DeclName(((AnnotationTypeMemberDeclaration) decl).getName().getIdentifier());
 			}
 			else if (decl instanceof EnumConstantDeclaration)
 			{
diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index 1bac0e19..31911678 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -2377,6 +2377,7 @@ void GraphController::createLegendGraph()
 		incompleteFile->addComponent(std::make_shared<TokenComponentFilePath>(FilePath(), false));
 
 		addNode(NodeType::NODE_MACRO, L"Macro", Vec2i(x, y + dy * ++i));
+		addNode(NodeType::NODE_ANNOTATION, L"Annotation", Vec2i(x, y + dy * ++i));
 
 		addNode(NodeType::NODE_NAMESPACE, L"namespace", Vec2i(x, y + dy * ++i));
 		y -= 15;
@@ -2488,6 +2489,13 @@ void GraphController::createLegendGraph()
 			addEdge(Edge::EDGE_MACRO_USAGE, file, macro);
 		}
 
+		{
+			addText(L"annotation use", 0, Vec2i(x, y + dy * ++i));
+			Node* type = addNode(NodeType::NODE_TYPE, L"Type", Vec2i(x, y + dy * ++i));
+			Node* macro = addNode(NodeType::NODE_ANNOTATION, L"Annotation", Vec2i(x + dx, y + dy * i));
+			addEdge(Edge::EDGE_ANNOTATION_USAGE, type, macro);
+		}
+
 		{
 			addText(L"aggregation", 0, Vec2i(x, y + dy * ++i));
 			Node* typeA = addNode(NodeType::NODE_TYPE, L"Type A", Vec2i(x, y + dy * ++i));
diff --git a/src/lib/data/NodeType.cpp b/src/lib/data/NodeType.cpp
index 00ec1181..fc9f8c16 100644
--- a/src/lib/data/NodeType.cpp
+++ b/src/lib/data/NodeType.cpp
@@ -8,6 +8,7 @@ std::vector<NodeType> NodeType::getOverviewBundleNodeTypesOrdered()
 	return {
 		NodeType(NodeType::NODE_FILE),
 		NodeType(NodeType::NODE_MACRO),
+		NodeType(NodeType::NODE_ANNOTATION),
 		NodeType(NodeType::NODE_NAMESPACE),
 		NodeType(NodeType::NODE_PACKAGE),
 		NodeType(NodeType::NODE_CLASS),
@@ -45,6 +46,8 @@ NodeType::Type NodeType::intToType(int value)
 		return NodeType::NODE_CLASS;
 	case NodeType::NODE_INTERFACE:
 		return NodeType::NODE_INTERFACE;
+	case NodeType::NODE_ANNOTATION:
+		return NodeType::NODE_ANNOTATION;
 	case NodeType::NODE_GLOBAL_VARIABLE:
 		return NodeType::NODE_GLOBAL_VARIABLE;
 	case NodeType::NODE_FIELD:
@@ -94,6 +97,8 @@ std::string NodeType::getReadableTypeString(NodeType::Type type)
 		return "class";
 	case NodeType::NODE_INTERFACE:
 		return "interface";
+	case NodeType::NODE_ANNOTATION:
+		return "annotation";
 	case NodeType::NODE_GLOBAL_VARIABLE:
 		return "global variable";
 	case NodeType::NODE_FIELD:
@@ -237,6 +242,7 @@ bool NodeType::isUsable() const
 		NodeType::NODE_ENUM |
 		NodeType::NODE_UNION |
 		NodeType::NODE_INTERFACE |
+		NodeType::NODE_ANNOTATION |
 		NodeType::NODE_TYPEDEF;
 	return ((m_type & mask) > 0);
 }
@@ -248,6 +254,7 @@ bool NodeType::isPotentialMember() const
 		NodeType::NODE_FIELD |
 		NodeType::NODE_CLASS |
 		NodeType::NODE_INTERFACE |
+		NodeType::NODE_ANNOTATION |
 		NodeType::NODE_STRUCT |
 		NodeType::NODE_UNION |
 		NodeType::NODE_TYPEDEF |
@@ -265,6 +272,7 @@ bool NodeType::isCollapsible() const
 		NodeType::NODE_STRUCT |
 		NodeType::NODE_CLASS |
 		NodeType::NODE_INTERFACE |
+		NodeType::NODE_ANNOTATION |
 		NodeType::NODE_ENUM |
 		NodeType::NODE_UNION |
 		NodeType::NODE_FILE;
@@ -285,6 +293,7 @@ bool NodeType::hasSearchFilter() const
 		NodeType::NODE_STRUCT |
 		NodeType::NODE_CLASS |
 		NodeType::NODE_INTERFACE |
+		NodeType::NODE_ANNOTATION |
 		NodeType::NODE_GLOBAL_VARIABLE |
 		NodeType::NODE_FIELD |
 		NodeType::NODE_FUNCTION |
@@ -324,6 +333,8 @@ Tree<NodeType::BundleInfo> NodeType::getOverviewBundleTree() const
 		return Tree<BundleInfo>(BundleInfo(L"Classes"));
 	case NodeType::NODE_INTERFACE:
 		return Tree<BundleInfo>(BundleInfo(L"Interfaces"));
+	case NodeType::NODE_ANNOTATION:
+		return Tree<BundleInfo>(BundleInfo(L"Annotations"));
 	case NodeType::NODE_STRUCT:
 		return Tree<BundleInfo>(BundleInfo(L"Structs"));
 	case NodeType::NODE_FUNCTION:
@@ -355,6 +366,8 @@ FilePath NodeType::getIconPath() const
 
 	switch (m_type)
 	{
+	case NodeType::NODE_ANNOTATION:
+		return ResourcePaths::getGuiPath().concatenate(L"graph_view/images/annotation.png");
 	case NodeType::NODE_ENUM:
 		return ResourcePaths::getGuiPath().concatenate(L"graph_view/images/enum.png");
 	case NodeType::NODE_TYPEDEF:
@@ -376,6 +389,7 @@ bool NodeType::hasIcon() const
 	}
 
 	const NodeType::TypeMask mask =
+		NODE_ANNOTATION |
 		NodeType::NODE_ENUM |
 		NodeType::NODE_TYPEDEF |
 		NodeType::NODE_FILE |
@@ -397,6 +411,7 @@ NodeType::StyleType NodeType::getNodeStyle() const
 	case NodeType::NODE_CLASS:
 	case NodeType::NODE_UNION:
 	case NodeType::NODE_INTERFACE:
+	case NodeType::NODE_ANNOTATION:
 	case NodeType::NODE_ENUM:
 	case NodeType::NODE_TYPEDEF:
 	case NodeType::NODE_TEMPLATE_PARAMETER_TYPE:
diff --git a/src/lib/data/NodeType.h b/src/lib/data/NodeType.h
index 97e9540a..78890ca1 100644
--- a/src/lib/data/NodeType.h
+++ b/src/lib/data/NodeType.h
@@ -26,20 +26,20 @@ public:
 		NODE_STRUCT = 1 << 5,
 		NODE_CLASS = 1 << 6,
 		NODE_INTERFACE = 1 << 7,
-		NODE_GLOBAL_VARIABLE = 1 << 8,
-		NODE_FIELD = 1 << 9,
-		NODE_FUNCTION = 1 << 10,
-		NODE_METHOD = 1 << 11,
+		NODE_ANNOTATION = 1 << 8,
+		NODE_GLOBAL_VARIABLE = 1 << 9,
+		NODE_FIELD = 1 << 10,
+		NODE_FUNCTION = 1 << 11,
+		NODE_METHOD = 1 << 12,
+		NODE_ENUM = 1 << 13,
+		NODE_ENUM_CONSTANT = 1 << 14,
+		NODE_TYPEDEF = 1 << 15,
+		NODE_TEMPLATE_PARAMETER_TYPE = 1 << 16,
+		NODE_TYPE_PARAMETER = 1 << 17,
 
-		NODE_ENUM = 1 << 12,
-		NODE_ENUM_CONSTANT = 1 << 13,
-		NODE_TYPEDEF = 1 << 14,
-		NODE_TEMPLATE_PARAMETER_TYPE = 1 << 15,
-		NODE_TYPE_PARAMETER = 1 << 16,
-
-		NODE_FILE = 1 << 17,
-		NODE_MACRO = 1 << 18,
-		NODE_UNION = 1 << 19,
+		NODE_FILE = 1 << 18,
+		NODE_MACRO = 1 << 19,
+		NODE_UNION = 1 << 20,
 
 		NODE_MAX_VALUE = NODE_UNION
 	};
diff --git a/src/lib/data/graph/Edge.cpp b/src/lib/data/graph/Edge.cpp
index 61ff760c..ea623cdd 100644
--- a/src/lib/data/graph/Edge.cpp
+++ b/src/lib/data/graph/Edge.cpp
@@ -46,6 +46,8 @@ Edge::EdgeType Edge::intToType(int value)
 		return EDGE_AGGREGATION;
 	case EDGE_MACRO_USAGE:
 		return EDGE_MACRO_USAGE;
+	case EDGE_ANNOTATION_USAGE:
+		return EDGE_ANNOTATION_USAGE;
 	}
 
 	return EDGE_UNDEFINED;
@@ -159,6 +161,8 @@ std::wstring Edge::getReadableTypeString(EdgeType type)
 		return L"aggregation";
 	case EDGE_MACRO_USAGE:
 		return L"macro use";
+	case EDGE_ANNOTATION_USAGE:
+		return L"annotation use";
 	}
 
 	return L"";
diff --git a/src/lib/data/graph/Edge.h b/src/lib/data/graph/Edge.h
index e9899b95..8b8ded0c 100644
--- a/src/lib/data/graph/Edge.h
+++ b/src/lib/data/graph/Edge.h
@@ -15,22 +15,23 @@ public:
 	typedef int TypeMask;
 	enum EdgeType : TypeMask
 	{
-		EDGE_UNDEFINED							= 0x0,
-		EDGE_MEMBER								= 0x1,
-		EDGE_TYPE_USAGE							= 0x2,
-		EDGE_USAGE								= 0x4,
-		EDGE_CALL								= 0x8,
-		EDGE_INHERITANCE						= 0x10,
-		EDGE_OVERRIDE							= 0x20,
-		EDGE_TEMPLATE_ARGUMENT					= 0x40,
-		EDGE_TYPE_ARGUMENT						= 0x80,
-		EDGE_TEMPLATE_DEFAULT_ARGUMENT			= 0x100,
-		EDGE_TEMPLATE_SPECIALIZATION			= 0x200,
-		EDGE_TEMPLATE_MEMBER_SPECIALIZATION		= 0x400,
-		EDGE_INCLUDE							= 0x800,
-		EDGE_IMPORT								= 0x1000,
-		EDGE_AGGREGATION						= 0x2000,
-		EDGE_MACRO_USAGE						= 0x4000
+		EDGE_UNDEFINED							= 0,
+		EDGE_MEMBER								= 1 << 0,
+		EDGE_TYPE_USAGE							= 1 << 1,
+		EDGE_USAGE								= 1 << 2,
+		EDGE_CALL								= 1 << 3,
+		EDGE_INHERITANCE						= 1 << 4,
+		EDGE_OVERRIDE							= 1 << 5,
+		EDGE_TEMPLATE_ARGUMENT					= 1 << 6,
+		EDGE_TYPE_ARGUMENT						= 1 << 7,
+		EDGE_TEMPLATE_DEFAULT_ARGUMENT			= 1 << 8,
+		EDGE_TEMPLATE_SPECIALIZATION			= 1 << 9,
+		EDGE_TEMPLATE_MEMBER_SPECIALIZATION		= 1 << 10,
+		EDGE_INCLUDE							= 1 << 11,
+		EDGE_IMPORT								= 1 << 12,
+		EDGE_AGGREGATION						= 1 << 13,
+		EDGE_MACRO_USAGE						= 1 << 14,
+		EDGE_ANNOTATION_USAGE					= 1 << 15
 	};
 
 	static int typeToInt(EdgeType type);
diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp
index 75e8e50d..52834c36 100644
--- a/src/lib/data/parser/ParserClientImpl.cpp
+++ b/src/lib/data/parser/ParserClientImpl.cpp
@@ -109,6 +109,8 @@ NodeType ParserClientImpl::symbolKindToNodeType(SymbolKind symbolKind) const
 {
 	switch (symbolKind)
 	{
+	case SYMBOL_ANNOTATION:
+		return NodeType::NODE_ANNOTATION;
 	case SYMBOL_BUILTIN_TYPE:
 		return NodeType::NODE_BUILTIN_TYPE;
 	case SYMBOL_CLASS:
@@ -179,6 +181,8 @@ Edge::EdgeType ParserClientImpl::referenceKindToEdgeType(ReferenceKind reference
 		return Edge::EDGE_IMPORT;
 	case REFERENCE_MACRO_USAGE:
 		return Edge::EDGE_MACRO_USAGE;
+	case REFERENCE_ANNOTATION_USAGE:
+		return Edge::EDGE_ANNOTATION_USAGE;
 	default:
 		break;
 	}
diff --git a/src/lib/data/parser/ReferenceKind.cpp b/src/lib/data/parser/ReferenceKind.cpp
index 41b428d0..f9a6187a 100644
--- a/src/lib/data/parser/ReferenceKind.cpp
+++ b/src/lib/data/parser/ReferenceKind.cpp
@@ -30,6 +30,8 @@ ReferenceKind intToReferenceKind(int v)
 		return REFERENCE_IMPORT;
 	case REFERENCE_MACRO_USAGE:
 		return REFERENCE_MACRO_USAGE;
+	case REFERENCE_ANNOTATION_USAGE:
+		return REFERENCE_ANNOTATION_USAGE;
 	}
 	return REFERENCE_UNDEFINED;
 }
diff --git a/src/lib/data/parser/ReferenceKind.h b/src/lib/data/parser/ReferenceKind.h
index f14cbb57..ac443592 100644
--- a/src/lib/data/parser/ReferenceKind.h
+++ b/src/lib/data/parser/ReferenceKind.h
@@ -16,7 +16,8 @@ enum ReferenceKind
 	REFERENCE_TEMPLATE_MEMBER_SPECIALIZATION = 10,
 	REFERENCE_INCLUDE = 11,
 	REFERENCE_IMPORT = 12,
-	REFERENCE_MACRO_USAGE = 13
+	REFERENCE_MACRO_USAGE = 13,
+	REFERENCE_ANNOTATION_USAGE = 14
 };
 
 ReferenceKind intToReferenceKind(int v);
diff --git a/src/lib/data/parser/SymbolKind.cpp b/src/lib/data/parser/SymbolKind.cpp
index 7c0edcf4..acc66b9a 100644
--- a/src/lib/data/parser/SymbolKind.cpp
+++ b/src/lib/data/parser/SymbolKind.cpp
@@ -4,6 +4,8 @@ SymbolKind intToSymbolKind(int v)
 {
 	switch (v)
 	{
+	case SYMBOL_ANNOTATION:
+		return SYMBOL_ANNOTATION;
 	case SYMBOL_BUILTIN_TYPE:
 		return SYMBOL_BUILTIN_TYPE;
 	case SYMBOL_CLASS:
diff --git a/src/lib/data/parser/SymbolKind.h b/src/lib/data/parser/SymbolKind.h
index 0c105073..685fe278 100644
--- a/src/lib/data/parser/SymbolKind.h
+++ b/src/lib/data/parser/SymbolKind.h
@@ -3,26 +3,27 @@
 
 enum SymbolKind
 { // these values need to be the same as SymbolKind in Java code
-	SYMBOL_BUILTIN_TYPE = 1,
-	SYMBOL_CLASS = 2,
-	SYMBOL_ENUM = 3,
-	SYMBOL_ENUM_CONSTANT = 4,
-	SYMBOL_FIELD = 5,
-	SYMBOL_FUNCTION = 6,
-	SYMBOL_GLOBAL_VARIABLE = 7,
-	SYMBOL_INTERFACE = 8,
-	SYMBOL_LOCAL_VARIABLE = 9,
-	SYMBOL_MACRO = 10,
-	SYMBOL_METHOD = 11,
-	SYMBOL_NAMESPACE = 12,
-	SYMBOL_PACKAGE = 13,
-	SYMBOL_PARAMETER = 14,
-	SYMBOL_STRUCT = 15,
-	SYMBOL_TEMPLATE_PARAMETER = 16,
-	SYMBOL_TYPEDEF = 17,
-	SYMBOL_TYPE_PARAMETER = 18,
-	SYMBOL_UNION = 19,
-	SYMBOL_KIND_MAX = 20
+	SYMBOL_ANNOTATION = 1,
+	SYMBOL_BUILTIN_TYPE = 2,
+	SYMBOL_CLASS = 3,
+	SYMBOL_ENUM = 4,
+	SYMBOL_ENUM_CONSTANT = 5,
+	SYMBOL_FIELD = 6,
+	SYMBOL_FUNCTION = 7,
+	SYMBOL_GLOBAL_VARIABLE = 8,
+	SYMBOL_INTERFACE = 9,
+	SYMBOL_LOCAL_VARIABLE = 10,
+	SYMBOL_MACRO = 11,
+	SYMBOL_METHOD = 12,
+	SYMBOL_NAMESPACE = 13,
+	SYMBOL_PACKAGE = 14,
+	SYMBOL_PARAMETER = 15,
+	SYMBOL_STRUCT = 16,
+	SYMBOL_TEMPLATE_PARAMETER = 17,
+	SYMBOL_TYPEDEF = 18,
+	SYMBOL_TYPE_PARAMETER = 19,
+	SYMBOL_UNION = 20,
+	SYMBOL_KIND_MAX = 21
 };
 
 SymbolKind intToSymbolKind(int v);
diff --git a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
index 1e62dd8b..11145861 100644
--- a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
+++ b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
@@ -30,7 +30,7 @@ namespace
 	}
 }
 
-const size_t SqliteIndexStorage::s_storageVersion = 18;
+const size_t SqliteIndexStorage::s_storageVersion = 19;
 
 SqliteIndexStorage::SqliteIndexStorage(const FilePath& dbFilePath)
 	: SqliteStorage(dbFilePath.getCanonical())
diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h
index 3854e1eb..94d4d053 100644
--- a/src/test/JavaParserTestSuite.h
+++ b/src/test/JavaParserTestSuite.h
@@ -53,6 +53,33 @@ public:
 		));
 	}
 
+	void test_java_parser_finds_anotation_declaration_in_defaut_package()
+	{
+		std::shared_ptr<TestParserClient> client = parseCode(
+			"public @interface SampleAnnotation\n"
+			"{\n"
+			"}\n"
+		);
+
+		TS_ASSERT(utility::containsElement<std::wstring>(
+			client->annotations, L"public SampleAnnotation <1:1 <1:19 1:34> 3:1>"
+		));
+	}
+
+	void test_java_parser_finds_anotation_member_declaration()
+	{
+		std::shared_ptr<TestParserClient> client = parseCode(
+			"public @interface SampleAnnotation\n"
+			"{\n"
+			"	public int value() default 0;\n"
+			"}\n"
+		);
+
+		TS_ASSERT(utility::containsElement<std::wstring>(
+			client->fields, L"public int SampleAnnotation.value <3:13 3:17>"
+		));
+	}
+
 	void test_java_parser_finds_class_declaration_in_defaut_package()
 	{
 		std::shared_ptr<TestParserClient> client = parseCode(
@@ -781,6 +808,83 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 // test finding usages of symbols
 
+	void test_java_parser_finds_usage_of_marker_annotation()
+	{
+		std::shared_ptr<TestParserClient> client = parseCode(
+			"public @interface SampleAnnotation\n"
+			"{\n"
+			"}\n"
+			"\n"
+			"@SampleAnnotation\n"
+			"class Foo\n"
+			"{\n"
+			"}\n"
+		);
+
+		TS_ASSERT(utility::containsElement<std::wstring>(
+			client->annotationUses, L"Foo -> SampleAnnotation <5:2 5:17>"
+		));
+	}
+
+	void test_java_parser_finds_usage_of_single_member_annotation()
+	{
+		std::shared_ptr<TestParserClient> client = parseCode(
+			"public @interface SampleAnnotation\n"
+			"{\n"
+			"	public int value() default 0;\n"
+			"}\n"
+			"\n"
+			"@SampleAnnotation(33)\n"
+			"class Foo\n"
+			"{\n"
+			"}\n"
+		);
+
+		TS_ASSERT(utility::containsElement<std::wstring>(
+			client->annotationUses, L"Foo -> SampleAnnotation <6:2 6:17>"
+		));
+	}
+
+	void test_java_parser_finds_usage_of_normal_annotation()
+	{
+		std::shared_ptr<TestParserClient> client = parseCode(
+			"public @interface SampleAnnotation\n"
+			"{\n"
+			"	public int a() default 0;\n"
+			"	public int b() default 0;\n"
+			"}\n"
+			"\n"
+			"@SampleAnnotation()\n"
+			"class Foo\n"
+			"{\n"
+			"}\n"
+		);
+
+		TS_ASSERT(utility::containsElement<std::wstring>(
+			client->annotationUses, L"Foo -> SampleAnnotation <7:2 7:17>"
+		));
+	}
+
+	void test_java_parser_finds_usage_of_normal_annotation_member_in_initialization()
+	{
+		std::shared_ptr<TestParserClient> client = parseCode(
+			"public @interface SampleAnnotation\n"
+			"{\n"
+			"	public int a() default 0;\n"
+			"	public int b() default 0;\n"
+			"}\n"
+			"\n"
+			"@SampleAnnotation(a = 9)\n"
+			"class Foo\n"
+			"{\n"
+			"}\n"
+		);
+
+		TS_ASSERT(utility::containsElement<std::wstring>(
+			client->usages, L"Foo -> int SampleAnnotation.a <7:19 7:19>"
+		));
+	}
+
 	void test_java_parser_finds_inheritance_using_extends_keyword()
 	{
 		std::shared_ptr<TestParserClient> client = parseCode(
diff --git a/src/test/helper/DumpParserClient.h b/src/test/helper/DumpParserClient.h
index 2f3a7ed7..a5f63a4e 100644
--- a/src/test/helper/DumpParserClient.h
+++ b/src/test/helper/DumpParserClient.h
@@ -194,6 +194,8 @@ private:
 			return L"REFERENCE_IMPORT";
 		case REFERENCE_MACRO_USAGE:
 			return L"REFERENCE_MACRO_USAGE";
+		case REFERENCE_ANNOTATION_USAGE:
+			return L"REFERENCE_ANNOTATION_USAGE";
 		default:
 			break;
 		}
diff --git a/src/test/helper/TestParserClient.h b/src/test/helper/TestParserClient.h
index 134cf506..2c1a155a 100644
--- a/src/test/helper/TestParserClient.h
+++ b/src/test/helper/TestParserClient.h
@@ -104,6 +104,9 @@ public:
 		case REFERENCE_MACRO_USAGE:
 			referenceContainer = &macroUses;
 			break;
+		case REFERENCE_ANNOTATION_USAGE:
+			referenceContainer = &annotationUses;
+			break;
 		default:
 			break;
 		}
@@ -145,6 +148,7 @@ public:
 	std::vector<std::wstring> classes;
 	std::vector<std::wstring> unions;
 	std::vector<std::wstring> interfaces;
+	std::vector<std::wstring> annotations;
 	std::vector<std::wstring> enums;
 	std::vector<std::wstring> enumConstants;
 	std::vector<std::wstring> functions;
@@ -166,6 +170,7 @@ public:
 	std::vector<std::wstring> usages;	// for variables
 	std::vector<std::wstring> typeUses;	// for types
 	std::vector<std::wstring> macroUses;
+	std::vector<std::wstring> annotationUses;
 	std::vector<std::wstring> templateArgumentTypes;
 	std::vector<std::wstring> typeArguments;
 	std::vector<std::wstring> templateDefaultArgumentTypes;
@@ -204,6 +209,8 @@ private:
 			return &unions;
 		case SYMBOL_INTERFACE:
 			return &interfaces;
+		case SYMBOL_ANNOTATION:
+			return &annotations;
 		case SYMBOL_ENUM:
 			return &enums;
 		case SYMBOL_ENUM_CONSTANT: