diff --git a/src/Famix-Java-Entities/FamixJavaEntity.class.st b/src/Famix-Java-Entities/FamixJavaEntity.class.st
index ce3fa434..48b194b5 100644
--- a/src/Famix-Java-Entities/FamixJavaEntity.class.st
+++ b/src/Famix-Java-Entities/FamixJavaEntity.class.st
@@ -145,6 +145,13 @@ FamixJavaEntity >> isPrimitiveType [
 	^ false
 ]
 
+{ #category : #testing }
+FamixJavaEntity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixJavaEntity >> isReference [
 
diff --git a/src/Famix-MetamodelGeneration/FamixMooseQueryGenerator.class.st b/src/Famix-MetamodelGeneration/FamixMooseQueryGenerator.class.st
index 5382c0d6..30132c38 100644
--- a/src/Famix-MetamodelGeneration/FamixMooseQueryGenerator.class.st
+++ b/src/Famix-MetamodelGeneration/FamixMooseQueryGenerator.class.st
@@ -25,5 +25,5 @@ FamixMooseQueryGenerator >> defineTraits [
 
 	tAssociationMetaLevelDependency := builder newTraitNamed: #TAssociationMetaLevelDependency.
 	tEntityMetaLevelDependency := builder newTraitNamed: #TEntityMetaLevelDependency.
-
+	tEntityMetaLevelDependency testingSelector: #isQueryable
 ]
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStEntity.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStEntity.class.st
index e88fa2d2..b3f69403 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStEntity.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStEntity.class.st
@@ -119,6 +119,13 @@ FamixStEntity >> isPackage [
 	^ false
 ]
 
+{ #category : #testing }
+FamixStEntity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixStEntity >> isReference [
 
diff --git a/src/Famix-Test1-Entities/FamixTest1Entity.class.st b/src/Famix-Test1-Entities/FamixTest1Entity.class.st
index 2314e29a..e7899ef7 100644
--- a/src/Famix-Test1-Entities/FamixTest1Entity.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Entity.class.st
@@ -63,6 +63,13 @@ FamixTest1Entity >> isMethod [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTest1Entity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTest1Entity >> isStructuralEntity [
 
diff --git a/src/Famix-Test2-Entities/FamixTest2Entity.class.st b/src/Famix-Test2-Entities/FamixTest2Entity.class.st
index 14578dcf..427d5260 100644
--- a/src/Famix-Test2-Entities/FamixTest2Entity.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2Entity.class.st
@@ -49,6 +49,13 @@ FamixTest2Entity >> isInheritance [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTest2Entity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTest2Entity >> isType [
 
diff --git a/src/Famix-Test3-Entities/FamixTest3Entity.class.st b/src/Famix-Test3-Entities/FamixTest3Entity.class.st
index fa8769ca..7485decd 100644
--- a/src/Famix-Test3-Entities/FamixTest3Entity.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Entity.class.st
@@ -84,6 +84,13 @@ FamixTest3Entity >> isPackage [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTest3Entity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTest3Entity >> isReference [
 
diff --git a/src/Famix-Test3-Entities/FamixTest3TypeGroup.class.st b/src/Famix-Test3-Entities/FamixTest3TypeGroup.class.st
index 8aec4af4..adfe199e 100644
--- a/src/Famix-Test3-Entities/FamixTest3TypeGroup.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3TypeGroup.class.st
@@ -76,6 +76,13 @@ FamixTest3TypeGroup >> isPackage [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTest3TypeGroup >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTest3TypeGroup >> isReference [
 
diff --git a/src/Famix-Test7-Entities/FamixTest7Entity.class.st b/src/Famix-Test7-Entities/FamixTest7Entity.class.st
index 4029332d..0596e2c7 100644
--- a/src/Famix-Test7-Entities/FamixTest7Entity.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Entity.class.st
@@ -63,6 +63,13 @@ FamixTest7Entity >> isMethod [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTest7Entity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTest7Entity >> isType [
 
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Entity.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Entity.class.st
index 4d2c99b2..98b86d92 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Entity.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Entity.class.st
@@ -49,6 +49,13 @@ FamixTestComposed1Entity >> isMethod [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTestComposed1Entity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTestComposed1Entity >> isType [
 
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Entity.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Entity.class.st
index 9a8ab5c5..d5323308 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Entity.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Entity.class.st
@@ -49,6 +49,13 @@ FamixTestComposed2Entity >> isMethod [
 	^ false
 ]
 
+{ #category : #testing }
+FamixTestComposed2Entity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 FamixTestComposed2Entity >> isType [
 
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestEntity.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestEntity.class.st
index a7dd2305..f458e99c 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestEntity.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestEntity.class.st
@@ -91,6 +91,13 @@ MooseMSEImporterTestEntity >> isPrimitiveType [
 	^ false
 ]
 
+{ #category : #testing }
+MooseMSEImporterTestEntity >> isQueryable [
+
+	<generated>
+	^ false
+]
+
 { #category : #testing }
 MooseMSEImporterTestEntity >> isStructuralEntity [
 
diff --git a/src/Moose-Core/MooseEntity.class.st b/src/Moose-Core/MooseEntity.class.st
index 020a71c7..3a94523d 100644
--- a/src/Moose-Core/MooseEntity.class.st
+++ b/src/Moose-Core/MooseEntity.class.st
@@ -184,6 +184,14 @@ MooseEntity >> isMooseEntity [
 	^ true
 ]
 
+{ #category : #testing }
+MooseEntity >> isQueryable [
+	"This should probably be removed in the future but is here for compatibility.
+	Could be removed in Moose 12."
+
+	^ false
+]
+
 { #category : #testing }
 MooseEntity >> isStub [
 	^ self attributeAt: #privateIsStub ifAbsent: [ false ]
diff --git a/src/Moose-Query/TEntityMetaLevelDependency.trait.st b/src/Moose-Query/TEntityMetaLevelDependency.trait.st
index 7a190c41..9ce4464f 100644
--- a/src/Moose-Query/TEntityMetaLevelDependency.trait.st
+++ b/src/Moose-Query/TEntityMetaLevelDependency.trait.st
@@ -699,6 +699,13 @@ TEntityMetaLevelDependency >> isIncludedIn: anEntity parentSelectorsCache: paren
 	^ false
 ]
 
+{ #category : #testing }
+TEntityMetaLevelDependency >> isQueryable [
+
+	<generated>
+	^ true
+]
+
 { #category : #testing }
 TEntityMetaLevelDependency >> isRoot [