diff --git a/src/FAST-Core-Model/FASTTComment.trait.st b/src/FAST-Core-Model/FASTTComment.trait.st
index 4f00c6c..217f883 100644
--- a/src/FAST-Core-Model/FASTTComment.trait.st
+++ b/src/FAST-Core-Model/FASTTComment.trait.st
@@ -4,7 +4,7 @@ FASTComment represents one instance of a comment (in the sense of programming la
 ## Relations
 ======================
 
-### Other
+### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `container` | `FASTTComment` | `comments` | `FASTTWithComments` | Source code entity containing the comment|
@@ -42,6 +42,7 @@ FASTTComment >> container [
 
 	<generated>
 	<FMComment: 'Source code entity containing the comment'>
+	<container>
 	^ container
 ]
 
@@ -52,6 +53,13 @@ FASTTComment >> container: anObject [
 	container := anObject
 ]
 
+{ #category : #navigation }
+FASTTComment >> containerGroup [
+	<generated>
+	<navigation: 'Container'>
+	^ MooseSpecializedGroup with: self container
+]
+
 { #category : #accessing }
 FASTTComment >> content [
 
diff --git a/src/FAST-Core-Model/FASTTWithComments.trait.st b/src/FAST-Core-Model/FASTTWithComments.trait.st
index dca1038..e41e00e 100644
--- a/src/FAST-Core-Model/FASTTWithComments.trait.st
+++ b/src/FAST-Core-Model/FASTTWithComments.trait.st
@@ -4,7 +4,7 @@ For entities with comments. In FAST, they are called containers.
 ## Relations
 ======================
 
-### Other
+### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `comments` | `FASTTWithComments` | `container` | `FASTTComment` | list of comments defined in the entity|
@@ -52,6 +52,13 @@ FASTTWithComments >> comments: anObject [
 	comments value: anObject
 ]
 
+{ #category : #navigation }
+FASTTWithComments >> commentsGroup [
+	<generated>
+	<navigation: 'Comments'>
+	^ MooseSpecializedGroup withAll: self comments asSet
+]
+
 { #category : #adding }
 FASTTWithComments >> hasComments [
 	<FMProperty: #hasComments type: #Boolean>