diff --git a/src/Famix-Fortran77-Entities/FamixF77ImportingContext.class.st b/src/Famix-Fortran77-Entities/FamixF77ImportingContext.class.st
index 823c10b..850fd72 100644
--- a/src/Famix-Fortran77-Entities/FamixF77ImportingContext.class.st
+++ b/src/Famix-Fortran77-Entities/FamixF77ImportingContext.class.st
@@ -85,13 +85,6 @@ FamixF77ImportingContext >> importPUBlockdata [
 	^ self importConcreteEntity: (self class fm3ClassNamed: #PUBlockdata)
 ]
 
-{ #category : #importing }
-FamixF77ImportingContext >> importPUComment [
-
-	<generated>
-	^ self importConcreteEntity: (self class fm3ClassNamed: #PUComment)
-]
-
 { #category : #importing }
 FamixF77ImportingContext >> importPUFunction [
 
@@ -260,13 +253,6 @@ FamixF77ImportingContext >> shouldImportPUBlockdata [
 	^ self shouldImport: #PUBlockdata
 ]
 
-{ #category : #testing }
-FamixF77ImportingContext >> shouldImportPUComment [
-
-	<generated>
-	^ self shouldImport: #PUComment
-]
-
 { #category : #testing }
 FamixF77ImportingContext >> shouldImportPUFunction [
 
diff --git a/src/Famix-Fortran77-Entities/FamixF77PUComment.class.st b/src/Famix-Fortran77-Entities/FamixF77PUComment.class.st
deleted file mode 100644
index 305acd9..0000000
--- a/src/Famix-Fortran77-Entities/FamixF77PUComment.class.st
+++ /dev/null
@@ -1,43 +0,0 @@
-"
-a comment belongs to fortran file
-
-## Relations
-======================
-
-### Parents
-| Relation | Origin | Opposite | Type | Comment |
-|---|
-| `commentedEntity` | `FamixTComment` | `comments` | `FamixTWithComments` | Source code commented by the comment|
-
-
-## Properties
-======================
-
-| Name | Type | Default value | Comment |
-|---|
-| `content` | `String` | nil | Content of the comment as a String|
-
-"
-Class {
-	#name : #FamixF77PUComment,
-	#superclass : #FamixF77ProgramUnit,
-	#traits : 'FamixTComment',
-	#classTraits : 'FamixTComment classTrait',
-	#category : #'Famix-Fortran77-Entities-Entities'
-}
-
-{ #category : #meta }
-FamixF77PUComment class >> annotation [
-
-	<FMClass: #PUComment super: #FamixF77ProgramUnit>
-	<package: #'Famix-Fortran77-Entities'>
-	<generated>
-	^ self
-]
-
-{ #category : #'as yet unclassified' }
-FamixF77PUComment >> resolveVariable: variableName with: resolver [
-	"PUComment should not exist, a Comment is not a ProgramUnit :-("
-
-	^nil
-]
diff --git a/src/Famix-Fortran77-Entities/FamixF77ProgramFile.class.st b/src/Famix-Fortran77-Entities/FamixF77ProgramFile.class.st
index e43c21e..d2d1ed6 100644
--- a/src/Famix-Fortran77-Entities/FamixF77ProgramFile.class.st
+++ b/src/Famix-Fortran77-Entities/FamixF77ProgramFile.class.st
@@ -13,6 +13,7 @@ a fortran file
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `comments` | `FamixTWithComments` | `commentedEntity` | `FamixTComment` | List of comments for the entity|
 | `programUnits` | `FamixF77ProgramFile` | `programFile` | `FamixF77ProgramUnit` | |
 
 ### Other
@@ -35,8 +36,8 @@ a fortran file
 Class {
 	#name : #FamixF77ProgramFile,
 	#superclass : #FamixF77NamedEntity,
-	#traits : 'FamixTCompilationUnit + (FamixTSourceEntity - {#sourceText}) + TEntityMetaLevelDependency',
-	#classTraits : 'FamixTCompilationUnit classTrait + FamixTSourceEntity classTrait + TEntityMetaLevelDependency classTrait',
+	#traits : 'FamixTCompilationUnit + (FamixTSourceEntity - {#sourceText}) + FamixTWithComments + TEntityMetaLevelDependency',
+	#classTraits : 'FamixTCompilationUnit classTrait + FamixTSourceEntity classTrait + FamixTWithComments classTrait + TEntityMetaLevelDependency classTrait',
 	#instVars : [
 		'#filename => FMProperty',
 		'#programUnits => FMMany type: #FamixF77ProgramUnit opposite: #programFile',
diff --git a/src/Famix-Fortran77-Entities/FamixF77TEntityCreator.trait.st b/src/Famix-Fortran77-Entities/FamixF77TEntityCreator.trait.st
index 2f100de..98c5798 100644
--- a/src/Famix-Fortran77-Entities/FamixF77TEntityCreator.trait.st
+++ b/src/Famix-Fortran77-Entities/FamixF77TEntityCreator.trait.st
@@ -88,13 +88,6 @@ FamixF77TEntityCreator >> newPUBlockdata [
 	^ self add: FamixF77PUBlockdata new
 ]
 
-{ #category : #'entity creation' }
-FamixF77TEntityCreator >> newPUComment [
-
-	<generated>
-	^ self add: FamixF77PUComment new
-]
-
 { #category : #'entity creation' }
 FamixF77TEntityCreator >> newPUFunction [
 
diff --git a/src/Famix-Fortran77-Generator/FamixFortran77Generator.class.st b/src/Famix-Fortran77-Generator/FamixFortran77Generator.class.st
index cdd6e99..f37a710 100644
--- a/src/Famix-Fortran77-Generator/FamixFortran77Generator.class.st
+++ b/src/Famix-Fortran77-Generator/FamixFortran77Generator.class.st
@@ -40,7 +40,6 @@ Class {
 		'parameter',
 		'programUnit',
 		'puBlockdata',
-		'puComment',
 		'puFunction',
 		'puMain',
 		'puProcedure',
@@ -149,10 +148,6 @@ FamixFortran77Generator >> defineClasses [
 		               newClassNamed: #PUBlockdata
 		               comment: self puBlockdataEntityComment.
 
-	puComment := builder
-		             newClassNamed: #PUComment
-		             comment: self puCommentEntityComment.
-
 	puFunction := builder
 		              newClassNamed: #PUFunction
 		              comment: self puFunctionEntityComment.
@@ -222,6 +217,7 @@ FamixFortran77Generator >> defineHierarchy [
 
 	programFile --|> namedEntity.
 	programFile inheritsFromTrait: #TSourceEntity without: { #sourceText }.
+	programFile --|> #TWithComments.
 	programFile --|> #TCompilationUnit.
 	programFile --|> #TEntityMetaLevelDependency.
 
@@ -234,9 +230,6 @@ FamixFortran77Generator >> defineHierarchy [
 	puBlockdata --|> programUnit.
 	"puBlockdata --|> #TWithTypes."
 
-	puComment --|> programUnit.
-	puComment --|> #TComment.
-
 	puFunction --|> puProcedure.
 	puFunction --|> #TTypedEntity.
 
@@ -427,12 +420,6 @@ FamixFortran77Generator >> puBlockdataEntityComment [
 	^ 'a block data for common variable'
 ]
 
-{ #category : #'class comment' }
-FamixFortran77Generator >> puCommentEntityComment [
-
-	^ 'a comment belongs to fortran file'
-]
-
 { #category : #'class comment' }
 FamixFortran77Generator >> puFunctionEntityComment [