diff --git a/src/Famix-Java-Entities/FamixJavaPackage.class.st b/src/Famix-Java-Entities/FamixJavaPackage.class.st
index ba4c27d33..764a48788 100644
--- a/src/Famix-Java-Entities/FamixJavaPackage.class.st
+++ b/src/Famix-Java-Entities/FamixJavaPackage.class.st
@@ -159,11 +159,6 @@ FamixJavaPackage >> childrenOfMyKind [
 	^ self childEntities allWithSubTypesOf: self class
 ]
 
-{ #category : 'accessing' }
-FamixJavaPackage >> classes [
-	^ self cacheAt: #classes ifAbsentPut: [ self childEntities select: [ :child | child isClass ] ]
-]
-
 { #category : 'Famix-Extensions-accessing' }
 FamixJavaPackage >> containedEntities [
 	^ super containedEntities union: self childEntities
diff --git a/src/Famix-MetamodelGeneration/FamixGenerator.class.st b/src/Famix-MetamodelGeneration/FamixGenerator.class.st
index 87770e0ba..a4d63356e 100644
--- a/src/Famix-MetamodelGeneration/FamixGenerator.class.st
+++ b/src/Famix-MetamodelGeneration/FamixGenerator.class.st
@@ -1122,6 +1122,7 @@ FamixGenerator >> defineHierarchy [
 
 	tPackage --|> tNamedEntity.
 	tPackage --|> #TEntityMetaLevelDependency.
+	tPackage --|> tWithClasses.
 	tPackage --|> tCanBeStub.
 
 	tParameter --|> tStructuralEntity.
diff --git a/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st b/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st
index 37db27def..097bf5da5 100644
--- a/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st
+++ b/src/Famix-PharoSmalltalk-Generator/FamixPharoSmalltalkGenerator.class.st
@@ -140,7 +140,6 @@ FamixPharoSmalltalkGenerator >> defineHierarchy [
 	package --|> namedEntity.
 	package --|> #TPackage.
 	package --|> #TWithGlobalVariables.
-	package --|> #TWithClasses.
 	package --|> #TCohesionCouplingMetrics.
 
 	parameter --|> namedEntity.
diff --git a/src/Famix-Traits/FamixTPackage.trait.st b/src/Famix-Traits/FamixTPackage.trait.st
index f1ddac00b..465851628 100644
--- a/src/Famix-Traits/FamixTPackage.trait.st
+++ b/src/Famix-Traits/FamixTPackage.trait.st
@@ -31,8 +31,8 @@ Trait {
 	#instVars : [
 		'#childEntities => FMMany type: #FamixTPackageable opposite: #parentPackage'
 	],
-	#traits : 'FamixTCanBeStub + FamixTNamedEntity + TEntityMetaLevelDependency',
-	#classTraits : 'FamixTCanBeStub classTrait + FamixTNamedEntity classTrait + TEntityMetaLevelDependency classTrait',
+	#traits : 'FamixTNamedEntity + FamixTCanBeStub + FamixTWithClasses + TEntityMetaLevelDependency',
+	#classTraits : 'FamixTNamedEntity classTrait + FamixTCanBeStub classTrait + FamixTWithClasses classTrait + TEntityMetaLevelDependency classTrait',
 	#category : 'Famix-Traits-Package',
 	#package : 'Famix-Traits',
 	#tag : 'Package'