From adfb34173c6eef73b44da149ae722c4a20662f64 Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.me>
Date: Mon, 15 Jan 2024 17:08:51 +0100
Subject: [PATCH 1/4] First iteration for better generated class comments

This change is a first iteration to have better class comments in generated classes and traits.

A second iteration will happen to use tables and method links in microdown.

Fixes #641
Fixes #126
---
 .../FamixTHasModifiers.trait.st               |  7 ++
 .../FamixJavaAccess.class.st                  | 20 +++++
 .../FamixJavaAnnotationInstance.class.st      | 12 +++
 ...ixJavaAnnotationInstanceAttribute.class.st | 15 ++++
 .../FamixJavaAnnotationType.class.st          | 24 +++++
 .../FamixJavaAnnotationTypeAttribute.class.st | 22 +++++
 .../FamixJavaAttribute.class.st               | 26 ++++++
 .../FamixJavaClass.class.st                   | 35 ++++++++
 .../FamixJavaComment.class.st                 | 13 +++
 .../FamixJavaContainerEntity.class.st         | 11 +++
 .../FamixJavaEntity.class.st                  |  2 +
 .../FamixJavaEnum.class.st                    | 30 +++++++
 .../FamixJavaEnumValue.class.st               | 20 +++++
 .../FamixJavaException.class.st               | 35 ++++++++
 .../FamixJavaImplementation.class.st          | 19 ++++
 .../FamixJavaImplicitVariable.class.st        | 20 +++++
 .../FamixJavaImport.class.st                  | 19 ++++
 .../FamixJavaIndexedFileAnchor.class.st       | 11 +++
 .../FamixJavaInheritance.class.st             | 19 ++++
 .../FamixJavaInterface.class.st               | 28 ++++++
 .../FamixJavaInvocation.class.st              | 21 +++++
 .../FamixJavaLocalVariable.class.st           | 22 +++++
 .../FamixJavaMethod.class.st                  | 39 ++++++++
 .../FamixJavaNamedEntity.class.st             | 14 +++
 .../FamixJavaPackage.class.st                 | 21 +++++
 .../FamixJavaParameter.class.st               | 21 +++++
 .../FamixJavaParameterizableClass.class.st    |  9 ++
 ...FamixJavaParameterizableException.class.st |  9 ++
 ...FamixJavaParameterizableInterface.class.st |  9 ++
 .../FamixJavaParameterizedType.class.st       | 16 ++++
 .../FamixJavaPrimitiveType.class.st           | 19 ++++
 .../FamixJavaReference.class.st               | 19 ++++
 .../FamixJavaSourceAnchor.class.st            |  9 ++
 .../FamixJavaSourceLanguage.class.st          |  9 ++
 .../FamixJavaSourceTextAnchor.class.st        | 13 +++
 .../FamixJavaSourcedEntity.class.st           | 13 +++
 .../FamixJavaTCanBeSynchronized.trait.st      |  6 ++
 .../FamixJavaTCanBeTransient.trait.st         |  6 ++
 .../FamixJavaTCanBeVolatile.trait.st          |  6 ++
 .../FamixJavaTEntityCreator.trait.st          |  2 +
 .../FamixJavaTWithInterfaces.trait.st         |  9 ++
 .../FamixJavaType.class.st                    | 22 +++++
 .../FamixJavaUnknownSourceLanguage.class.st   |  9 ++
 .../FamixJavaUnknownVariable.class.st         | 18 ++++
 .../FmxMBBehavior.class.st                    | 90 +++++++++++++++++++
 .../FmxMBClass.class.st                       |  2 +-
 .../FmxMBProperty.class.st                    |  6 ++
 .../FmxMBRelationSide.class.st                | 11 +++
 .../FmxMBTrait.class.st                       |  2 +-
 .../FamixStAccess.class.st                    | 20 +++++
 .../FamixStAnnotationInstance.class.st        | 12 +++
 ...amixStAnnotationInstanceAttribute.class.st | 15 ++++
 .../FamixStAnnotationType.class.st            | 14 +++
 .../FamixStAnnotationTypeAttribute.class.st   | 21 +++++
 .../FamixStAttribute.class.st                 | 21 +++++
 .../FamixStClass.class.st                     | 31 +++++++
 .../FamixStComment.class.st                   | 13 +++
 .../FamixStGlobalVariable.class.st            | 20 +++++
 .../FamixStImplicitVariable.class.st          | 20 +++++
 .../FamixStInheritance.class.st               | 19 ++++
 .../FamixStInvocation.class.st                | 21 +++++
 .../FamixStLocalVariable.class.st             | 20 +++++
 .../FamixStMethod.class.st                    | 36 ++++++++
 .../FamixStNamedEntity.class.st               | 13 +++
 .../FamixStNamespace.class.st                 | 19 ++++
 .../FamixStPackage.class.st                   | 19 ++++
 .../FamixStParameter.class.st                 | 20 +++++
 .../FamixStPharoEntitySourceAnchor.class.st   | 14 +--
 .../FamixStReference.class.st                 | 19 ++++
 .../FamixStSourceAnchor.class.st              |  9 ++
 .../FamixStSourceLanguage.class.st            |  9 ++
 .../FamixStSourceTextAnchor.class.st          | 13 +++
 .../FamixStSourcedEntity.class.st             | 13 +++
 .../FamixStTEntityCreator.trait.st            |  2 +
 .../FamixStUnknownSourceLanguage.class.st     |  9 ++
 .../FamixStUnknownVariable.class.st           | 18 ++++
 .../FamixTest1Association.class.st            | 15 ++++
 .../FamixTest1Attribute.class.st              | 21 +++++
 .../FamixTest1Class.class.st                  | 28 ++++++
 .../FamixTest1Comment.class.st                | 13 +++
 .../FamixTest1File.class.st                   | 11 +++
 .../FamixTest1FileAnchor.class.st             | 13 +++
 .../FamixTest1Folder.class.st                 | 11 +++
 .../FamixTest1IndexedFileAnchor.class.st      | 11 +++
 .../FamixTest1Method.class.st                 | 32 +++++++
 .../FamixTest1Model.class.st                  |  6 ++
 .../FamixTest1MultipleFileAnchor.class.st     | 13 +++
 .../FamixTest1NamedEntity.class.st            |  7 ++
 .../FamixTest1SourceAnchor.class.st           |  9 ++
 .../FamixTest1SourceLanguage.class.st         |  9 ++
 .../FamixTest1SourceTextAnchor.class.st       | 13 +++
 .../FamixTest1SourcedEntity.class.st          | 15 ++++
 .../FamixTest1TCanBeClassSide.trait.st        |  7 ++
 .../FamixTest1TEntityCreator.trait.st         |  2 +
 .../FamixTest1UnknownSourceLanguage.class.st  |  9 ++
 .../FamixTest2Class.class.st                  | 27 ++++++
 .../FamixTest2Comment.class.st                | 13 +++
 .../FamixTest2Inheritance.class.st            | 19 ++++
 .../FamixTest2NamedEntity.class.st            |  7 ++
 .../FamixTest2SourceAnchor.class.st           |  9 ++
 .../FamixTest2SourceLanguage.class.st         |  9 ++
 .../FamixTest2SourceTextAnchor.class.st       | 13 +++
 .../FamixTest2SourcedEntity.class.st          | 13 +++
 .../FamixTest2TEntityCreator.trait.st         |  2 +
 .../FamixTest2UnknownSourceLanguage.class.st  |  9 ++
 .../FamixTest3Access.class.st                 | 20 +++++
 .../FamixTest3Attribute.class.st              | 19 ++++
 .../FamixTest3Class.class.st                  | 28 ++++++
 .../FamixTest3Comment.class.st                | 13 +++
 .../FamixTest3Invocation.class.st             | 21 +++++
 .../FamixTest3Method.class.st                 | 28 ++++++
 .../FamixTest3NamedEntity.class.st            |  7 ++
 .../FamixTest3Package.class.st                | 16 ++++
 .../FamixTest3PrimitiveType.class.st          | 12 +++
 .../FamixTest3Reference.class.st              | 19 ++++
 .../FamixTest3SourceAnchor.class.st           |  9 ++
 .../FamixTest3SourceLanguage.class.st         |  9 ++
 .../FamixTest3SourceTextAnchor.class.st       | 13 +++
 .../FamixTest3SourcedEntity.class.st          | 13 +++
 .../FamixTest3TEntityCreator.trait.st         |  2 +
 .../FamixTest3Type.class.st                   | 19 ++++
 .../FamixTest3UnknownSourceLanguage.class.st  |  9 ++
 .../FamixTest4Book.class.st                   |  9 ++
 .../FamixTest4Entity.class.st                 |  7 ++
 .../FamixTest4Person.class.st                 |  9 ++
 .../FamixTest4Principal.class.st              |  9 ++
 .../FamixTest4Room.class.st                   |  9 ++
 .../FamixTest4School.class.st                 | 12 +++
 .../FamixTest4Student.class.st                | 11 +++
 .../FamixTest4TEntityCreator.trait.st         |  2 +
 .../FamixTest4Teacher.class.st                | 11 +++
 .../FamixTest5AnnotationType1.class.st        | 11 +++
 .../FamixTest5AnnotationType2.class.st        | 11 +++
 .../FamixTest5TEntityCreator.trait.st         |  2 +
 .../FamixTest5WithAnnotationType1.class.st    |  9 ++
 .../FamixTest5WithAnnotationType2.class.st    |  9 ++
 .../FamixTest6Bacon.class.st                  |  8 ++
 .../FamixTest6Comment.class.st                | 13 +++
 .../FamixTest6NamedEntity.class.st            |  7 ++
 .../FamixTest6SourceAnchor.class.st           |  9 ++
 .../FamixTest6SourceLanguage.class.st         |  9 ++
 .../FamixTest6SourceTextAnchor.class.st       | 13 +++
 .../FamixTest6SourcedEntity.class.st          | 13 +++
 .../FamixTest6Spam.class.st                   |  7 ++
 .../FamixTest6TEntityCreator.trait.st         |  2 +
 .../FamixTest6UnknownSourceLanguage.class.st  |  9 ++
 .../FamixTest7Class.class.st                  | 27 ++++++
 .../FamixTest7Comment.class.st                | 13 +++
 .../FamixTest7Inheritance.class.st            | 19 ++++
 .../FamixTest7Method.class.st                 | 28 ++++++
 .../FamixTest7NamedEntity.class.st            |  7 ++
 .../FamixTest7SourceAnchor.class.st           |  9 ++
 .../FamixTest7SourceLanguage.class.st         |  9 ++
 .../FamixTest7SourceTextAnchor.class.st       | 13 +++
 .../FamixTest7SourcedEntity.class.st          | 13 +++
 .../FamixTest7TEntityCreator.trait.st         |  2 +
 .../FamixTest7UnknownSourceLanguage.class.st  |  9 ++
 .../FamixTest8Animal.class.st                 |  9 ++
 .../FamixTest8Bacteria.class.st               | 13 +++
 .../FamixTest8Biotope.class.st                |  9 ++
 .../FamixTest8Infection.class.st              | 20 +++++
 .../FamixTest8LivingBeing.class.st            |  9 ++
 .../FamixTest8Plant.class.st                  |  9 ++
 .../FamixTest8Residence.class.st              | 19 ++++
 .../FamixTest8TBiotope.trait.st               |  9 ++
 .../FamixTest8TEntityCreator.trait.st         |  2 +
 .../FamixTest8TInfectable.trait.st            | 13 +++
 .../FamixTest8TInfectious.trait.st            |  9 ++
 .../FamixTest8TResident.trait.st              |  9 ++
 .../FamixTest8Virus.class.st                  | 13 +++
 .../FamixTestComposedAssociation.class.st     | 19 ++++
 .../FamixTestComposedCustomEntity1.class.st   | 11 +++
 .../FamixTestComposedCustomEntity2.class.st   | 10 +++
 .../FamixTestComposedCustomEntity3.class.st   | 10 +++
 .../FamixTestComposedCustomEntity4.class.st   | 10 +++
 .../FamixTestComposedStandardEntity.class.st  |  9 ++
 .../FamixTestComposedTEntityCreator.trait.st  |  2 +
 .../FamixTestComposed1Class.class.st          | 27 ++++++
 .../FamixTestComposed1Comment.class.st        | 13 +++
 .../FamixTestComposed1Method.class.st         | 28 ++++++
 .../FamixTestComposed1NamedEntity.class.st    |  7 ++
 .../FamixTestComposed1SourceAnchor.class.st   |  9 ++
 .../FamixTestComposed1SourceLanguage.class.st |  9 ++
 ...amixTestComposed1SourceTextAnchor.class.st | 13 +++
 .../FamixTestComposed1SourcedEntity.class.st  | 13 +++
 .../FamixTestComposed1TEntityCreator.trait.st |  2 +
 ...estComposed1UnknownSourceLanguage.class.st |  9 ++
 .../FamixTestComposed2Class.class.st          | 27 ++++++
 .../FamixTestComposed2Comment.class.st        | 13 +++
 .../FamixTestComposed2Method.class.st         | 28 ++++++
 .../FamixTestComposed2NamedEntity.class.st    |  7 ++
 .../FamixTestComposed2SourceAnchor.class.st   |  9 ++
 .../FamixTestComposed2SourceLanguage.class.st |  9 ++
 ...amixTestComposed2SourceTextAnchor.class.st | 13 +++
 .../FamixTestComposed2SourcedEntity.class.st  | 13 +++
 .../FamixTestComposed2TEntityCreator.trait.st |  2 +
 ...estComposed2UnknownSourceLanguage.class.st |  9 ++
 src/Famix-Traits/FamixTAccess.trait.st        | 19 ++++
 src/Famix-Traits/FamixTAccessible.trait.st    |  9 ++
 .../FamixTAnnotationInstance.trait.st         |  8 ++
 ...FamixTAnnotationInstanceAttribute.trait.st | 12 +++
 .../FamixTAnnotationType.trait.st             | 10 +++
 .../FamixTAnnotationTypeAttribute.trait.st    | 19 ++++
 src/Famix-Traits/FamixTAssociation.trait.st   | 13 +++
 src/Famix-Traits/FamixTAttribute.trait.st     | 17 ++++
 src/Famix-Traits/FamixTCanBeAbstract.trait.st |  7 ++
 .../FamixTCanBeClassSide.trait.st             |  7 ++
 src/Famix-Traits/FamixTCanBeFinal.trait.st    |  7 ++
 src/Famix-Traits/FamixTCanImplement.trait.st  |  8 ++
 src/Famix-Traits/FamixTClass.trait.st         | 26 ++++++
 .../FamixTClassWithVisibility.trait.st        | 28 ++++++
 .../FamixTCohesionCouplingMetrics.trait.st    | 16 ++++
 src/Famix-Traits/FamixTComment.trait.st       | 12 +++
 .../FamixTCompilationUnit.trait.st            | 11 +++
 .../FamixTDefinedInModule.trait.st            |  9 ++
 .../FamixTDereferencedInvocation.trait.st     | 21 +++++
 src/Famix-Traits/FamixTEnum.trait.st          | 20 +++++
 src/Famix-Traits/FamixTEnumValue.trait.st     | 18 ++++
 src/Famix-Traits/FamixTException.trait.st     | 29 ++++++
 src/Famix-Traits/FamixTFile.trait.st          | 10 +++
 src/Famix-Traits/FamixTFileAnchor.trait.st    |  8 ++
 src/Famix-Traits/FamixTFileInclude.trait.st   | 17 ++++
 .../FamixTFileNavigation.trait.st             | 13 +++
 .../FamixTFileSystemEntity.trait.st           |  9 ++
 src/Famix-Traits/FamixTFolder.trait.st        | 10 +++
 src/Famix-Traits/FamixTFunction.trait.st      | 24 +++++
 .../FamixTGlobalVariable.trait.st             | 17 ++++
 .../FamixTHasImmediateSource.trait.st         | 12 +++
 src/Famix-Traits/FamixTHasKind.trait.st       |  6 ++
 src/Famix-Traits/FamixTHasSignature.trait.st  |  6 ++
 src/Famix-Traits/FamixTHasVisibility.trait.st |  7 ++
 src/Famix-Traits/FamixTHeader.trait.st        | 11 +++
 src/Famix-Traits/FamixTImplementable.trait.st |  8 ++
 .../FamixTImplementation.trait.st             | 19 ++++
 .../FamixTImplicitVariable.trait.st           | 18 ++++
 src/Famix-Traits/FamixTImport.trait.st        | 19 ++++
 src/Famix-Traits/FamixTImportable.trait.st    |  9 ++
 .../FamixTIndexedFileNavigation.trait.st      | 11 +++
 src/Famix-Traits/FamixTInheritance.trait.st   | 19 ++++
 src/Famix-Traits/FamixTInvocable.trait.st     |  9 ++
 src/Famix-Traits/FamixTInvocation.trait.st    | 19 ++++
 .../FamixTInvocationsReceiver.trait.st        |  9 ++
 src/Famix-Traits/FamixTLocalVariable.trait.st | 18 ++++
 src/Famix-Traits/FamixTMethod.trait.st        | 27 ++++++
 src/Famix-Traits/FamixTModule.trait.st        |  7 ++
 .../FamixTMultipleFileAnchor.trait.st         | 13 +++
 src/Famix-Traits/FamixTNamedEntity.trait.st   |  7 ++
 src/Famix-Traits/FamixTNamespace.trait.st     | 13 +++
 src/Famix-Traits/FamixTPackage.trait.st       | 15 ++++
 src/Famix-Traits/FamixTPackageable.trait.st   |  9 ++
 src/Famix-Traits/FamixTParameter.trait.st     | 17 ++++
 src/Famix-Traits/FamixTParameterType.trait.st |  2 +
 .../FamixTParameterizedType.trait.st          |  8 ++
 .../FamixTParameterizedTypeUser.trait.st      |  9 ++
 .../FamixTPreprocessorDefine.trait.st         |  2 +
 .../FamixTPreprocessorIfdef.trait.st          |  2 +
 src/Famix-Traits/FamixTPrimitiveType.trait.st | 19 ++++
 src/Famix-Traits/FamixTReference.trait.st     | 18 ++++
 src/Famix-Traits/FamixTReferenceable.trait.st |  9 ++
 .../FamixTRelativeSourceAnchor.trait.st       | 13 +++
 src/Famix-Traits/FamixTSourceAnchor.trait.st  |  8 ++
 src/Famix-Traits/FamixTSourceEntity.trait.st  | 12 +++
 .../FamixTSourceLanguage.trait.st             |  8 ++
 .../FamixTStructuralEntity.trait.st           | 16 ++++
 src/Famix-Traits/FamixTTemplate.trait.st      | 11 +++
 src/Famix-Traits/FamixTTemplateUser.trait.st  |  9 ++
 src/Famix-Traits/FamixTTrait.trait.st         | 10 +++
 src/Famix-Traits/FamixTTraitUsage.trait.st    | 19 ++++
 src/Famix-Traits/FamixTTraitUser.trait.st     |  9 ++
 src/Famix-Traits/FamixTType.trait.st          | 18 ++++
 src/Famix-Traits/FamixTTypeAlias.trait.st     |  8 ++
 .../FamixTTypedAnnotationInstance.trait.st    |  9 ++
 ...TTypedAnnotationInstanceAttribute.trait.st |  9 ++
 src/Famix-Traits/FamixTTypedEntity.trait.st   |  9 ++
 .../FamixTUnknownSourceLanguage.trait.st      |  9 ++
 .../FamixTUnknownVariable.trait.st            | 17 ++++
 src/Famix-Traits/FamixTWithAccesses.trait.st  |  9 ++
 ...TWithAnnotationInstanceAttributes.trait.st |  9 ++
 .../FamixTWithAnnotationInstances.trait.st    |  9 ++
 .../FamixTWithAnnotationTypes.trait.st        |  9 ++
 .../FamixTWithAttributes.trait.st             |  9 ++
 src/Famix-Traits/FamixTWithClasses.trait.st   | 10 +++
 src/Famix-Traits/FamixTWithComments.trait.st  |  9 ++
 .../FamixTWithCompilationUnits.trait.st       |  9 ++
 ...FamixTWithDereferencedInvocations.trait.st |  9 ++
 .../FamixTWithEnumValues.trait.st             |  9 ++
 .../FamixTWithExceptions.trait.st             | 11 +++
 .../FamixTWithFileIncludes.trait.st           | 10 +++
 src/Famix-Traits/FamixTWithFiles.trait.st     |  9 ++
 src/Famix-Traits/FamixTWithFunctions.trait.st |  9 ++
 .../FamixTWithGlobalVariables.trait.st        |  8 ++
 src/Famix-Traits/FamixTWithHeaders.trait.st   |  9 ++
 .../FamixTWithImplicitVariables.trait.st      |  9 ++
 src/Famix-Traits/FamixTWithImports.trait.st   |  9 ++
 .../FamixTWithInheritances.trait.st           | 11 +++
 .../FamixTWithInvocations.trait.st            |  9 ++
 .../FamixTWithLocalVariables.trait.st         |  9 ++
 src/Famix-Traits/FamixTWithMethods.trait.st   |  9 ++
 .../FamixTWithParameterizedTypeUsers.trait.st |  9 ++
 .../FamixTWithParameterizedTypes.trait.st     |  9 ++
 .../FamixTWithParameters.trait.st             |  9 ++
 .../FamixTWithReferences.trait.st             |  9 ++
 .../FamixTWithSourceLanguages.trait.st        |  9 ++
 .../FamixTWithStatements.trait.st             | 17 ++++
 src/Famix-Traits/FamixTWithTemplates.trait.st |  9 ++
 src/Famix-Traits/FamixTWithTraits.trait.st    |  9 ++
 .../FamixTWithTypeAliases.trait.st            |  9 ++
 src/Famix-Traits/FamixTWithTypes.trait.st     | 10 +++
 .../FDClass1.class.st                         |  9 ++
 .../FDTEntityCreator.trait.st                 |  2 +
 .../FDTrait4.trait.st                         | 14 +++
 .../MooseMSEImporterTestAttribute.class.st    | 19 ++++
 .../MooseMSEImporterTestClass.class.st        | 27 ++++++
 .../MooseMSEImporterTestComment.class.st      | 13 +++
 .../MooseMSEImporterTestInheritance.class.st  | 19 ++++
 .../MooseMSEImporterTestMethod.class.st       | 28 ++++++
 .../MooseMSEImporterTestNamedEntity.class.st  |  7 ++
 .../MooseMSEImporterTestNamespace.class.st    | 17 ++++
 .../MooseMSEImporterTestPackage.class.st      | 20 +++++
 ...MooseMSEImporterTestPrimitiveType.class.st | 19 ++++
 .../MooseMSEImporterTestSourceAnchor.class.st |  9 ++
 ...ooseMSEImporterTestSourceLanguage.class.st |  9 ++
 ...seMSEImporterTestSourceTextAnchor.class.st | 13 +++
 ...MooseMSEImporterTestSourcedEntity.class.st | 13 +++
 ...ooseMSEImporterTestTEntityCreator.trait.st |  2 +
 ...ImporterTestUnknownSourceLanguage.class.st |  9 ++
 src/Moose-Core/MooseTEntityCreator.trait.st   |  2 +
 327 files changed, 4303 insertions(+), 12 deletions(-)

diff --git a/src/Famix-Deprecated/FamixTHasModifiers.trait.st b/src/Famix-Deprecated/FamixTHasModifiers.trait.st
index 31197b94b..26fe95136 100644
--- a/src/Famix-Deprecated/FamixTHasModifiers.trait.st
+++ b/src/Famix-Deprecated/FamixTHasModifiers.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #modifiers Type: String Comment: Generic container for language dependent modifiers.
+
+"
 Trait {
 	#name : #FamixTHasModifiers,
 	#instVars : [
diff --git a/src/Famix-Java-Entities/FamixJavaAccess.class.st b/src/Famix-Java-Entities/FamixJavaAccess.class.st
index 230f1203d..e216ddb7f 100644
--- a/src/Famix-Java-Entities/FamixJavaAccess.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAccess.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #accessor Type: #FamixTWithAccesses Opposite: #accesses Comment: Behavioural entity making the access to the variable. from-side of the association
+### Association target
+- Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isWrite Type: Boolean Comment: Write access
+
+"
 Class {
 	#name : #FamixJavaAccess,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaAnnotationInstance.class.st b/src/Famix-Java-Entities/FamixJavaAnnotationInstance.class.st
index 38b893ea8..14e86d26b 100644
--- a/src/Famix-Java-Entities/FamixJavaAnnotationInstance.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAnnotationInstance.class.st
@@ -1,3 +1,15 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #attributes Type: #FamixTAnnotationInstanceAttribute Opposite: #parentAnnotationInstance Comment: This corresponds to the actual values of the attributes in an AnnotationInstance
+### Other
+- Relation: #annotatedEntity Type: #FamixTWithAnnotationInstances Opposite: #annotationInstances Comment: The NamedEntity on which the annotation occurs.
+- Relation: #annotationType Type: #FamixTAnnotationType Opposite: #instances Comment: Refers to the type of an annotation. (In some languages, Java and C#, an annotation as an explicit type). 
+
+
+"
 Class {
 	#name : #FamixJavaAnnotationInstance,
 	#superclass : #FamixJavaSourcedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaAnnotationInstanceAttribute.class.st b/src/Famix-Java-Entities/FamixJavaAnnotationInstanceAttribute.class.st
index 4b7376e9c..134c4ec59 100644
--- a/src/Famix-Java-Entities/FamixJavaAnnotationInstanceAttribute.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAnnotationInstanceAttribute.class.st
@@ -1,3 +1,18 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentAnnotationInstance Type: #FamixTWithAnnotationInstanceAttributes Opposite: #attributes Comment: The instance of the annotation in which the attribute is used.
+### Other
+- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
+
+## Properties
+======================
+
+- Named: #value Type: String Comment: Actual value of the attribute used in an annotation
+
+"
 Class {
 	#name : #FamixJavaAnnotationInstanceAttribute,
 	#superclass : #FamixJavaSourcedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st b/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st
index 544284ff5..5e8a7855e 100644
--- a/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st
@@ -1,3 +1,27 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+- Relation: #annotationTypesContainer Type: #FamixTWithAnnotationTypes Opposite: #definedAnnotationTypes Comment: Container in which an AnnotationType may reside
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #instances Type: #FamixTTypedAnnotationInstance Opposite: #annotationType Comment: Annotations of this type
+
+## Properties
+======================
+
+- Named: #visibility Type: String Comment: Visibility of the entity
+
+"
 Class {
 	#name : #FamixJavaAnnotationType,
 	#superclass : #FamixJavaType,
diff --git a/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st b/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st
index 19a0023f8..b70a4675b 100644
--- a/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st
@@ -1,3 +1,25 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaAnnotationTypeAttribute,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaAttribute.class.st b/src/Famix-Java-Entities/FamixJavaAttribute.class.st
index 325231da4..3aea33cda 100644
--- a/src/Famix-Java-Entities/FamixJavaAttribute.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAttribute.class.st
@@ -1,3 +1,29 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #visibility Type: String Comment: Visibility of the entity
+- Named: #isTransient Type: Boolean Comment: Entity can be declared transient
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isVolatile Type: Boolean Comment: Entity can be declared volatile
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+
+"
 Class {
 	#name : #FamixJavaAttribute,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaClass.class.st b/src/Famix-Java-Entities/FamixJavaClass.class.st
index a60e2381d..98f30c3f5 100644
--- a/src/Famix-Java-Entities/FamixJavaClass.class.st
+++ b/src/Famix-Java-Entities/FamixJavaClass.class.st
@@ -1,3 +1,38 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+- Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
+### Incomming dependencies
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+## Properties
+======================
+
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #visibility Type: String Comment: Visibility of the entity
+- Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixJavaClass,
 	#superclass : #FamixJavaType,
diff --git a/src/Famix-Java-Entities/FamixJavaComment.class.st b/src/Famix-Java-Entities/FamixJavaComment.class.st
index 5d4bc2d19..f5072a6d6 100644
--- a/src/Famix-Java-Entities/FamixJavaComment.class.st
+++ b/src/Famix-Java-Entities/FamixJavaComment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixJavaComment,
 	#superclass : #FamixJavaSourcedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaContainerEntity.class.st b/src/Famix-Java-Entities/FamixJavaContainerEntity.class.st
index 733ff9c65..5d82eafb0 100644
--- a/src/Famix-Java-Entities/FamixJavaContainerEntity.class.st
+++ b/src/Famix-Java-Entities/FamixJavaContainerEntity.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #definedAnnotationTypes Type: #FamixTAnnotationType Opposite: #annotationTypesContainer Comment: The container in which the AnnotationTypes may be declared
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+
+
+"
 Class {
 	#name : #FamixJavaContainerEntity,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaEntity.class.st b/src/Famix-Java-Entities/FamixJavaEntity.class.st
index 32cbe620f..ce3fa434c 100644
--- a/src/Famix-Java-Entities/FamixJavaEntity.class.st
+++ b/src/Famix-Java-Entities/FamixJavaEntity.class.st
@@ -7,6 +7,8 @@ model := MooseModel new.
 model silentlyAddAll: repo elements.
 model entityStorage forRuntime.
 model
+
+
 "
 Class {
 	#name : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaEnum.class.st b/src/Famix-Java-Entities/FamixJavaEnum.class.st
index c201464cb..f6c579e9a 100644
--- a/src/Famix-Java-Entities/FamixJavaEnum.class.st
+++ b/src/Famix-Java-Entities/FamixJavaEnum.class.st
@@ -1,3 +1,33 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #enumValues Type: #FamixTEnumValue Opposite: #parentEnum
+### Outgoing dependencies
+- Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #visibility Type: String Comment: Visibility of the entity
+
+"
 Class {
 	#name : #FamixJavaEnum,
 	#superclass : #FamixJavaType,
diff --git a/src/Famix-Java-Entities/FamixJavaEnumValue.class.st b/src/Famix-Java-Entities/FamixJavaEnumValue.class.st
index bee6110fe..993a698ac 100644
--- a/src/Famix-Java-Entities/FamixJavaEnumValue.class.st
+++ b/src/Famix-Java-Entities/FamixJavaEnumValue.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentEnum Type: #FamixTWithEnumValues Opposite: #enumValues Comment: The Enum declaring this value. It offers the implementation of belongsTo
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaEnumValue,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaException.class.st b/src/Famix-Java-Entities/FamixJavaException.class.st
index febfcb62a..76fca8d56 100644
--- a/src/Famix-Java-Entities/FamixJavaException.class.st
+++ b/src/Famix-Java-Entities/FamixJavaException.class.st
@@ -1,3 +1,38 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+### Outgoing dependencies
+- Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #throwingEntities Type: #FamixTWithExceptions Opposite: #thrownExceptions
+- Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
+- Relation: #catchingEntities Type: #FamixTWithExceptions Opposite: #caughtExceptions
+- Relation: #declaringEntities Type: #FamixTWithExceptions Opposite: #declaredExceptions
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #visibility Type: String Comment: Visibility of the entity
+
+"
 Class {
 	#name : #FamixJavaException,
 	#superclass : #FamixJavaClass,
diff --git a/src/Famix-Java-Entities/FamixJavaImplementation.class.st b/src/Famix-Java-Entities/FamixJavaImplementation.class.st
index 02beff3fa..ee7e3ce71 100644
--- a/src/Famix-Java-Entities/FamixJavaImplementation.class.st
+++ b/src/Famix-Java-Entities/FamixJavaImplementation.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #implementingClass Type: #FamixTCanImplement Opposite: #interfaceImplementations Comment: Class linked to in this relationship. from-side of the association
+### Association target
+- Relation: #interface Type: #FamixTImplementable Opposite: #implementations Comment: Interface linked to in this relationship. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaImplementation,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st b/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st
index a2c4d0274..592950c64 100644
--- a/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st
+++ b/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithImplicitVariables Opposite: #implicitVariables Comment: The behaviour containing this implicit variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaImplicitVariable,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaImport.class.st b/src/Famix-Java-Entities/FamixJavaImport.class.st
index 5fbd262af..b2e45face 100644
--- a/src/Famix-Java-Entities/FamixJavaImport.class.st
+++ b/src/Famix-Java-Entities/FamixJavaImport.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #importingEntity Type: #FamixTWithImports Opposite: #outgoingImports Comment: Importing entity
+### Association target
+- Relation: #importedEntity Type: #FamixTImportable Opposite: #incomingImports Comment: Imported entity
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaImport,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st b/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st
index dfd6b49d8..2cab490be 100644
--- a/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st
+++ b/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st
@@ -1,3 +1,14 @@
+"
+## Properties
+======================
+
+- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #startPos Type: Number Comment: Start position in the source
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+
+"
 Class {
 	#name : #FamixJavaIndexedFileAnchor,
 	#superclass : #FamixJavaSourceAnchor,
diff --git a/src/Famix-Java-Entities/FamixJavaInheritance.class.st b/src/Famix-Java-Entities/FamixJavaInheritance.class.st
index be21b9298..b1cf98f79 100644
--- a/src/Famix-Java-Entities/FamixJavaInheritance.class.st
+++ b/src/Famix-Java-Entities/FamixJavaInheritance.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #subclass Type: #FamixTWithInheritances Opposite: #superInheritances Comment: Subclass linked to in this relationship. from-side of the association
+### Association target
+- Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaInheritance,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaInterface.class.st b/src/Famix-Java-Entities/FamixJavaInterface.class.st
index b4b7d208e..cde852938 100644
--- a/src/Famix-Java-Entities/FamixJavaInterface.class.st
+++ b/src/Famix-Java-Entities/FamixJavaInterface.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+- Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+## Properties
+======================
+
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #visibility Type: String Comment: Visibility of the entity
+
+"
 Class {
 	#name : #FamixJavaInterface,
 	#superclass : #FamixJavaType,
diff --git a/src/Famix-Java-Entities/FamixJavaInvocation.class.st b/src/Famix-Java-Entities/FamixJavaInvocation.class.st
index cc6c595a0..f3a413af4 100644
--- a/src/Famix-Java-Entities/FamixJavaInvocation.class.st
+++ b/src/Famix-Java-Entities/FamixJavaInvocation.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #sender Type: #FamixTWithInvocations Opposite: #outgoingInvocations Comment: Behavioural entity making the call. from-side of the association
+### Association target
+- Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
+### Other
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaInvocation,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st b/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st
index 924d24b35..35dd94d89 100644
--- a/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st
+++ b/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st
@@ -1,3 +1,25 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithLocalVariables Opposite: #localVariables Comment: Behavioural entity declaring this local variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaLocalVariable,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaMethod.class.st b/src/Famix-Java-Entities/FamixJavaMethod.class.st
index 59df71356..33d628a10 100644
--- a/src/Famix-Java-Entities/FamixJavaMethod.class.st
+++ b/src/Famix-Java-Entities/FamixJavaMethod.class.st
@@ -1,3 +1,42 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+### Incomming dependencies
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredExceptions Type: #FamixTException Opposite: #declaringEntities Comment: The exceptions declared by the method
+- Relation: #thrownExceptions Type: #FamixTException Opposite: #throwingEntities Comment: The exceptions thrown by the method
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #caughtExceptions Type: #FamixTException Opposite: #catchingEntities Comment: The exceptions caught by the method
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isSynchronized Type: Boolean Comment: Entity can be declared synchronized
+- Named: #visibility Type: String Comment: Visibility of the entity
+- Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+
+"
 Class {
 	#name : #FamixJavaMethod,
 	#superclass : #FamixJavaContainerEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st b/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st
index a2d04d0cf..ae141eea1 100644
--- a/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st
+++ b/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st
@@ -1,3 +1,17 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixJavaNamedEntity,
 	#superclass : #FamixJavaSourcedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaPackage.class.st b/src/Famix-Java-Entities/FamixJavaPackage.class.st
index 1f5474896..3b35d46bd 100644
--- a/src/Famix-Java-Entities/FamixJavaPackage.class.st
+++ b/src/Famix-Java-Entities/FamixJavaPackage.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+### Incomming dependencies
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaPackage,
 	#superclass : #FamixJavaContainerEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaParameter.class.st b/src/Famix-Java-Entities/FamixJavaParameter.class.st
index 3de220298..e12f96b89 100644
--- a/src/Famix-Java-Entities/FamixJavaParameter.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameter.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithParameters Opposite: #parameters Comment: Behavioural entity containing this parameter. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+
+"
 Class {
 	#name : #FamixJavaParameter,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaParameterizableClass.class.st b/src/Famix-Java-Entities/FamixJavaParameterizableClass.class.st
index e1563a1b2..0b17d9717 100644
--- a/src/Famix-Java-Entities/FamixJavaParameterizableClass.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameterizableClass.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #parameterizedTypes Type: #FamixTParameterizedType Opposite: #parameterizableClass
+
+
+"
 Class {
 	#name : #FamixJavaParameterizableClass,
 	#superclass : #FamixJavaClass,
diff --git a/src/Famix-Java-Entities/FamixJavaParameterizableException.class.st b/src/Famix-Java-Entities/FamixJavaParameterizableException.class.st
index 738231d6c..dde60a6c9 100644
--- a/src/Famix-Java-Entities/FamixJavaParameterizableException.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameterizableException.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #parameterizedTypes Type: #FamixTParameterizedType Opposite: #parameterizableClass
+
+
+"
 Class {
 	#name : #FamixJavaParameterizableException,
 	#superclass : #FamixJavaException,
diff --git a/src/Famix-Java-Entities/FamixJavaParameterizableInterface.class.st b/src/Famix-Java-Entities/FamixJavaParameterizableInterface.class.st
index 6f150384c..220738be0 100644
--- a/src/Famix-Java-Entities/FamixJavaParameterizableInterface.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameterizableInterface.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #parameterizedTypes Type: #FamixTParameterizedType Opposite: #parameterizableClass
+
+
+"
 Class {
 	#name : #FamixJavaParameterizableInterface,
 	#superclass : #FamixJavaInterface,
diff --git a/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st b/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st
index c3bcbf33b..b1e88bf5d 100644
--- a/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st
@@ -1,3 +1,19 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #arguments Type: #FamixTParameterizedTypeUser Opposite: #argumentsInParameterizedTypes
+- Relation: #parameterizableClass Type: #FamixTWithParameterizedTypes Opposite: #parameterizedTypes Comment: Base type of this parameterized type.
+
+
+"
 Class {
 	#name : #FamixJavaParameterizedType,
 	#superclass : #FamixJavaType,
diff --git a/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st b/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st
index 0723a114b..7e115239c 100644
--- a/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaPrimitiveType,
 	#superclass : #FamixJavaType,
diff --git a/src/Famix-Java-Entities/FamixJavaReference.class.st b/src/Famix-Java-Entities/FamixJavaReference.class.st
index a8ee2a5a5..a1c9e9820 100644
--- a/src/Famix-Java-Entities/FamixJavaReference.class.st
+++ b/src/Famix-Java-Entities/FamixJavaReference.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #referencer Type: #FamixTWithReferences Opposite: #outgoingReferences Comment: Source entity making the reference. from-side of the association
+### Association target
+- Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaReference,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaSourceAnchor.class.st b/src/Famix-Java-Entities/FamixJavaSourceAnchor.class.st
index 0fcf1a6b9..8f9473ea7 100644
--- a/src/Famix-Java-Entities/FamixJavaSourceAnchor.class.st
+++ b/src/Famix-Java-Entities/FamixJavaSourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixJavaSourceAnchor,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaSourceLanguage.class.st b/src/Famix-Java-Entities/FamixJavaSourceLanguage.class.st
index ec8dfe062..b361a4bca 100644
--- a/src/Famix-Java-Entities/FamixJavaSourceLanguage.class.st
+++ b/src/Famix-Java-Entities/FamixJavaSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixJavaSourceLanguage,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaSourceTextAnchor.class.st b/src/Famix-Java-Entities/FamixJavaSourceTextAnchor.class.st
index 4f0cae9ee..e317e90df 100644
--- a/src/Famix-Java-Entities/FamixJavaSourceTextAnchor.class.st
+++ b/src/Famix-Java-Entities/FamixJavaSourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixJavaSourceTextAnchor,
 	#superclass : #FamixJavaSourceAnchor,
diff --git a/src/Famix-Java-Entities/FamixJavaSourcedEntity.class.st b/src/Famix-Java-Entities/FamixJavaSourcedEntity.class.st
index 144e1424c..56b1a5c32 100644
--- a/src/Famix-Java-Entities/FamixJavaSourcedEntity.class.st
+++ b/src/Famix-Java-Entities/FamixJavaSourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaSourcedEntity,
 	#superclass : #FamixJavaEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaTCanBeSynchronized.trait.st b/src/Famix-Java-Entities/FamixJavaTCanBeSynchronized.trait.st
index f2c28225c..7ead2183e 100644
--- a/src/Famix-Java-Entities/FamixJavaTCanBeSynchronized.trait.st
+++ b/src/Famix-Java-Entities/FamixJavaTCanBeSynchronized.trait.st
@@ -11,6 +11,12 @@ public class SynchronizedCounter {
     }
 }
 ```
+
+## Properties
+======================
+
+- Named: #isSynchronized Type: Boolean Comment: Entity can be declared synchronized
+
 "
 Trait {
 	#name : #FamixJavaTCanBeSynchronized,
diff --git a/src/Famix-Java-Entities/FamixJavaTCanBeTransient.trait.st b/src/Famix-Java-Entities/FamixJavaTCanBeTransient.trait.st
index 09375ddd8..2d8f7980b 100644
--- a/src/Famix-Java-Entities/FamixJavaTCanBeTransient.trait.st
+++ b/src/Famix-Java-Entities/FamixJavaTCanBeTransient.trait.st
@@ -7,6 +7,12 @@ public class Student implements Serializable{
  transient int age; //Now it will not be serialized  
 }  
 ```
+
+## Properties
+======================
+
+- Named: #isTransient Type: Boolean Comment: Entity can be declared transient
+
 "
 Trait {
 	#name : #FamixJavaTCanBeTransient,
diff --git a/src/Famix-Java-Entities/FamixJavaTCanBeVolatile.trait.st b/src/Famix-Java-Entities/FamixJavaTCanBeVolatile.trait.st
index 35b9bae6b..5fbab0434 100644
--- a/src/Famix-Java-Entities/FamixJavaTCanBeVolatile.trait.st
+++ b/src/Famix-Java-Entities/FamixJavaTCanBeVolatile.trait.st
@@ -7,6 +7,12 @@ public class SharedObject {
     public volatile int counter = 0;
 }
 ```
+
+## Properties
+======================
+
+- Named: #isVolatile Type: Boolean Comment: Entity can be declared volatile
+
 "
 Trait {
 	#name : #FamixJavaTCanBeVolatile,
diff --git a/src/Famix-Java-Entities/FamixJavaTEntityCreator.trait.st b/src/Famix-Java-Entities/FamixJavaTEntityCreator.trait.st
index a61da05d1..7ff465405 100644
--- a/src/Famix-Java-Entities/FamixJavaTEntityCreator.trait.st
+++ b/src/Famix-Java-Entities/FamixJavaTEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixJavaTEntityCreator,
diff --git a/src/Famix-Java-Entities/FamixJavaTWithInterfaces.trait.st b/src/Famix-Java-Entities/FamixJavaTWithInterfaces.trait.st
index 970b3412d..f6d7eac09 100644
--- a/src/Famix-Java-Entities/FamixJavaTWithInterfaces.trait.st
+++ b/src/Famix-Java-Entities/FamixJavaTWithInterfaces.trait.st
@@ -1,5 +1,14 @@
 "
 I can contain interfaces (Packages, Methods, Classes...)
+
+## Relations
+======================
+
+### Children
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+
+
 "
 Trait {
 	#name : #FamixJavaTWithInterfaces,
diff --git a/src/Famix-Java-Entities/FamixJavaType.class.st b/src/Famix-Java-Entities/FamixJavaType.class.st
index 9abdd769e..854584b1e 100644
--- a/src/Famix-Java-Entities/FamixJavaType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaType.class.st
@@ -1,3 +1,25 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #argumentsInParameterizedTypes Type: #FamixTWithParameterizedTypeUsers Opposite: #arguments
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaType,
 	#superclass : #FamixJavaContainerEntity,
diff --git a/src/Famix-Java-Entities/FamixJavaUnknownSourceLanguage.class.st b/src/Famix-Java-Entities/FamixJavaUnknownSourceLanguage.class.st
index f7d235560..f849670ae 100644
--- a/src/Famix-Java-Entities/FamixJavaUnknownSourceLanguage.class.st
+++ b/src/Famix-Java-Entities/FamixJavaUnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixJavaUnknownSourceLanguage,
 	#superclass : #FamixJavaSourceLanguage,
diff --git a/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st b/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st
index d43d9da88..32c69837e 100644
--- a/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st
+++ b/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st
@@ -1,3 +1,21 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixJavaUnknownVariable,
 	#superclass : #FamixJavaNamedEntity,
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
index 6d87dce0e..26ea43a5c 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
@@ -71,6 +71,20 @@ FmxMBBehavior >> allNavigationGroups [
 	^ self navigationGroups , (self relations flatCollect: [ :relation | relation side navigationGroups ])
 ]
 
+{ #category : #accessing }
+FmxMBBehavior >> allProperties [
+	"Return my properties and the properties from my traits."
+
+	^ (self allTransitiveTraits flatCollect: [ :trait | trait properties ]) , self properties
+]
+
+{ #category : #accessing }
+FmxMBBehavior >> allRelations [
+	"Return my relations and the relations from my traits."
+
+	^ (self allTransitiveTraits flatCollect: [ :trait | trait relations ]) , self relations
+]
+
 { #category : #accessing }
 FmxMBBehavior >> allTraitNames [
 	^ (self allLocalTraits collect: #fullName) sorted
@@ -99,6 +113,82 @@ FmxMBBehavior >> classGeneralization: anObject [
 	^ self subclassResponsibility
 ]
 
+{ #category : #accessing }
+FmxMBBehavior >> commentWithRelations [
+	"It is sometimes hard to find our way in all the methods and relations of a moose entity. To help with this I am adding informations in the class comments about the different kind of relations of the model."
+
+	^ String streamContents: [ :aStream |
+		  aStream nextPutAll: self comment.
+		  self comment ifNotEmpty: [
+			  aStream
+				  lf;
+				  lf ].
+		  self allRelations ifNotEmpty: [ :rels |
+			  aStream
+				  nextPutAll: '## Relations
+======================';
+				  lf;
+				  lf.
+			  OrderedDictionary new
+				  at: 'Parents' put: [ :relation | relation side isContainer ];
+				  at: 'Children' put: [ :relation | relation oppositeSide isContainer ];
+				  at: 'Outgoing dependencies' put: [ :relation | relation oppositeSide isSource ];
+				  at: 'Incoming dependencies' put: [ :relation | relation oppositeSide isTarget ];
+				  at: 'Association source' put: [ :relation | relation side isSource ];
+				  at: 'Association target' put: [ :relation | relation side isTarget ];
+				  at: 'Other' put: [ :relation |
+					  relation side isTarget not and: [
+							  relation side isSource not and: [
+									  relation side isContainer not and: [
+											  relation oppositeSide isTarget not and: [ relation oppositeSide isSource not and: [ relation oppositeSide isContainer not ] ] ] ] ] ];
+				  keysAndValuesDo: [ :relationKind :selectionBlock |
+					  (rels select: selectionBlock) ifNotEmpty: [ :parents |
+							  aStream
+								  nextPutAll: '### ';
+								  nextPutAll: relationKind;
+								  lf.
+
+							  parents do: [ :parent |
+								  | strategy |
+								  strategy := parent side generationStrategy.
+
+								  aStream
+									  nextPutAll: '- Relation: #';
+									  nextPutAll: strategy relationSide name;
+									  nextPutAll: ' Type: #';
+									  nextPutAll: strategy relationSide oppositeType;
+									  nextPutAll: ' Opposite: #';
+									  nextPutAll: strategy relationSide oppositeName.
+
+								  strategy relationSide comment ifNotEmpty: [ :com |
+									  aStream
+										  nextPutAll: ' Comment: ';
+										  nextPutAll: com ].
+
+								  aStream lf ] ] ].
+			  aStream lf ].
+
+		  (self allProperties reject: [ :p | p isRelation ]) ifNotEmpty: [ :props |
+			  aStream
+				  nextPutAll: '## Properties
+======================';
+				  lf;
+				  lf.
+
+			  props do: [ :property |
+				  aStream
+					  nextPutAll: '- Named: #';
+					  nextPutAll: property name;
+					  nextPutAll: ' Type: ';
+					  nextPutAll: property propertyType.
+
+				  property comment ifNotEmpty: [ :com |
+					  aStream
+						  nextPutAll: ' Comment: ';
+						  nextPutAll: com ].
+				  aStream lf ] ] ]
+]
+
 { #category : #'settings - default' }
 FmxMBBehavior >> defaultSuperclass [
 	^ self builder environment basicSuperclass
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBClass.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBClass.class.st
index 8413a1420..8b629cfff 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBClass.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBClass.class.st
@@ -65,7 +65,7 @@ FmxMBClass >> generate [
 		          overwrite: true.
 
 	aClass tagWith: self tag.
-	self builder environment setComment: self comment for: aClass.
+	self builder environment setComment: self commentWithRelations for: aClass.
 
 	self realClass: aClass.
 
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBProperty.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBProperty.class.st
index 4b70b985d..47ad7cf5b 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBProperty.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBProperty.class.st
@@ -50,6 +50,12 @@ FmxMBProperty >> isContainer [
 	^ false
 ]
 
+{ #category : #accessing }
+FmxMBProperty >> isRelation [
+
+	^ false
+]
+
 { #category : #accessing }
 FmxMBProperty >> name: aString [
 	(self builder reservedKeywords includes: aString) ifTrue: [ FmxMBPropertyNameIsReserved signal ].
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBRelationSide.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBRelationSide.class.st
index fb825eace..c252dab06 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBRelationSide.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBRelationSide.class.st
@@ -149,6 +149,11 @@ FmxMBRelationSide >> isOne [
 	^ self cardinality = #one
 ]
 
+{ #category : #testing }
+FmxMBRelationSide >> isRelation [
+	^ true
+]
+
 { #category : #testing }
 FmxMBRelationSide >> isRemote [
 
@@ -343,3 +348,9 @@ FmxMBRelationSide >> trait: anObject [
 	trait := anObject.
 	trait addRelationSide: self
 ]
+
+{ #category : #accessing }
+FmxMBRelationSide >> type [
+
+	^ (self builder configuration prefix , self relatedEntityName) asSymbol
+]
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBTrait.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBTrait.class.st
index d4f75ef12..afefe215c 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBTrait.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBTrait.class.st
@@ -62,7 +62,7 @@ FmxMBTrait >> generate [
 		          overwrite: true.
 
 	aTrait tagWith: self tag.
-	self builder environment setComment: self comment for: aTrait.
+	self builder environment setComment: self commentWithRelations for: aTrait.
 
 	self realClass: aTrait.
 
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAccess.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAccess.class.st
index 10b44243a..98deb8bcf 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAccess.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAccess.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #accessor Type: #FamixTWithAccesses Opposite: #accesses Comment: Behavioural entity making the access to the variable. from-side of the association
+### Association target
+- Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isWrite Type: Boolean Comment: Write access
+
+"
 Class {
 	#name : #FamixStAccess,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstance.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstance.class.st
index 058d057a8..2c3aad070 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstance.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstance.class.st
@@ -1,3 +1,15 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #attributes Type: #FamixTAnnotationInstanceAttribute Opposite: #parentAnnotationInstance Comment: This corresponds to the actual values of the attributes in an AnnotationInstance
+### Other
+- Relation: #annotatedEntity Type: #FamixTWithAnnotationInstances Opposite: #annotationInstances Comment: The NamedEntity on which the annotation occurs.
+- Relation: #annotationType Type: #FamixTAnnotationType Opposite: #instances Comment: Refers to the type of an annotation. (In some languages, Java and C#, an annotation as an explicit type). 
+
+
+"
 Class {
 	#name : #FamixStAnnotationInstance,
 	#superclass : #FamixStSourcedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstanceAttribute.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstanceAttribute.class.st
index b89a8f954..42158ac23 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstanceAttribute.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationInstanceAttribute.class.st
@@ -1,3 +1,18 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentAnnotationInstance Type: #FamixTWithAnnotationInstanceAttributes Opposite: #attributes Comment: The instance of the annotation in which the attribute is used.
+### Other
+- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
+
+## Properties
+======================
+
+- Named: #value Type: String Comment: Actual value of the attribute used in an annotation
+
+"
 Class {
 	#name : #FamixStAnnotationInstanceAttribute,
 	#superclass : #FamixStSourcedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationType.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationType.class.st
index 6642ee25a..90ec8c1f1 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationType.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationType.class.st
@@ -1,3 +1,17 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #annotationTypesContainer Type: #FamixTWithAnnotationTypes Opposite: #definedAnnotationTypes Comment: Container in which an AnnotationType may reside
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Other
+- Relation: #instances Type: #FamixTTypedAnnotationInstance Opposite: #annotationType Comment: Annotations of this type
+
+
+"
 Class {
 	#name : #FamixStAnnotationType,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st
index 200bb94a5..b165229d6 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
+- Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStAnnotationTypeAttribute,
 	#superclass : #FamixStSourcedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st
index be05b5405..bfc449abd 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+
+"
 Class {
 	#name : #FamixStAttribute,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
index 5ab75ad74..6913643e0 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
@@ -1,3 +1,34 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+
+"
 Class {
 	#name : #FamixStClass,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStComment.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStComment.class.st
index f625808c0..056b699d8 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStComment.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStComment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixStComment,
 	#superclass : #FamixStSourcedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st
index c4fa24df1..cd9f94611 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentScope Type: #FamixTWithGlobalVariables Opposite: #globalVariables Comment: Scope declaring the global variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStGlobalVariable,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
index ded815c27..120887408 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithImplicitVariables Opposite: #implicitVariables Comment: The behaviour containing this implicit variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStImplicitVariable,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStInheritance.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStInheritance.class.st
index 5011e62cb..89de316cd 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStInheritance.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStInheritance.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #subclass Type: #FamixTWithInheritances Opposite: #superInheritances Comment: Subclass linked to in this relationship. from-side of the association
+### Association target
+- Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStInheritance,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st
index e04c956c0..b7c129634 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #sender Type: #FamixTWithInvocations Opposite: #outgoingInvocations Comment: Behavioural entity making the call. from-side of the association
+### Association target
+- Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStInvocation,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
index 8f1a907bc..bfcde0b7f 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithLocalVariables Opposite: #localVariables Comment: Behavioural entity declaring this local variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStLocalVariable,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st
index 9b424119f..fe79b9649 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st
@@ -1,3 +1,39 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #definedAnnotationTypes Type: #FamixTAnnotationType Opposite: #annotationTypesContainer Comment: The container in which the AnnotationTypes may be declared
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
+
+## Properties
+======================
+
+- Named: #protocol Type: String Comment: Protocol of the method
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStMethod,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStNamedEntity.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStNamedEntity.class.st
index cd33ac674..9381307a5 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStNamedEntity.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStNamedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixStNamedEntity,
 	#superclass : #FamixStSourcedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st
index e8532ca12..3a4b1a3c3 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #globalVariables Type: #FamixTGlobalVariable Opposite: #parentScope Comment: Global variables defined in the scope, if any.
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStNamespace,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st
index 737adda5a..cb42533e2 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+- Relation: #globalVariables Type: #FamixTGlobalVariable Opposite: #parentScope Comment: Global variables defined in the scope, if any.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStPackage,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
index 551f20b8c..6375e604e 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithParameters Opposite: #parameters Comment: Behavioural entity containing this parameter. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStParameter,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStPharoEntitySourceAnchor.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStPharoEntitySourceAnchor.class.st
index 77b09d873..21e11121e 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStPharoEntitySourceAnchor.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStPharoEntitySourceAnchor.class.st
@@ -1,16 +1,10 @@
 "
-Description
---------------------
+## Relations
+======================
 
-A Pharo entity source anchor is an anchor poiting to a Pharo entity to get the source code.
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
 
-It uses a WeakSlot to let the entity be garbage collected in case we unload the code.
- 
-Internal Representation and Key Implementation Points.
---------------------
-
-    Instance Variables
-	pharoEntity:		<aClassOrCompiledMethod>		The Pharo class or compiled method holding the source code.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStReference.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStReference.class.st
index 364de2218..38dc3920d 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStReference.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStReference.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #referencer Type: #FamixTWithReferences Opposite: #outgoingReferences Comment: Source entity making the reference. from-side of the association
+### Association target
+- Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStReference,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStSourceAnchor.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStSourceAnchor.class.st
index 6e5d3afd5..3f3ebfdbe 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStSourceAnchor.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStSourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixStSourceAnchor,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStSourceLanguage.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStSourceLanguage.class.st
index f50307a4e..f446de602 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStSourceLanguage.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixStSourceLanguage,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStSourceTextAnchor.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStSourceTextAnchor.class.st
index 2aa0bdce8..a5a80d155 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStSourceTextAnchor.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStSourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixStSourceTextAnchor,
 	#superclass : #FamixStSourceAnchor,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStSourcedEntity.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStSourcedEntity.class.st
index 6bccc821c..2b55392b8 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStSourcedEntity.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStSourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStSourcedEntity,
 	#superclass : #FamixStEntity,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStTEntityCreator.trait.st b/src/Famix-PharoSmalltalk-Entities/FamixStTEntityCreator.trait.st
index c179afc95..b4b23b5df 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStTEntityCreator.trait.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStTEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixStTEntityCreator,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStUnknownSourceLanguage.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStUnknownSourceLanguage.class.st
index 9325380b8..834ed1a37 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStUnknownSourceLanguage.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStUnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixStUnknownSourceLanguage,
 	#superclass : #FamixStSourceLanguage,
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st
index 60b66c10e..32599e350 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st
@@ -1,3 +1,21 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixStUnknownVariable,
 	#superclass : #FamixStNamedEntity,
diff --git a/src/Famix-Test1-Entities/FamixTest1Association.class.st b/src/Famix-Test1-Entities/FamixTest1Association.class.st
index 328155267..637f4625c 100644
--- a/src/Famix-Test1-Entities/FamixTest1Association.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Association.class.st
@@ -1,3 +1,18 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest1Association,
 	#superclass : #FamixTest1Entity,
diff --git a/src/Famix-Test1-Entities/FamixTest1Attribute.class.st b/src/Famix-Test1-Entities/FamixTest1Attribute.class.st
index 0039447a9..7b781a2fe 100644
--- a/src/Famix-Test1-Entities/FamixTest1Attribute.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Attribute.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest1Attribute,
 	#superclass : #FamixTest1NamedEntity,
diff --git a/src/Famix-Test1-Entities/FamixTest1Class.class.st b/src/Famix-Test1-Entities/FamixTest1Class.class.st
index 459c0ea17..04d4003ff 100644
--- a/src/Famix-Test1-Entities/FamixTest1Class.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Class.class.st
@@ -1,5 +1,33 @@
 "
 This a comment for the Class entity
+
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Class {
 	#name : #FamixTest1Class,
diff --git a/src/Famix-Test1-Entities/FamixTest1Comment.class.st b/src/Famix-Test1-Entities/FamixTest1Comment.class.st
index b9d48caab..75692fe52 100644
--- a/src/Famix-Test1-Entities/FamixTest1Comment.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTest1Comment,
 	#superclass : #FamixTest1SourcedEntity,
diff --git a/src/Famix-Test1-Entities/FamixTest1File.class.st b/src/Famix-Test1-Entities/FamixTest1File.class.st
index 1612dbeb7..4d4c92f7a 100644
--- a/src/Famix-Test1-Entities/FamixTest1File.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1File.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+### Other
+- Relation: #entities Type: #FamixTWithFiles Opposite: #containerFiles Comment: List of entities defined in the file
+
+
+"
 Class {
 	#name : #FamixTest1File,
 	#superclass : #FamixTest1NamedEntity,
diff --git a/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st
index 0e2730612..35a6f970d 100644
--- a/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Properties
+======================
+
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #startColumn Type: Number Comment: Number of the start column
+- Named: #startLine Type: Number Comment: Number of the start line
+- Named: #endLine Type: Number Comment: Number of the end line
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endColumn Type: Number Comment: Number of the end column
+
+"
 Class {
 	#name : #FamixTest1FileAnchor,
 	#superclass : #FamixTest1SourceAnchor,
diff --git a/src/Famix-Test1-Entities/FamixTest1Folder.class.st b/src/Famix-Test1-Entities/FamixTest1Folder.class.st
index ec9296608..7578fefea 100644
--- a/src/Famix-Test1-Entities/FamixTest1Folder.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Folder.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+### Children
+- Relation: #childrenFileSystemEntities Type: #FamixTFileSystemEntity Opposite: #parentFolder Comment: List of entities contained in this folder.
+
+
+"
 Class {
 	#name : #FamixTest1Folder,
 	#superclass : #FamixTest1NamedEntity,
diff --git a/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st
index 92951d745..0286fad22 100644
--- a/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st
@@ -1,3 +1,14 @@
+"
+## Properties
+======================
+
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #startPos Type: Number Comment: Start position in the source
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+
+"
 Class {
 	#name : #FamixTest1IndexedFileAnchor,
 	#superclass : #FamixTest1SourceAnchor,
diff --git a/src/Famix-Test1-Entities/FamixTest1Method.class.st b/src/Famix-Test1-Entities/FamixTest1Method.class.st
index 2b2aaf747..d39ecf821 100644
--- a/src/Famix-Test1-Entities/FamixTest1Method.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Method.class.st
@@ -1,3 +1,35 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest1Method,
 	#superclass : #FamixTest1NamedEntity,
diff --git a/src/Famix-Test1-Entities/FamixTest1Model.class.st b/src/Famix-Test1-Entities/FamixTest1Model.class.st
index 8c89bf5c6..acf41bd90 100644
--- a/src/Famix-Test1-Entities/FamixTest1Model.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Model.class.st
@@ -1,5 +1,11 @@
 "
 This is a the comment of the model class
+
+## Properties
+======================
+
+- Named: #modelHasProperties Type: Object
+
 "
 Class {
 	#name : #FamixTest1Model,
diff --git a/src/Famix-Test1-Entities/FamixTest1MultipleFileAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1MultipleFileAnchor.class.st
index 67247e256..1d450528b 100644
--- a/src/Famix-Test1-Entities/FamixTest1MultipleFileAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1MultipleFileAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #fileAnchors Type: FamixTFileAnchor Comment: All source code definition files
+
+"
 Class {
 	#name : #FamixTest1MultipleFileAnchor,
 	#superclass : #FamixTest1SourceAnchor,
diff --git a/src/Famix-Test1-Entities/FamixTest1NamedEntity.class.st b/src/Famix-Test1-Entities/FamixTest1NamedEntity.class.st
index 39e316935..5cea64d2a 100644
--- a/src/Famix-Test1-Entities/FamixTest1NamedEntity.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest1NamedEntity,
 	#superclass : #FamixTest1Entity,
diff --git a/src/Famix-Test1-Entities/FamixTest1SourceAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1SourceAnchor.class.st
index f6e4a520c..deb304291 100644
--- a/src/Famix-Test1-Entities/FamixTest1SourceAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTest1SourceAnchor,
 	#superclass : #FamixTest1Entity,
diff --git a/src/Famix-Test1-Entities/FamixTest1SourceLanguage.class.st b/src/Famix-Test1-Entities/FamixTest1SourceLanguage.class.st
index 433ba1b0d..7438243b5 100644
--- a/src/Famix-Test1-Entities/FamixTest1SourceLanguage.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest1SourceLanguage,
 	#superclass : #FamixTest1Entity,
diff --git a/src/Famix-Test1-Entities/FamixTest1SourceTextAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1SourceTextAnchor.class.st
index 2494cf89c..14741f43e 100644
--- a/src/Famix-Test1-Entities/FamixTest1SourceTextAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTest1SourceTextAnchor,
 	#superclass : #FamixTest1SourceAnchor,
diff --git a/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st b/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st
index 006cc16cf..5978afda2 100644
--- a/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st
@@ -1,3 +1,18 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #containerFiles Type: #FamixTFile Opposite: #entities Comment: List of files containing the entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest1SourcedEntity,
 	#superclass : #FamixTest1Entity,
diff --git a/src/Famix-Test1-Entities/FamixTest1TCanBeClassSide.trait.st b/src/Famix-Test1-Entities/FamixTest1TCanBeClassSide.trait.st
index c13af700e..c2d08ae0a 100644
--- a/src/Famix-Test1-Entities/FamixTest1TCanBeClassSide.trait.st
+++ b/src/Famix-Test1-Entities/FamixTest1TCanBeClassSide.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+
+"
 Trait {
 	#name : #FamixTest1TCanBeClassSide,
 	#instVars : [
diff --git a/src/Famix-Test1-Entities/FamixTest1TEntityCreator.trait.st b/src/Famix-Test1-Entities/FamixTest1TEntityCreator.trait.st
index 10ebf3f69..468a84309 100644
--- a/src/Famix-Test1-Entities/FamixTest1TEntityCreator.trait.st
+++ b/src/Famix-Test1-Entities/FamixTest1TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest1TEntityCreator,
diff --git a/src/Famix-Test1-Entities/FamixTest1UnknownSourceLanguage.class.st b/src/Famix-Test1-Entities/FamixTest1UnknownSourceLanguage.class.st
index 9d8cf32dd..f2b2366ea 100644
--- a/src/Famix-Test1-Entities/FamixTest1UnknownSourceLanguage.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest1UnknownSourceLanguage,
 	#superclass : #FamixTest1SourceLanguage,
diff --git a/src/Famix-Test2-Entities/FamixTest2Class.class.st b/src/Famix-Test2-Entities/FamixTest2Class.class.st
index f11bb0ffd..8f855fc2a 100644
--- a/src/Famix-Test2-Entities/FamixTest2Class.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2Class.class.st
@@ -1,3 +1,30 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest2Class,
 	#superclass : #FamixTest2NamedEntity,
diff --git a/src/Famix-Test2-Entities/FamixTest2Comment.class.st b/src/Famix-Test2-Entities/FamixTest2Comment.class.st
index ea9be979f..378e78a83 100644
--- a/src/Famix-Test2-Entities/FamixTest2Comment.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTest2Comment,
 	#superclass : #FamixTest2SourcedEntity,
diff --git a/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st b/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st
index 7b1eb4127..6529cabd9 100644
--- a/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #subclass Type: #FamixTWithInheritances Opposite: #superInheritances Comment: Subclass linked to in this relationship. from-side of the association
+### Association target
+- Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
+### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest2Inheritance,
 	#superclass : #FamixTest2Entity,
diff --git a/src/Famix-Test2-Entities/FamixTest2NamedEntity.class.st b/src/Famix-Test2-Entities/FamixTest2NamedEntity.class.st
index 6c4cb9966..8249f8815 100644
--- a/src/Famix-Test2-Entities/FamixTest2NamedEntity.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest2NamedEntity,
 	#superclass : #FamixTest2Entity,
diff --git a/src/Famix-Test2-Entities/FamixTest2SourceAnchor.class.st b/src/Famix-Test2-Entities/FamixTest2SourceAnchor.class.st
index b4ad3aa82..e2a08d88c 100644
--- a/src/Famix-Test2-Entities/FamixTest2SourceAnchor.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTest2SourceAnchor,
 	#superclass : #FamixTest2Entity,
diff --git a/src/Famix-Test2-Entities/FamixTest2SourceLanguage.class.st b/src/Famix-Test2-Entities/FamixTest2SourceLanguage.class.st
index edfbde40d..8c8403620 100644
--- a/src/Famix-Test2-Entities/FamixTest2SourceLanguage.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest2SourceLanguage,
 	#superclass : #FamixTest2Entity,
diff --git a/src/Famix-Test2-Entities/FamixTest2SourceTextAnchor.class.st b/src/Famix-Test2-Entities/FamixTest2SourceTextAnchor.class.st
index 70a4ee580..5b7ea3685 100644
--- a/src/Famix-Test2-Entities/FamixTest2SourceTextAnchor.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTest2SourceTextAnchor,
 	#superclass : #FamixTest2SourceAnchor,
diff --git a/src/Famix-Test2-Entities/FamixTest2SourcedEntity.class.st b/src/Famix-Test2-Entities/FamixTest2SourcedEntity.class.st
index 9d3ddafc5..87600357e 100644
--- a/src/Famix-Test2-Entities/FamixTest2SourcedEntity.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2SourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest2SourcedEntity,
 	#superclass : #FamixTest2Entity,
diff --git a/src/Famix-Test2-Entities/FamixTest2TEntityCreator.trait.st b/src/Famix-Test2-Entities/FamixTest2TEntityCreator.trait.st
index 04da2f42f..1a315346b 100644
--- a/src/Famix-Test2-Entities/FamixTest2TEntityCreator.trait.st
+++ b/src/Famix-Test2-Entities/FamixTest2TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest2TEntityCreator,
diff --git a/src/Famix-Test2-Entities/FamixTest2UnknownSourceLanguage.class.st b/src/Famix-Test2-Entities/FamixTest2UnknownSourceLanguage.class.st
index 46aa52590..0d1e7fdb8 100644
--- a/src/Famix-Test2-Entities/FamixTest2UnknownSourceLanguage.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest2UnknownSourceLanguage,
 	#superclass : #FamixTest2SourceLanguage,
diff --git a/src/Famix-Test3-Entities/FamixTest3Access.class.st b/src/Famix-Test3-Entities/FamixTest3Access.class.st
index 52415813a..ba4666e9b 100644
--- a/src/Famix-Test3-Entities/FamixTest3Access.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Access.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #accessor Type: #FamixTWithAccesses Opposite: #accesses Comment: Behavioural entity making the access to the variable. from-side of the association
+### Association target
+- Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isWrite Type: Boolean Comment: Write access
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest3Access,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3Attribute.class.st b/src/Famix-Test3-Entities/FamixTest3Attribute.class.st
index 837fdc21e..dfba52e43 100644
--- a/src/Famix-Test3-Entities/FamixTest3Attribute.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Attribute.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest3Attribute,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3Class.class.st b/src/Famix-Test3-Entities/FamixTest3Class.class.st
index 5a0a5a68a..d40259ff9 100644
--- a/src/Famix-Test3-Entities/FamixTest3Class.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Class.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest3Class,
 	#superclass : #FamixTest3Type,
diff --git a/src/Famix-Test3-Entities/FamixTest3Comment.class.st b/src/Famix-Test3-Entities/FamixTest3Comment.class.st
index 8b2c6609b..028e86489 100644
--- a/src/Famix-Test3-Entities/FamixTest3Comment.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTest3Comment,
 	#superclass : #FamixTest3SourcedEntity,
diff --git a/src/Famix-Test3-Entities/FamixTest3Invocation.class.st b/src/Famix-Test3-Entities/FamixTest3Invocation.class.st
index 98163c3f7..7bc54777a 100644
--- a/src/Famix-Test3-Entities/FamixTest3Invocation.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Invocation.class.st
@@ -1,3 +1,24 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #sender Type: #FamixTWithInvocations Opposite: #outgoingInvocations Comment: Behavioural entity making the call. from-side of the association
+### Association target
+- Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
+### Other
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
+
+"
 Class {
 	#name : #FamixTest3Invocation,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3Method.class.st b/src/Famix-Test3-Entities/FamixTest3Method.class.st
index 79ad0835c..db60c6bb9 100644
--- a/src/Famix-Test3-Entities/FamixTest3Method.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Method.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+### Outgoing dependencies
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest3Method,
 	#superclass : #FamixTest3NamedEntity,
diff --git a/src/Famix-Test3-Entities/FamixTest3NamedEntity.class.st b/src/Famix-Test3-Entities/FamixTest3NamedEntity.class.st
index 2eb8b9253..9fce442f1 100644
--- a/src/Famix-Test3-Entities/FamixTest3NamedEntity.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest3NamedEntity,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3Package.class.st b/src/Famix-Test3-Entities/FamixTest3Package.class.st
index 0881c47f6..9c7950ecf 100644
--- a/src/Famix-Test3-Entities/FamixTest3Package.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Package.class.st
@@ -1,3 +1,19 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest3Package,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st b/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st
index 9ef644175..af9f10b5b 100644
--- a/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st
@@ -1,3 +1,15 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+
+
+"
 Class {
 	#name : #FamixTest3PrimitiveType,
 	#superclass : #FamixTest3Type,
diff --git a/src/Famix-Test3-Entities/FamixTest3Reference.class.st b/src/Famix-Test3-Entities/FamixTest3Reference.class.st
index a406dff57..f8feff999 100644
--- a/src/Famix-Test3-Entities/FamixTest3Reference.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Reference.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #referencer Type: #FamixTWithReferences Opposite: #outgoingReferences Comment: Source entity making the reference. from-side of the association
+### Association target
+- Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest3Reference,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3SourceAnchor.class.st b/src/Famix-Test3-Entities/FamixTest3SourceAnchor.class.st
index 92c600549..8aa242a58 100644
--- a/src/Famix-Test3-Entities/FamixTest3SourceAnchor.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTest3SourceAnchor,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3SourceLanguage.class.st b/src/Famix-Test3-Entities/FamixTest3SourceLanguage.class.st
index c72890570..d30546661 100644
--- a/src/Famix-Test3-Entities/FamixTest3SourceLanguage.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest3SourceLanguage,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3SourceTextAnchor.class.st b/src/Famix-Test3-Entities/FamixTest3SourceTextAnchor.class.st
index dcf8f1fbd..5946dda8c 100644
--- a/src/Famix-Test3-Entities/FamixTest3SourceTextAnchor.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTest3SourceTextAnchor,
 	#superclass : #FamixTest3SourceAnchor,
diff --git a/src/Famix-Test3-Entities/FamixTest3SourcedEntity.class.st b/src/Famix-Test3-Entities/FamixTest3SourcedEntity.class.st
index 738e7a5e3..e3c8f5652 100644
--- a/src/Famix-Test3-Entities/FamixTest3SourcedEntity.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3SourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest3SourcedEntity,
 	#superclass : #FamixTest3Entity,
diff --git a/src/Famix-Test3-Entities/FamixTest3TEntityCreator.trait.st b/src/Famix-Test3-Entities/FamixTest3TEntityCreator.trait.st
index 482aafce8..b50fe7974 100644
--- a/src/Famix-Test3-Entities/FamixTest3TEntityCreator.trait.st
+++ b/src/Famix-Test3-Entities/FamixTest3TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest3TEntityCreator,
diff --git a/src/Famix-Test3-Entities/FamixTest3Type.class.st b/src/Famix-Test3-Entities/FamixTest3Type.class.st
index c2aae3cff..637295204 100644
--- a/src/Famix-Test3-Entities/FamixTest3Type.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Type.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest3Type,
 	#superclass : #FamixTest3NamedEntity,
diff --git a/src/Famix-Test3-Entities/FamixTest3UnknownSourceLanguage.class.st b/src/Famix-Test3-Entities/FamixTest3UnknownSourceLanguage.class.st
index 69d7fdaa3..a56d0f2ab 100644
--- a/src/Famix-Test3-Entities/FamixTest3UnknownSourceLanguage.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest3UnknownSourceLanguage,
 	#superclass : #FamixTest3SourceLanguage,
diff --git a/src/Famix-Test4-Entities/FamixTest4Book.class.st b/src/Famix-Test4-Entities/FamixTest4Book.class.st
index c1973fd68..be289dc5e 100644
--- a/src/Famix-Test4-Entities/FamixTest4Book.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Book.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #person Type: #FamixTest4Person Opposite: #books
+
+
+"
 Class {
 	#name : #FamixTest4Book,
 	#superclass : #FamixTest4Entity,
diff --git a/src/Famix-Test4-Entities/FamixTest4Entity.class.st b/src/Famix-Test4-Entities/FamixTest4Entity.class.st
index 38ce7583f..043ce1420 100644
--- a/src/Famix-Test4-Entities/FamixTest4Entity.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Entity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String
+
+"
 Class {
 	#name : #FamixTest4Entity,
 	#superclass : #MooseEntity,
diff --git a/src/Famix-Test4-Entities/FamixTest4Person.class.st b/src/Famix-Test4-Entities/FamixTest4Person.class.st
index 8c6ba469b..daa23f93c 100644
--- a/src/Famix-Test4-Entities/FamixTest4Person.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Person.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #books Type: #FamixTest4Book Opposite: #person
+
+
+"
 Class {
 	#name : #FamixTest4Person,
 	#superclass : #FamixTest4Entity,
diff --git a/src/Famix-Test4-Entities/FamixTest4Principal.class.st b/src/Famix-Test4-Entities/FamixTest4Principal.class.st
index f4a98bc5d..87a2f5d4c 100644
--- a/src/Famix-Test4-Entities/FamixTest4Principal.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Principal.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #school Type: #FamixTest4School Opposite: #principal
+
+
+"
 Class {
 	#name : #FamixTest4Principal,
 	#superclass : #FamixTest4Person,
diff --git a/src/Famix-Test4-Entities/FamixTest4Room.class.st b/src/Famix-Test4-Entities/FamixTest4Room.class.st
index 2297ad0f3..1c55a525b 100644
--- a/src/Famix-Test4-Entities/FamixTest4Room.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Room.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #school Type: #FamixTest4School Opposite: #rooms
+
+
+"
 Class {
 	#name : #FamixTest4Room,
 	#superclass : #FamixTest4Entity,
diff --git a/src/Famix-Test4-Entities/FamixTest4School.class.st b/src/Famix-Test4-Entities/FamixTest4School.class.st
index 8ef26d5c0..059c3602d 100644
--- a/src/Famix-Test4-Entities/FamixTest4School.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4School.class.st
@@ -1,3 +1,15 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #rooms Type: #FamixTest4Room Opposite: #school
+- Relation: #teachers Type: #FamixTest4Teacher Opposite: #school
+- Relation: #students Type: #FamixTest4Student Opposite: #school
+- Relation: #principal Type: #FamixTest4Principal Opposite: #school
+
+
+"
 Class {
 	#name : #FamixTest4School,
 	#superclass : #FamixTest4Entity,
diff --git a/src/Famix-Test4-Entities/FamixTest4Student.class.st b/src/Famix-Test4-Entities/FamixTest4Student.class.st
index b6e1526ab..65902dc52 100644
--- a/src/Famix-Test4-Entities/FamixTest4Student.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Student.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #school Type: #FamixTest4School Opposite: #students
+### Other
+- Relation: #teachers Type: #FamixTest4Teacher Opposite: #students
+
+
+"
 Class {
 	#name : #FamixTest4Student,
 	#superclass : #FamixTest4Person,
diff --git a/src/Famix-Test4-Entities/FamixTest4TEntityCreator.trait.st b/src/Famix-Test4-Entities/FamixTest4TEntityCreator.trait.st
index 216929148..48ebb316c 100644
--- a/src/Famix-Test4-Entities/FamixTest4TEntityCreator.trait.st
+++ b/src/Famix-Test4-Entities/FamixTest4TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest4TEntityCreator,
diff --git a/src/Famix-Test4-Entities/FamixTest4Teacher.class.st b/src/Famix-Test4-Entities/FamixTest4Teacher.class.st
index ad8c154d7..0b01fafeb 100644
--- a/src/Famix-Test4-Entities/FamixTest4Teacher.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4Teacher.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #school Type: #FamixTest4School Opposite: #teachers
+### Other
+- Relation: #students Type: #FamixTest4Student Opposite: #teachers
+
+
+"
 Class {
 	#name : #FamixTest4Teacher,
 	#superclass : #FamixTest4Person,
diff --git a/src/Famix-Test5-Entities/FamixTest5AnnotationType1.class.st b/src/Famix-Test5-Entities/FamixTest5AnnotationType1.class.st
index 57f6cd024..7c73b053f 100644
--- a/src/Famix-Test5-Entities/FamixTest5AnnotationType1.class.st
+++ b/src/Famix-Test5-Entities/FamixTest5AnnotationType1.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #annotationTypesContainer Type: #FamixTWithAnnotationTypes Opposite: #definedAnnotationTypes Comment: Container in which an AnnotationType may reside
+### Other
+- Relation: #instances Type: #FamixTTypedAnnotationInstance Opposite: #annotationType Comment: Annotations of this type
+
+
+"
 Class {
 	#name : #FamixTest5AnnotationType1,
 	#superclass : #FamixTest5Entity,
diff --git a/src/Famix-Test5-Entities/FamixTest5AnnotationType2.class.st b/src/Famix-Test5-Entities/FamixTest5AnnotationType2.class.st
index abe7ea9cc..f046e7d15 100644
--- a/src/Famix-Test5-Entities/FamixTest5AnnotationType2.class.st
+++ b/src/Famix-Test5-Entities/FamixTest5AnnotationType2.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #annotationTypesContainer Type: #FamixTWithAnnotationTypes Opposite: #definedAnnotationTypes Comment: Container in which an AnnotationType may reside
+### Other
+- Relation: #instances Type: #FamixTTypedAnnotationInstance Opposite: #annotationType Comment: Annotations of this type
+
+
+"
 Class {
 	#name : #FamixTest5AnnotationType2,
 	#superclass : #FamixTest5Entity,
diff --git a/src/Famix-Test5-Entities/FamixTest5TEntityCreator.trait.st b/src/Famix-Test5-Entities/FamixTest5TEntityCreator.trait.st
index dfc51ca86..a23c89ddc 100644
--- a/src/Famix-Test5-Entities/FamixTest5TEntityCreator.trait.st
+++ b/src/Famix-Test5-Entities/FamixTest5TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest5TEntityCreator,
diff --git a/src/Famix-Test5-Entities/FamixTest5WithAnnotationType1.class.st b/src/Famix-Test5-Entities/FamixTest5WithAnnotationType1.class.st
index 88b53077a..be4b0d68f 100644
--- a/src/Famix-Test5-Entities/FamixTest5WithAnnotationType1.class.st
+++ b/src/Famix-Test5-Entities/FamixTest5WithAnnotationType1.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #definedAnnotationTypes Type: #FamixTAnnotationType Opposite: #annotationTypesContainer Comment: The container in which the AnnotationTypes may be declared
+
+
+"
 Class {
 	#name : #FamixTest5WithAnnotationType1,
 	#superclass : #FamixTest5Entity,
diff --git a/src/Famix-Test5-Entities/FamixTest5WithAnnotationType2.class.st b/src/Famix-Test5-Entities/FamixTest5WithAnnotationType2.class.st
index 2aba087e9..b6d117eee 100644
--- a/src/Famix-Test5-Entities/FamixTest5WithAnnotationType2.class.st
+++ b/src/Famix-Test5-Entities/FamixTest5WithAnnotationType2.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #definedAnnotationTypes Type: #FamixTAnnotationType Opposite: #annotationTypesContainer Comment: The container in which the AnnotationTypes may be declared
+
+
+"
 Class {
 	#name : #FamixTest5WithAnnotationType2,
 	#superclass : #FamixTest5Entity,
diff --git a/src/Famix-Test6-Entities/FamixTest6Bacon.class.st b/src/Famix-Test6-Entities/FamixTest6Bacon.class.st
index d2b5e9c8d..df6290976 100644
--- a/src/Famix-Test6-Entities/FamixTest6Bacon.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6Bacon.class.st
@@ -1,3 +1,11 @@
+"
+## Properties
+======================
+
+- Named: #eggs Type: Number
+- Named: #isFood Type: Boolean
+
+"
 Class {
 	#name : #FamixTest6Bacon,
 	#superclass : #FamixTest6Entity,
diff --git a/src/Famix-Test6-Entities/FamixTest6Comment.class.st b/src/Famix-Test6-Entities/FamixTest6Comment.class.st
index bb4563b06..cb8b981a8 100644
--- a/src/Famix-Test6-Entities/FamixTest6Comment.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTest6Comment,
 	#superclass : #FamixTest6SourcedEntity,
diff --git a/src/Famix-Test6-Entities/FamixTest6NamedEntity.class.st b/src/Famix-Test6-Entities/FamixTest6NamedEntity.class.st
index c42984052..e3a1976be 100644
--- a/src/Famix-Test6-Entities/FamixTest6NamedEntity.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest6NamedEntity,
 	#superclass : #FamixTest6Entity,
diff --git a/src/Famix-Test6-Entities/FamixTest6SourceAnchor.class.st b/src/Famix-Test6-Entities/FamixTest6SourceAnchor.class.st
index 91e81b951..e2078b1e1 100644
--- a/src/Famix-Test6-Entities/FamixTest6SourceAnchor.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTest6SourceAnchor,
 	#superclass : #FamixTest6Entity,
diff --git a/src/Famix-Test6-Entities/FamixTest6SourceLanguage.class.st b/src/Famix-Test6-Entities/FamixTest6SourceLanguage.class.st
index 8e661a8f7..fc1a4f4a6 100644
--- a/src/Famix-Test6-Entities/FamixTest6SourceLanguage.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest6SourceLanguage,
 	#superclass : #FamixTest6Entity,
diff --git a/src/Famix-Test6-Entities/FamixTest6SourceTextAnchor.class.st b/src/Famix-Test6-Entities/FamixTest6SourceTextAnchor.class.st
index 4bca9205f..45d7e6ba8 100644
--- a/src/Famix-Test6-Entities/FamixTest6SourceTextAnchor.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTest6SourceTextAnchor,
 	#superclass : #FamixTest6SourceAnchor,
diff --git a/src/Famix-Test6-Entities/FamixTest6SourcedEntity.class.st b/src/Famix-Test6-Entities/FamixTest6SourcedEntity.class.st
index 3d26d6d40..fd2054374 100644
--- a/src/Famix-Test6-Entities/FamixTest6SourcedEntity.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6SourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest6SourcedEntity,
 	#superclass : #FamixTest6Entity,
diff --git a/src/Famix-Test6-Entities/FamixTest6Spam.class.st b/src/Famix-Test6-Entities/FamixTest6Spam.class.st
index a2b8c8558..2eedc82ff 100644
--- a/src/Famix-Test6-Entities/FamixTest6Spam.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6Spam.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #isSomething Type: Boolean
+
+"
 Class {
 	#name : #FamixTest6Spam,
 	#superclass : #FamixTest6Bacon,
diff --git a/src/Famix-Test6-Entities/FamixTest6TEntityCreator.trait.st b/src/Famix-Test6-Entities/FamixTest6TEntityCreator.trait.st
index 892b9fd1c..ddbd9b599 100644
--- a/src/Famix-Test6-Entities/FamixTest6TEntityCreator.trait.st
+++ b/src/Famix-Test6-Entities/FamixTest6TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest6TEntityCreator,
diff --git a/src/Famix-Test6-Entities/FamixTest6UnknownSourceLanguage.class.st b/src/Famix-Test6-Entities/FamixTest6UnknownSourceLanguage.class.st
index 038d238f7..5d3c2654b 100644
--- a/src/Famix-Test6-Entities/FamixTest6UnknownSourceLanguage.class.st
+++ b/src/Famix-Test6-Entities/FamixTest6UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest6UnknownSourceLanguage,
 	#superclass : #FamixTest6SourceLanguage,
diff --git a/src/Famix-Test7-Entities/FamixTest7Class.class.st b/src/Famix-Test7-Entities/FamixTest7Class.class.st
index 509899f91..dfa800f69 100644
--- a/src/Famix-Test7-Entities/FamixTest7Class.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Class.class.st
@@ -1,3 +1,30 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest7Class,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7Comment.class.st b/src/Famix-Test7-Entities/FamixTest7Comment.class.st
index 117e3a9f4..2ab66e4fd 100644
--- a/src/Famix-Test7-Entities/FamixTest7Comment.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTest7Comment,
 	#superclass : #FamixTest7SourcedEntity,
diff --git a/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st b/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st
index a4c86af9e..a59cd80b2 100644
--- a/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #subclass Type: #FamixTWithInheritances Opposite: #superInheritances Comment: Subclass linked to in this relationship. from-side of the association
+### Association target
+- Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest7Inheritance,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7Method.class.st b/src/Famix-Test7-Entities/FamixTest7Method.class.st
index 8a151b869..399bff913 100644
--- a/src/Famix-Test7-Entities/FamixTest7Method.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Method.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
+
+"
 Class {
 	#name : #FamixTest7Method,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7NamedEntity.class.st b/src/Famix-Test7-Entities/FamixTest7NamedEntity.class.st
index de6741080..c45d0560b 100644
--- a/src/Famix-Test7-Entities/FamixTest7NamedEntity.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTest7NamedEntity,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7SourceAnchor.class.st b/src/Famix-Test7-Entities/FamixTest7SourceAnchor.class.st
index c13d11fa0..1231d40cc 100644
--- a/src/Famix-Test7-Entities/FamixTest7SourceAnchor.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTest7SourceAnchor,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7SourceLanguage.class.st b/src/Famix-Test7-Entities/FamixTest7SourceLanguage.class.st
index 729e6cb5d..a2d146b54 100644
--- a/src/Famix-Test7-Entities/FamixTest7SourceLanguage.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest7SourceLanguage,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7SourceTextAnchor.class.st b/src/Famix-Test7-Entities/FamixTest7SourceTextAnchor.class.st
index bb4a46ab6..b69a5d9ab 100644
--- a/src/Famix-Test7-Entities/FamixTest7SourceTextAnchor.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTest7SourceTextAnchor,
 	#superclass : #FamixTest7SourceAnchor,
diff --git a/src/Famix-Test7-Entities/FamixTest7SourcedEntity.class.st b/src/Famix-Test7-Entities/FamixTest7SourcedEntity.class.st
index 26a0bb674..1a4911cc3 100644
--- a/src/Famix-Test7-Entities/FamixTest7SourcedEntity.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7SourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest7SourcedEntity,
 	#superclass : #FamixTest7Entity,
diff --git a/src/Famix-Test7-Entities/FamixTest7TEntityCreator.trait.st b/src/Famix-Test7-Entities/FamixTest7TEntityCreator.trait.st
index 06baa55c7..43a303e02 100644
--- a/src/Famix-Test7-Entities/FamixTest7TEntityCreator.trait.st
+++ b/src/Famix-Test7-Entities/FamixTest7TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest7TEntityCreator,
diff --git a/src/Famix-Test7-Entities/FamixTest7UnknownSourceLanguage.class.st b/src/Famix-Test7-Entities/FamixTest7UnknownSourceLanguage.class.st
index 14385b468..08d61bf15 100644
--- a/src/Famix-Test7-Entities/FamixTest7UnknownSourceLanguage.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTest7UnknownSourceLanguage,
 	#superclass : #FamixTest7SourceLanguage,
diff --git a/src/Famix-Test8-Entities/FamixTest8Animal.class.st b/src/Famix-Test8-Entities/FamixTest8Animal.class.st
index d74b7af3a..a9f3bc5be 100644
--- a/src/Famix-Test8-Entities/FamixTest8Animal.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Animal.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingInfections Type: #FamixTest8Infection Opposite: #infectious
+
+
+"
 Class {
 	#name : #FamixTest8Animal,
 	#superclass : #FamixTest8LivingBeing,
diff --git a/src/Famix-Test8-Entities/FamixTest8Bacteria.class.st b/src/Famix-Test8-Entities/FamixTest8Bacteria.class.st
index 9ebd33eb6..bd57c4e8f 100644
--- a/src/Famix-Test8-Entities/FamixTest8Bacteria.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Bacteria.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingInfections Type: #FamixTest8Infection Opposite: #infectable
+
+## Properties
+======================
+
+- Named: #pathogenicity Type: Number
+
+"
 Class {
 	#name : #FamixTest8Bacteria,
 	#superclass : #FamixTest8LivingBeing,
diff --git a/src/Famix-Test8-Entities/FamixTest8Biotope.class.st b/src/Famix-Test8-Entities/FamixTest8Biotope.class.st
index 8012e5e4e..b72af6b08 100644
--- a/src/Famix-Test8-Entities/FamixTest8Biotope.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Biotope.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingResidences Type: #FamixTest8Residence Opposite: #biotope
+
+
+"
 Class {
 	#name : #FamixTest8Biotope,
 	#superclass : #FamixTest8Entity,
diff --git a/src/Famix-Test8-Entities/FamixTest8Infection.class.st b/src/Famix-Test8-Entities/FamixTest8Infection.class.st
index c5654e5f3..fb8fc1345 100644
--- a/src/Famix-Test8-Entities/FamixTest8Infection.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Infection.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #infectable Type: #FamixTest8TInfectable Opposite: #outgoingInfections
+### Association target
+- Relation: #infectious Type: #FamixTest8TInfectious Opposite: #incomingInfections
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isInvasive Type: Boolean
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest8Infection,
 	#superclass : #FamixTest8Entity,
diff --git a/src/Famix-Test8-Entities/FamixTest8LivingBeing.class.st b/src/Famix-Test8-Entities/FamixTest8LivingBeing.class.st
index cef7b4e18..f9741c0cc 100644
--- a/src/Famix-Test8-Entities/FamixTest8LivingBeing.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8LivingBeing.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingResidences Type: #FamixTest8Residence Opposite: #resident
+
+
+"
 Class {
 	#name : #FamixTest8LivingBeing,
 	#superclass : #FamixTest8Entity,
diff --git a/src/Famix-Test8-Entities/FamixTest8Plant.class.st b/src/Famix-Test8-Entities/FamixTest8Plant.class.st
index fd8bb2ad0..8ac044942 100644
--- a/src/Famix-Test8-Entities/FamixTest8Plant.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Plant.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingInfections Type: #FamixTest8Infection Opposite: #infectious
+
+
+"
 Class {
 	#name : #FamixTest8Plant,
 	#superclass : #FamixTest8LivingBeing,
diff --git a/src/Famix-Test8-Entities/FamixTest8Residence.class.st b/src/Famix-Test8-Entities/FamixTest8Residence.class.st
index ee6c211d9..f0db76fdd 100644
--- a/src/Famix-Test8-Entities/FamixTest8Residence.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Residence.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #resident Type: #FamixTest8TResident Opposite: #outgoingResidences
+### Association target
+- Relation: #biotope Type: #FamixTest8TBiotope Opposite: #incomingResidences
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTest8Residence,
 	#superclass : #FamixTest8Entity,
diff --git a/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st b/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st
index 140e0c374..7d3719fbe 100644
--- a/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingResidences Type: #FamixTest8Residence Opposite: #biotope
+
+
+"
 Trait {
 	#name : #FamixTest8TBiotope,
 	#instVars : [
diff --git a/src/Famix-Test8-Entities/FamixTest8TEntityCreator.trait.st b/src/Famix-Test8-Entities/FamixTest8TEntityCreator.trait.st
index b3fdcfebd..11137ef10 100644
--- a/src/Famix-Test8-Entities/FamixTest8TEntityCreator.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTest8TEntityCreator,
diff --git a/src/Famix-Test8-Entities/FamixTest8TInfectable.trait.st b/src/Famix-Test8-Entities/FamixTest8TInfectable.trait.st
index e1af088d3..dc2268341 100644
--- a/src/Famix-Test8-Entities/FamixTest8TInfectable.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TInfectable.trait.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingInfections Type: #FamixTest8Infection Opposite: #infectable
+
+## Properties
+======================
+
+- Named: #pathogenicity Type: Number
+
+"
 Trait {
 	#name : #FamixTest8TInfectable,
 	#instVars : [
diff --git a/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st b/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st
index 4b8f1c919..87200a576 100644
--- a/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingInfections Type: #FamixTest8Infection Opposite: #infectious
+
+
+"
 Trait {
 	#name : #FamixTest8TInfectious,
 	#instVars : [
diff --git a/src/Famix-Test8-Entities/FamixTest8TResident.trait.st b/src/Famix-Test8-Entities/FamixTest8TResident.trait.st
index 3ef60bcc3..9e2bc9950 100644
--- a/src/Famix-Test8-Entities/FamixTest8TResident.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TResident.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingResidences Type: #FamixTest8Residence Opposite: #resident
+
+
+"
 Trait {
 	#name : #FamixTest8TResident,
 	#instVars : [
diff --git a/src/Famix-Test8-Entities/FamixTest8Virus.class.st b/src/Famix-Test8-Entities/FamixTest8Virus.class.st
index 25f9b3ac6..6f55792fc 100644
--- a/src/Famix-Test8-Entities/FamixTest8Virus.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Virus.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingInfections Type: #FamixTest8Infection Opposite: #infectable
+
+## Properties
+======================
+
+- Named: #pathogenicity Type: Number
+
+"
 Class {
 	#name : #FamixTest8Virus,
 	#superclass : #FamixTest8Entity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st
index 5a76d2e6b..1a85920eb 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #c25 Type: #FamixTestComposed2CustomEntity5 Opposite: #associations
+### Association target
+- Relation: #c15 Type: #FamixTestComposed1CustomEntity5 Opposite: #associations
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTestComposedAssociation,
 	#superclass : #FamixTestComposedStandardEntity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity1.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity1.class.st
index 778202f78..915fee5f3 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity1.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity1.class.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #customEntity1 Type: #FamixTestComposed1CustomEntity1 Opposite: #customEntity1
+### Other
+- Relation: #c21 Type: #FamixTestComposed2CustomEntity1 Opposite: #c1
+
+
+"
 Class {
 	#name : #FamixTestComposedCustomEntity1,
 	#superclass : #FamixTestComposedEntity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity2.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity2.class.st
index 0266c110e..1ec842dc7 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity2.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity2.class.st
@@ -1,3 +1,13 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #c22s Type: #FamixTestComposed2CustomEntity2 Opposite: #c2
+- Relation: #customEntities2 Type: #FamixTestComposed1CustomEntity2 Opposite: #customEntity2
+
+
+"
 Class {
 	#name : #FamixTestComposedCustomEntity2,
 	#superclass : #FamixTestComposedEntity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st
index 967f6a910..d5cc67e83 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st
@@ -1,3 +1,13 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #customEntity3 Type: #FamixTestComposed1CustomEntity3 Opposite: #customEntities3
+- Relation: #c23 Type: #FamixTestComposed2CustomEntity3 Opposite: #c3s
+
+
+"
 Class {
 	#name : #FamixTestComposedCustomEntity3,
 	#superclass : #FamixTestComposedEntity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st
index 21403d3a0..afa99c405 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st
@@ -1,3 +1,13 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #customEntities4 Type: #FamixTestComposed1CustomEntity4 Opposite: #customEntities4
+- Relation: #c24s Type: #FamixTestComposed2CustomEntity4 Opposite: #c4s
+
+
+"
 Class {
 	#name : #FamixTestComposedCustomEntity4,
 	#superclass : #FamixTestComposedEntity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedStandardEntity.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedStandardEntity.class.st
index 870930cbf..6b7d2f4ca 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedStandardEntity.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedStandardEntity.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #method Type: #FamixTestComposed1Method Opposite: #standardEntity
+
+
+"
 Class {
 	#name : #FamixTestComposedStandardEntity,
 	#superclass : #FamixTestComposedEntity,
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedTEntityCreator.trait.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedTEntityCreator.trait.st
index 9c5653962..5fbb4ba4c 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedTEntityCreator.trait.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedTEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTestComposedTEntityCreator,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st
index 6481c5e0d..e69a19cf1 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st
@@ -1,3 +1,30 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTestComposed1Class,
 	#superclass : #FamixTestComposed1NamedEntity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Comment.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Comment.class.st
index 01cc89341..11a5d6e2a 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Comment.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTestComposed1Comment,
 	#superclass : #FamixTestComposed1SourcedEntity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st
index 5baa37c29..4e85f1968 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+### Outgoing dependencies
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
+
+"
 Class {
 	#name : #FamixTestComposed1Method,
 	#superclass : #FamixTestComposed1NamedEntity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1NamedEntity.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1NamedEntity.class.st
index 4892de5af..417e75a62 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1NamedEntity.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTestComposed1NamedEntity,
 	#superclass : #FamixTestComposed1Entity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceAnchor.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceAnchor.class.st
index 5a42d4b25..918ce8d9d 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceAnchor.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTestComposed1SourceAnchor,
 	#superclass : #FamixTestComposed1Entity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceLanguage.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceLanguage.class.st
index dc0497516..512f977ad 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceLanguage.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTestComposed1SourceLanguage,
 	#superclass : #FamixTestComposed1Entity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceTextAnchor.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceTextAnchor.class.st
index 28fef0b6e..3abc6a40d 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceTextAnchor.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTestComposed1SourceTextAnchor,
 	#superclass : #FamixTestComposed1SourceAnchor,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourcedEntity.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourcedEntity.class.st
index 93c3ec5b7..1019ac21e 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourcedEntity.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1SourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTestComposed1SourcedEntity,
 	#superclass : #FamixTestComposed1Entity,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1TEntityCreator.trait.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1TEntityCreator.trait.st
index 7ba60e5bf..cba2b8ec3 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1TEntityCreator.trait.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTestComposed1TEntityCreator,
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1UnknownSourceLanguage.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1UnknownSourceLanguage.class.st
index 264726ec8..f1c1da01e 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1UnknownSourceLanguage.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTestComposed1UnknownSourceLanguage,
 	#superclass : #FamixTestComposed1SourceLanguage,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st
index 0dd7a377e..c88a2ccd7 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st
@@ -1,3 +1,30 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTestComposed2Class,
 	#superclass : #FamixTestComposed2NamedEntity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Comment.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Comment.class.st
index bed54838d..ed9cb26df 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Comment.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Comment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #FamixTestComposed2Comment,
 	#superclass : #FamixTestComposed2SourcedEntity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st
index 3dade4b0c..10b1392e5 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
+
+"
 Class {
 	#name : #FamixTestComposed2Method,
 	#superclass : #FamixTestComposed2NamedEntity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2NamedEntity.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2NamedEntity.class.st
index 110ead4b6..1f36aa3e0 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2NamedEntity.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2NamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #FamixTestComposed2NamedEntity,
 	#superclass : #FamixTestComposed2Entity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceAnchor.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceAnchor.class.st
index 9a6aba66b..6eee51af6 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceAnchor.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #FamixTestComposed2SourceAnchor,
 	#superclass : #FamixTestComposed2Entity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceLanguage.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceLanguage.class.st
index b02abec0c..4d4184e6f 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceLanguage.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTestComposed2SourceLanguage,
 	#superclass : #FamixTestComposed2Entity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceTextAnchor.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceTextAnchor.class.st
index 7d79c4558..e3b191f9b 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceTextAnchor.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #FamixTestComposed2SourceTextAnchor,
 	#superclass : #FamixTestComposed2SourceAnchor,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourcedEntity.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourcedEntity.class.st
index 8d89e2e93..6d4d1e283 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourcedEntity.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2SourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #FamixTestComposed2SourcedEntity,
 	#superclass : #FamixTestComposed2Entity,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2TEntityCreator.trait.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2TEntityCreator.trait.st
index 4027ae28a..4780f4069 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2TEntityCreator.trait.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2TEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FamixTestComposed2TEntityCreator,
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2UnknownSourceLanguage.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2UnknownSourceLanguage.class.st
index abc2d790d..f1c027dc4 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2UnknownSourceLanguage.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2UnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #FamixTestComposed2UnknownSourceLanguage,
 	#superclass : #FamixTestComposed2SourceLanguage,
diff --git a/src/Famix-Traits/FamixTAccess.trait.st b/src/Famix-Traits/FamixTAccess.trait.st
index 8272db557..3f7c7875f 100644
--- a/src/Famix-Traits/FamixTAccess.trait.st
+++ b/src/Famix-Traits/FamixTAccess.trait.st
@@ -11,6 +11,25 @@ aFamixTAttribute (x) can be accessed using the message variable (and to).
 Furthermore it can be tagged as read or write using isWrite: aBoolean.
 
 For each access in the source code, there is one famix access created even if it is from the same behavioral entity towards the same variable.
+
+## Relations
+======================
+
+### Association source
+- Relation: #accessor Type: #FamixTWithAccesses Opposite: #accesses Comment: Behavioural entity making the access to the variable. from-side of the association
+### Association target
+- Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isWrite Type: Boolean Comment: Write access
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
 "
 Trait {
 	#name : #FamixTAccess,
diff --git a/src/Famix-Traits/FamixTAccessible.trait.st b/src/Famix-Traits/FamixTAccessible.trait.st
index e0e709af8..7063cc1c4 100644
--- a/src/Famix-Traits/FamixTAccessible.trait.st
+++ b/src/Famix-Traits/FamixTAccessible.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+
+
+"
 Trait {
 	#name : #FamixTAccessible,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTAnnotationInstance.trait.st b/src/Famix-Traits/FamixTAnnotationInstance.trait.st
index a851959ec..210418d18 100644
--- a/src/Famix-Traits/FamixTAnnotationInstance.trait.st
+++ b/src/Famix-Traits/FamixTAnnotationInstance.trait.st
@@ -10,6 +10,14 @@ And the following is an AnnotationInstance in Java:
 Instance Variables:
 	annotatedEntity	<FamixTEntity>
 	annotationType		<FamixTAnnotationType>
+
+## Relations
+======================
+
+### Other
+- Relation: #annotatedEntity Type: #FamixTWithAnnotationInstances Opposite: #annotationInstances Comment: The NamedEntity on which the annotation occurs.
+
+
 "
 Trait {
 	#name : #FamixTAnnotationInstance,
diff --git a/src/Famix-Traits/FamixTAnnotationInstanceAttribute.trait.st b/src/Famix-Traits/FamixTAnnotationInstanceAttribute.trait.st
index 1da023f2a..cac9c3d70 100644
--- a/src/Famix-Traits/FamixTAnnotationInstanceAttribute.trait.st
+++ b/src/Famix-Traits/FamixTAnnotationInstanceAttribute.trait.st
@@ -8,6 +8,18 @@ Instance Variables:
 	parentAnnotationInstance	<FamixTAnnotationInstance>
 	annotationTypeAttribute	<FamixTAnnotationTypeAttribute>
 	value	<Object>
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentAnnotationInstance Type: #FamixTWithAnnotationInstanceAttributes Opposite: #attributes Comment: The instance of the annotation in which the attribute is used.
+
+## Properties
+======================
+
+- Named: #value Type: String Comment: Actual value of the attribute used in an annotation
+
 "
 Trait {
 	#name : #FamixTAnnotationInstanceAttribute,
diff --git a/src/Famix-Traits/FamixTAnnotationType.trait.st b/src/Famix-Traits/FamixTAnnotationType.trait.st
index c43fdc5f6..637e5f753 100644
--- a/src/Famix-Traits/FamixTAnnotationType.trait.st
+++ b/src/Famix-Traits/FamixTAnnotationType.trait.st
@@ -4,6 +4,16 @@ FamixTAnnotationType represents the type of an annotation. In some languages, Ja
 Instance Variables:
 	instances	<(FMMultivalueLink of: FamixTAnnotationInstance)>
 	container	<FamixTContainerEntity>
+
+## Relations
+======================
+
+### Parents
+- Relation: #annotationTypesContainer Type: #FamixTWithAnnotationTypes Opposite: #definedAnnotationTypes Comment: Container in which an AnnotationType may reside
+### Other
+- Relation: #instances Type: #FamixTTypedAnnotationInstance Opposite: #annotationType Comment: Annotations of this type
+
+
 "
 Trait {
 	#name : #FamixTAnnotationType,
diff --git a/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st b/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st
index f26ab8153..3f37b71a1 100644
--- a/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st
+++ b/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st
@@ -15,6 +15,25 @@ When using an annotation, an annotation instance is created that points back to
 Instance Variables:
 	parentAnnotationType	<FamixTAnnotationType>
 	annotationAttributeInstances	<(FMMultivalueLink of: FamixTAnnotationInstanceAttribute)>
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTAnnotationTypeAttribute,
diff --git a/src/Famix-Traits/FamixTAssociation.trait.st b/src/Famix-Traits/FamixTAssociation.trait.st
index 652e4aaf2..db0097cc5 100644
--- a/src/Famix-Traits/FamixTAssociation.trait.st
+++ b/src/Famix-Traits/FamixTAssociation.trait.st
@@ -16,6 +16,19 @@ will produce two invocation associations first from method a to method b, and se
 
 
 
+## Relations
+======================
+
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
 "
 Trait {
 	#name : #FamixTAssociation,
diff --git a/src/Famix-Traits/FamixTAttribute.trait.st b/src/Famix-Traits/FamixTAttribute.trait.st
index de5971c51..a94b1c51e 100644
--- a/src/Famix-Traits/FamixTAttribute.trait.st
+++ b/src/Famix-Traits/FamixTAttribute.trait.st
@@ -1,6 +1,23 @@
 "
 FamixTAttribute represents a field of a class. It is an attribute of the parent type.
 
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTAttribute,
diff --git a/src/Famix-Traits/FamixTCanBeAbstract.trait.st b/src/Famix-Traits/FamixTCanBeAbstract.trait.st
index 33980ce59..cff78ea9f 100644
--- a/src/Famix-Traits/FamixTCanBeAbstract.trait.st
+++ b/src/Famix-Traits/FamixTCanBeAbstract.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+
+"
 Trait {
 	#name : #FamixTCanBeAbstract,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTCanBeClassSide.trait.st b/src/Famix-Traits/FamixTCanBeClassSide.trait.st
index 408e0e83d..aa82a5f2b 100644
--- a/src/Famix-Traits/FamixTCanBeClassSide.trait.st
+++ b/src/Famix-Traits/FamixTCanBeClassSide.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+
+"
 Trait {
 	#name : #FamixTCanBeClassSide,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTCanBeFinal.trait.st b/src/Famix-Traits/FamixTCanBeFinal.trait.st
index 95b7e94cc..37afb0c37 100644
--- a/src/Famix-Traits/FamixTCanBeFinal.trait.st
+++ b/src/Famix-Traits/FamixTCanBeFinal.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+
+"
 Trait {
 	#name : #FamixTCanBeFinal,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTCanImplement.trait.st b/src/Famix-Traits/FamixTCanImplement.trait.st
index 96a72e381..1a8eef283 100644
--- a/src/Famix-Traits/FamixTCanImplement.trait.st
+++ b/src/Famix-Traits/FamixTCanImplement.trait.st
@@ -1,5 +1,13 @@
 "
 I can be the source of an implementation (cf a class implementing an Interface)
+
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
+
+
 "
 Trait {
 	#name : #FamixTCanImplement,
diff --git a/src/Famix-Traits/FamixTClass.trait.st b/src/Famix-Traits/FamixTClass.trait.st
index 4d5521243..992a41762 100644
--- a/src/Famix-Traits/FamixTClass.trait.st
+++ b/src/Famix-Traits/FamixTClass.trait.st
@@ -4,6 +4,32 @@ FamixTClass represents an entity which can build new instances. A FamixTClass is
 FamixT does not model explicitly interfaces, but a FamixTClass can represent a Java interface by setting the isInterface property.
 
 A class is typically scoped in a namespace. To model nested or anonymous classes, extractors can set the container of classes to classes or methods, respectively.
+
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTClass,
diff --git a/src/Famix-Traits/FamixTClassWithVisibility.trait.st b/src/Famix-Traits/FamixTClassWithVisibility.trait.st
index 4906c9970..12c1a5b96 100644
--- a/src/Famix-Traits/FamixTClassWithVisibility.trait.st
+++ b/src/Famix-Traits/FamixTClassWithVisibility.trait.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #visibility Type: String Comment: Visibility of the entity
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Trait {
 	#name : #FamixTClassWithVisibility,
 	#traits : 'FamixTClass + FamixTHasVisibility',
diff --git a/src/Famix-Traits/FamixTCohesionCouplingMetrics.trait.st b/src/Famix-Traits/FamixTCohesionCouplingMetrics.trait.st
index 883d9ff20..f5cc0c415 100644
--- a/src/Famix-Traits/FamixTCohesionCouplingMetrics.trait.st
+++ b/src/Famix-Traits/FamixTCohesionCouplingMetrics.trait.st
@@ -1,3 +1,19 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Trait {
 	#name : #FamixTCohesionCouplingMetrics,
 	#traits : 'FamixTPackage',
diff --git a/src/Famix-Traits/FamixTComment.trait.st b/src/Famix-Traits/FamixTComment.trait.st
index 59fe7a4de..7eeda11a6 100644
--- a/src/Famix-Traits/FamixTComment.trait.st
+++ b/src/Famix-Traits/FamixTComment.trait.st
@@ -1,5 +1,17 @@
 "
 FamixTComment represents one instance of a comment (in the sense of programming language comments) for any Famix sourced entity. The commented sourced entity is called the container in the FamixT model.
+
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
 "
 Trait {
 	#name : #FamixTComment,
diff --git a/src/Famix-Traits/FamixTCompilationUnit.trait.st b/src/Famix-Traits/FamixTCompilationUnit.trait.st
index d1c514e40..253d52104 100644
--- a/src/Famix-Traits/FamixTCompilationUnit.trait.st
+++ b/src/Famix-Traits/FamixTCompilationUnit.trait.st
@@ -1,5 +1,16 @@
 "
 I represent a compilation unit file. Typically a .c or .cpp file
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+- Relation: #compilationUnitOwner Type: #FamixTWithCompilationUnits Opposite: #compilationUnit Comment: The compilation unit that defines this module
+### Other
+- Relation: #entities Type: #FamixTWithFiles Opposite: #containerFiles Comment: List of entities defined in the file
+
+
 "
 Trait {
 	#name : #FamixTCompilationUnit,
diff --git a/src/Famix-Traits/FamixTDefinedInModule.trait.st b/src/Famix-Traits/FamixTDefinedInModule.trait.st
index 63ef1561c..f096c6257 100644
--- a/src/Famix-Traits/FamixTDefinedInModule.trait.st
+++ b/src/Famix-Traits/FamixTDefinedInModule.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentModule Type: #FamixTModule Opposite: #moduleEntities Comment: Module that contains the definition of this entity
+
+
+"
 Trait {
 	#name : #FamixTDefinedInModule,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTDereferencedInvocation.trait.st b/src/Famix-Traits/FamixTDereferencedInvocation.trait.st
index a187f45e6..ddc2a36d1 100644
--- a/src/Famix-Traits/FamixTDereferencedInvocation.trait.st
+++ b/src/Famix-Traits/FamixTDereferencedInvocation.trait.st
@@ -4,6 +4,27 @@ Represents an invocation which function is contained in a pointer.
 The function itself is typically unknown (referenced by the pointer).
 
 It has a referencer which is the pointer variable
+
+## Relations
+======================
+
+### Association source
+- Relation: #sender Type: #FamixTWithInvocations Opposite: #outgoingInvocations Comment: Behavioural entity making the call. from-side of the association
+### Association target
+- Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
+### Other
+- Relation: #referencer Type: #FamixTWithDereferencedInvocations Opposite: #dereferencedInvocations Comment: Structural entity that references the BehaviouralEntity invoked
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
 "
 Trait {
 	#name : #FamixTDereferencedInvocation,
diff --git a/src/Famix-Traits/FamixTEnum.trait.st b/src/Famix-Traits/FamixTEnum.trait.st
index adb7f9337..bd03b4a80 100644
--- a/src/Famix-Traits/FamixTEnum.trait.st
+++ b/src/Famix-Traits/FamixTEnum.trait.st
@@ -10,6 +10,26 @@ public enum Day {
 
 Instance Variables:
 	values	<(MultivalueLink of: FamixTEnumValue)>
+
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #enumValues Type: #FamixTEnumValue Opposite: #parentEnum
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTEnum,
diff --git a/src/Famix-Traits/FamixTEnumValue.trait.st b/src/Famix-Traits/FamixTEnumValue.trait.st
index 7cad2e2e9..c950de792 100644
--- a/src/Famix-Traits/FamixTEnumValue.trait.st
+++ b/src/Famix-Traits/FamixTEnumValue.trait.st
@@ -10,6 +10,24 @@ public enum Day {
 
 Instance Variables:
 	parentEnum	<(MultivalueLink of: FamixTEnum)>
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentEnum Type: #FamixTWithEnumValues Opposite: #enumValues Comment: The Enum declaring this value. It offers the implementation of belongsTo
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTEnumValue,
diff --git a/src/Famix-Traits/FamixTException.trait.st b/src/Famix-Traits/FamixTException.trait.st
index 23ea3dec7..02aeab9ad 100644
--- a/src/Famix-Traits/FamixTException.trait.st
+++ b/src/Famix-Traits/FamixTException.trait.st
@@ -1,5 +1,34 @@
 "
 This is the abstract representation of an Exception. It is specific to Java. It points to an exceptionClass. The class of a FamixTException is a normal FamixTClass.
+
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #throwingEntities Type: #FamixTWithExceptions Opposite: #thrownExceptions
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #catchingEntities Type: #FamixTWithExceptions Opposite: #caughtExceptions
+- Relation: #declaringEntities Type: #FamixTWithExceptions Opposite: #declaredExceptions
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTException,
diff --git a/src/Famix-Traits/FamixTFile.trait.st b/src/Famix-Traits/FamixTFile.trait.st
index 86b509605..71e3741a5 100644
--- a/src/Famix-Traits/FamixTFile.trait.st
+++ b/src/Famix-Traits/FamixTFile.trait.st
@@ -1,5 +1,15 @@
 "
 It represents a file in the file system.
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+### Other
+- Relation: #entities Type: #FamixTWithFiles Opposite: #containerFiles Comment: List of entities defined in the file
+
+
 "
 Trait {
 	#name : #FamixTFile,
diff --git a/src/Famix-Traits/FamixTFileAnchor.trait.st b/src/Famix-Traits/FamixTFileAnchor.trait.st
index 27ad421eb..3b3d613e8 100644
--- a/src/Famix-Traits/FamixTFileAnchor.trait.st
+++ b/src/Famix-Traits/FamixTFileAnchor.trait.st
@@ -1,5 +1,13 @@
 "
 This offers a source anchor that connects a sourced entity to a file through a relative path stored in the fileName. In addition, the source can be further specified with a startLine and an endLine number in the file.
+
+## Properties
+======================
+
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+
 "
 Trait {
 	#name : #FamixTFileAnchor,
diff --git a/src/Famix-Traits/FamixTFileInclude.trait.st b/src/Famix-Traits/FamixTFileInclude.trait.st
index 6731fbb56..b348a4a2f 100644
--- a/src/Famix-Traits/FamixTFileInclude.trait.st
+++ b/src/Famix-Traits/FamixTFileInclude.trait.st
@@ -1,3 +1,20 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #target Type: #FamixTWithFileIncludes Opposite: #incomingIncludeRelations Comment: The file that is included
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #source Type: #FamixTWithFileIncludes Opposite: #outgoingIncludeRelations Comment: The file that is including
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Trait {
 	#name : #FamixTFileInclude,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTFileNavigation.trait.st b/src/Famix-Traits/FamixTFileNavigation.trait.st
index 49f77df12..2c21e2cda 100644
--- a/src/Famix-Traits/FamixTFileNavigation.trait.st
+++ b/src/Famix-Traits/FamixTFileNavigation.trait.st
@@ -1,3 +1,16 @@
+"
+## Properties
+======================
+
+- Named: #endColumn Type: Number Comment: Number of the end column
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endLine Type: Number Comment: Number of the end line
+- Named: #startLine Type: Number Comment: Number of the start line
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #startColumn Type: Number Comment: Number of the start column
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+
+"
 Trait {
 	#name : #FamixTFileNavigation,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTFileSystemEntity.trait.st b/src/Famix-Traits/FamixTFileSystemEntity.trait.st
index 159e20d8d..2d03c5cb6 100644
--- a/src/Famix-Traits/FamixTFileSystemEntity.trait.st
+++ b/src/Famix-Traits/FamixTFileSystemEntity.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+
+
+"
 Trait {
 	#name : #FamixTFileSystemEntity,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTFolder.trait.st b/src/Famix-Traits/FamixTFolder.trait.st
index d44f34ae7..916eaa3d2 100644
--- a/src/Famix-Traits/FamixTFolder.trait.st
+++ b/src/Famix-Traits/FamixTFolder.trait.st
@@ -1,5 +1,15 @@
 "
 It represents a folder in the file system. It can contain other files or folders.
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+### Children
+- Relation: #childrenFileSystemEntities Type: #FamixTFileSystemEntity Opposite: #parentFolder Comment: List of entities contained in this folder.
+
+
 "
 Trait {
 	#name : #FamixTFolder,
diff --git a/src/Famix-Traits/FamixTFunction.trait.st b/src/Famix-Traits/FamixTFunction.trait.st
index fa9bce35e..ecaa336e6 100644
--- a/src/Famix-Traits/FamixTFunction.trait.st
+++ b/src/Famix-Traits/FamixTFunction.trait.st
@@ -1,5 +1,29 @@
 "
 FamixTFunction represents a behavioural entity in a procedural language.
+
+## Relations
+======================
+
+### Parents
+- Relation: #functionOwner Type: #FamixTWithFunctions Opposite: #functions Comment: The container defining the function. The function is placed in a container, because certain languages can nest functions in functions.
+### Children
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTFunction,
diff --git a/src/Famix-Traits/FamixTGlobalVariable.trait.st b/src/Famix-Traits/FamixTGlobalVariable.trait.st
index 1d8aef41c..21403d45d 100644
--- a/src/Famix-Traits/FamixTGlobalVariable.trait.st
+++ b/src/Famix-Traits/FamixTGlobalVariable.trait.st
@@ -1,6 +1,23 @@
 "
 FamixTGlobalVariable represents a global variable in the source code.
 
+## Relations
+======================
+
+### Parents
+- Relation: #parentScope Type: #FamixTWithGlobalVariables Opposite: #globalVariables Comment: Scope declaring the global variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTGlobalVariable,
diff --git a/src/Famix-Traits/FamixTHasImmediateSource.trait.st b/src/Famix-Traits/FamixTHasImmediateSource.trait.st
index f65d555cf..3c79a0087 100644
--- a/src/Famix-Traits/FamixTHasImmediateSource.trait.st
+++ b/src/Famix-Traits/FamixTHasImmediateSource.trait.st
@@ -1,5 +1,17 @@
 "
 An immediate source is the source code of the entity stored directly into its sourceAnchor instead of accessing it (for example in a file) through its sourceAnchor
+
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
 "
 Trait {
 	#name : #FamixTHasImmediateSource,
diff --git a/src/Famix-Traits/FamixTHasKind.trait.st b/src/Famix-Traits/FamixTHasKind.trait.st
index 88af5683f..c82f7f9ac 100644
--- a/src/Famix-Traits/FamixTHasKind.trait.st
+++ b/src/Famix-Traits/FamixTHasKind.trait.st
@@ -1,5 +1,11 @@
 "
 This is an indicator that a method is a setter, getter, constant, or constructor
+
+## Properties
+======================
+
+- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
+
 "
 Trait {
 	#name : #FamixTHasKind,
diff --git a/src/Famix-Traits/FamixTHasSignature.trait.st b/src/Famix-Traits/FamixTHasSignature.trait.st
index 3c4b8ae92..4f4fbd998 100644
--- a/src/Famix-Traits/FamixTHasSignature.trait.st
+++ b/src/Famix-Traits/FamixTHasSignature.trait.st
@@ -1,5 +1,11 @@
 "
 The signature of any behavioural entity
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+
 "
 Trait {
 	#name : #FamixTHasSignature,
diff --git a/src/Famix-Traits/FamixTHasVisibility.trait.st b/src/Famix-Traits/FamixTHasVisibility.trait.st
index 04a3ea70b..7fc2f74f0 100644
--- a/src/Famix-Traits/FamixTHasVisibility.trait.st
+++ b/src/Famix-Traits/FamixTHasVisibility.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #visibility Type: String Comment: Visibility of the entity
+
+"
 Trait {
 	#name : #FamixTHasVisibility,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTHeader.trait.st b/src/Famix-Traits/FamixTHeader.trait.st
index 820da8ccd..8064e1a27 100644
--- a/src/Famix-Traits/FamixTHeader.trait.st
+++ b/src/Famix-Traits/FamixTHeader.trait.st
@@ -1,5 +1,16 @@
 "
 I represent a header file. Typically a .h or .hpp
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
+- Relation: #headerOwner Type: #FamixTWithHeaders Opposite: #header
+### Other
+- Relation: #entities Type: #FamixTWithFiles Opposite: #containerFiles Comment: List of entities defined in the file
+
+
 "
 Trait {
 	#name : #FamixTHeader,
diff --git a/src/Famix-Traits/FamixTImplementable.trait.st b/src/Famix-Traits/FamixTImplementable.trait.st
index db3cee305..d6235a260 100644
--- a/src/Famix-Traits/FamixTImplementable.trait.st
+++ b/src/Famix-Traits/FamixTImplementable.trait.st
@@ -1,5 +1,13 @@
 "
 I can be the target of an implementation cf Interface 
+
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
+
+
 "
 Trait {
 	#name : #FamixTImplementable,
diff --git a/src/Famix-Traits/FamixTImplementation.trait.st b/src/Famix-Traits/FamixTImplementation.trait.st
index 902a6b06d..8b67879aa 100644
--- a/src/Famix-Traits/FamixTImplementation.trait.st
+++ b/src/Famix-Traits/FamixTImplementation.trait.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #implementingClass Type: #FamixTCanImplement Opposite: #interfaceImplementations Comment: Class linked to in this relationship. from-side of the association
+### Association target
+- Relation: #interface Type: #FamixTImplementable Opposite: #implementations Comment: Interface linked to in this relationship. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Trait {
 	#name : #FamixTImplementation,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTImplicitVariable.trait.st b/src/Famix-Traits/FamixTImplicitVariable.trait.st
index 38456482b..695aafa33 100644
--- a/src/Famix-Traits/FamixTImplicitVariable.trait.st
+++ b/src/Famix-Traits/FamixTImplicitVariable.trait.st
@@ -1,5 +1,23 @@
 "
 FamixTImplicitVariable represents a variable defined by the compiler in a context, such as self, super, thisContext.
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithImplicitVariables Opposite: #implicitVariables Comment: The behaviour containing this implicit variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTImplicitVariable,
diff --git a/src/Famix-Traits/FamixTImport.trait.st b/src/Famix-Traits/FamixTImport.trait.st
index e77d0e68c..53a023f98 100644
--- a/src/Famix-Traits/FamixTImport.trait.st
+++ b/src/Famix-Traits/FamixTImport.trait.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #importingEntity Type: #FamixTWithImports Opposite: #outgoingImports Comment: Importing entity
+### Association target
+- Relation: #importedEntity Type: #FamixTImportable Opposite: #incomingImports Comment: Imported entity
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Trait {
 	#name : #FamixTImport,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTImportable.trait.st b/src/Famix-Traits/FamixTImportable.trait.st
index e6ea7493c..efb00726d 100644
--- a/src/Famix-Traits/FamixTImportable.trait.st
+++ b/src/Famix-Traits/FamixTImportable.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+
+
+"
 Trait {
 	#name : #FamixTImportable,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st b/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st
index 8ff7d2796..6a57435ea 100644
--- a/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st
+++ b/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st
@@ -1,3 +1,14 @@
+"
+## Properties
+======================
+
+- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #startPos Type: Number Comment: Start position in the source
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+
+"
 Trait {
 	#name : #FamixTIndexedFileNavigation,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTInheritance.trait.st b/src/Famix-Traits/FamixTInheritance.trait.st
index 22906d537..7f963923a 100644
--- a/src/Famix-Traits/FamixTInheritance.trait.st
+++ b/src/Famix-Traits/FamixTInheritance.trait.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #subclass Type: #FamixTWithInheritances Opposite: #superInheritances Comment: Subclass linked to in this relationship. from-side of the association
+### Association target
+- Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Trait {
 	#name : #FamixTInheritance,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTInvocable.trait.st b/src/Famix-Traits/FamixTInvocable.trait.st
index 6c0a15483..e8a1d6f4e 100644
--- a/src/Famix-Traits/FamixTInvocable.trait.st
+++ b/src/Famix-Traits/FamixTInvocable.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+
+
+"
 Trait {
 	#name : #FamixTInvocable,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTInvocation.trait.st b/src/Famix-Traits/FamixTInvocation.trait.st
index c272e89e9..9e8fa61f4 100644
--- a/src/Famix-Traits/FamixTInvocation.trait.st
+++ b/src/Famix-Traits/FamixTInvocation.trait.st
@@ -9,6 +9,25 @@ In an invocation, From is the sender of the message and To is the list of candid
 anObject aSelector.
 will produce one invocation association from current method to a variable anObject with candidate aSelector. The list of candidates will also contain all the methods defining a similar signature as aSelector. 
 
+## Relations
+======================
+
+### Association source
+- Relation: #sender Type: #FamixTWithInvocations Opposite: #outgoingInvocations Comment: Behavioural entity making the call. from-side of the association
+### Association target
+- Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
 "
 Trait {
 	#name : #FamixTInvocation,
diff --git a/src/Famix-Traits/FamixTInvocationsReceiver.trait.st b/src/Famix-Traits/FamixTInvocationsReceiver.trait.st
index eeefffd9b..cd5b567cf 100644
--- a/src/Famix-Traits/FamixTInvocationsReceiver.trait.st
+++ b/src/Famix-Traits/FamixTInvocationsReceiver.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+
+
+"
 Trait {
 	#name : #FamixTInvocationsReceiver,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTLocalVariable.trait.st b/src/Famix-Traits/FamixTLocalVariable.trait.st
index 263e2b0b2..69e158065 100644
--- a/src/Famix-Traits/FamixTLocalVariable.trait.st
+++ b/src/Famix-Traits/FamixTLocalVariable.trait.st
@@ -1,5 +1,23 @@
 "
 FamixTLocalVariable represents a local variable in the scope of a behavioural entity.
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithLocalVariables Opposite: #localVariables Comment: Behavioural entity declaring this local variable. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTLocalVariable,
diff --git a/src/Famix-Traits/FamixTMethod.trait.st b/src/Famix-Traits/FamixTMethod.trait.st
index 1632c5adb..896437526 100644
--- a/src/Famix-Traits/FamixTMethod.trait.st
+++ b/src/Famix-Traits/FamixTMethod.trait.st
@@ -2,6 +2,33 @@
 FamixTMethod represents a behaviour in an object-oriented language.
 
 A FamixTMethod is always contained in a parentType.
+
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTMethod,
diff --git a/src/Famix-Traits/FamixTModule.trait.st b/src/Famix-Traits/FamixTModule.trait.st
index f9ee08662..a322083f8 100644
--- a/src/Famix-Traits/FamixTModule.trait.st
+++ b/src/Famix-Traits/FamixTModule.trait.st
@@ -1,6 +1,13 @@
 "
 FamixTModule represents a that basically provides a simple scoping abstraction for a .C/.CPP/.H files.
 
+## Relations
+======================
+
+### Children
+- Relation: #moduleEntities Type: #FamixTDefinedInModule Opposite: #parentModule
+
+
 "
 Trait {
 	#name : #FamixTModule,
diff --git a/src/Famix-Traits/FamixTMultipleFileAnchor.trait.st b/src/Famix-Traits/FamixTMultipleFileAnchor.trait.st
index 6d29a512b..d9f587391 100644
--- a/src/Famix-Traits/FamixTMultipleFileAnchor.trait.st
+++ b/src/Famix-Traits/FamixTMultipleFileAnchor.trait.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #fileAnchors Type: FamixTFileAnchor Comment: All source code definition files
+
+"
 Trait {
 	#name : #FamixTMultipleFileAnchor,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTNamedEntity.trait.st b/src/Famix-Traits/FamixTNamedEntity.trait.st
index ca2873b56..fbab4a1ca 100644
--- a/src/Famix-Traits/FamixTNamedEntity.trait.st
+++ b/src/Famix-Traits/FamixTNamedEntity.trait.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Trait {
 	#name : #FamixTNamedEntity,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTNamespace.trait.st b/src/Famix-Traits/FamixTNamespace.trait.st
index e2bb1d7da..4c41256a7 100644
--- a/src/Famix-Traits/FamixTNamespace.trait.st
+++ b/src/Famix-Traits/FamixTNamespace.trait.st
@@ -4,6 +4,19 @@ FamixTNamespace represents a namespace from the source language. Namespaces have
 A namespace denotes an entity that has meaning from a language point of view. For example, in C++, there exist a concept with the same name that has no other responsibility beside providing a lexical scope for the contained classes and funcions.
 
 When an entity is placed inside a namespace, the fully qualified name (mooseName) is affected.
+
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTNamespace,
diff --git a/src/Famix-Traits/FamixTPackage.trait.st b/src/Famix-Traits/FamixTPackage.trait.st
index 0b457e570..ea89215d6 100644
--- a/src/Famix-Traits/FamixTPackage.trait.st
+++ b/src/Famix-Traits/FamixTPackage.trait.st
@@ -2,6 +2,21 @@
 FamixTPackage represents a package in the source language, meaning that it provides a means to group entities without any baring on lexical scoping. 
 
 Java extractors map Java packages to FamixTNamespaces. They can also mirror the same information in terms of FamixTPackage instances.
+
+## Relations
+======================
+
+### Children
+- Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTPackage,
diff --git a/src/Famix-Traits/FamixTPackageable.trait.st b/src/Famix-Traits/FamixTPackageable.trait.st
index 5adc2a1ed..780414fc6 100644
--- a/src/Famix-Traits/FamixTPackageable.trait.st
+++ b/src/Famix-Traits/FamixTPackageable.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+
+
+"
 Trait {
 	#name : #FamixTPackageable,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTParameter.trait.st b/src/Famix-Traits/FamixTParameter.trait.st
index 8131e3888..ed380d748 100644
--- a/src/Famix-Traits/FamixTParameter.trait.st
+++ b/src/Famix-Traits/FamixTParameter.trait.st
@@ -10,6 +10,23 @@ int addNumbers(int a, int b) {
 }
 ```
 
+## Relations
+======================
+
+### Parents
+- Relation: #parentBehaviouralEntity Type: #FamixTWithParameters Opposite: #parameters Comment: Behavioural entity containing this parameter. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTParameter,
diff --git a/src/Famix-Traits/FamixTParameterType.trait.st b/src/Famix-Traits/FamixTParameterType.trait.st
index 48b676b8a..26f7443c5 100644
--- a/src/Famix-Traits/FamixTParameterType.trait.st
+++ b/src/Famix-Traits/FamixTParameterType.trait.st
@@ -7,6 +7,8 @@ public class AClass<A,B,C> {
 }
 
 Where AClass is a ParameterizableClass. A, B and C are ParameterType of AClass.
+
+
 "
 Trait {
 	#name : #FamixTParameterType,
diff --git a/src/Famix-Traits/FamixTParameterizedType.trait.st b/src/Famix-Traits/FamixTParameterizedType.trait.st
index e09ed81a9..a3e58a82c 100644
--- a/src/Famix-Traits/FamixTParameterizedType.trait.st
+++ b/src/Famix-Traits/FamixTParameterizedType.trait.st
@@ -7,6 +7,14 @@ public Map<String,Collection> anAttribute;
 ...
 
 Where Map<String,Collection> is the FamixTParameterizedType of anAttribute. String and Collection are arguments. Map is the parameterizableClass.
+
+## Relations
+======================
+
+### Other
+- Relation: #parameterizableClass Type: #FamixTWithParameterizedTypes Opposite: #parameterizedTypes Comment: Base type of this parameterized type.
+
+
 "
 Trait {
 	#name : #FamixTParameterizedType,
diff --git a/src/Famix-Traits/FamixTParameterizedTypeUser.trait.st b/src/Famix-Traits/FamixTParameterizedTypeUser.trait.st
index f302c480d..2916fe339 100644
--- a/src/Famix-Traits/FamixTParameterizedTypeUser.trait.st
+++ b/src/Famix-Traits/FamixTParameterizedTypeUser.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #argumentsInParameterizedTypes Type: #FamixTWithParameterizedTypeUsers Opposite: #arguments
+
+
+"
 Trait {
 	#name : #FamixTParameterizedTypeUser,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTPreprocessorDefine.trait.st b/src/Famix-Traits/FamixTPreprocessorDefine.trait.st
index 70cc70781..833a568c5 100644
--- a/src/Famix-Traits/FamixTPreprocessorDefine.trait.st
+++ b/src/Famix-Traits/FamixTPreprocessorDefine.trait.st
@@ -2,6 +2,8 @@
 Represent a preprocessor #define statement
 
 Knows the name of the macro defined
+
+
 "
 Trait {
 	#name : #FamixTPreprocessorDefine,
diff --git a/src/Famix-Traits/FamixTPreprocessorIfdef.trait.st b/src/Famix-Traits/FamixTPreprocessorIfdef.trait.st
index 25422fa7a..391231db5 100644
--- a/src/Famix-Traits/FamixTPreprocessorIfdef.trait.st
+++ b/src/Famix-Traits/FamixTPreprocessorIfdef.trait.st
@@ -2,6 +2,8 @@
 Represent a preprocessor #ifdef/#ifndef statement
 
 Knows the name of the macro tested and whether it is ""negated"" (#ifndef) or not (#ifdef)
+
+
 "
 Trait {
 	#name : #FamixTPreprocessorIfdef,
diff --git a/src/Famix-Traits/FamixTPrimitiveType.trait.st b/src/Famix-Traits/FamixTPrimitiveType.trait.st
index 77d1411a6..c34c23b23 100644
--- a/src/Famix-Traits/FamixTPrimitiveType.trait.st
+++ b/src/Famix-Traits/FamixTPrimitiveType.trait.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Trait {
 	#name : #FamixTPrimitiveType,
 	#traits : 'FamixTType',
diff --git a/src/Famix-Traits/FamixTReference.trait.st b/src/Famix-Traits/FamixTReference.trait.st
index 8e5c97177..dff20b0b1 100644
--- a/src/Famix-Traits/FamixTReference.trait.st
+++ b/src/Famix-Traits/FamixTReference.trait.st
@@ -10,6 +10,24 @@ There is only one reference which is created when the static method aStaticMetho
 
 
 Note that FamixTReference was defined between two FamixTContainerEntity entities. So, it used to represent dependencies between container entities that are computed from the dependencies of contained entities. For example, references between two packages can be computed from dependencies between classes of the packages.
+
+## Relations
+======================
+
+### Association source
+- Relation: #referencer Type: #FamixTWithReferences Opposite: #outgoingReferences Comment: Source entity making the reference. from-side of the association
+### Association target
+- Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
 "
 Trait {
 	#name : #FamixTReference,
diff --git a/src/Famix-Traits/FamixTReferenceable.trait.st b/src/Famix-Traits/FamixTReferenceable.trait.st
index 3bbc7c649..13a058c99 100644
--- a/src/Famix-Traits/FamixTReferenceable.trait.st
+++ b/src/Famix-Traits/FamixTReferenceable.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+
+
+"
 Trait {
 	#name : #FamixTReferenceable,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st b/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
index 237ff4c1b..be86c5c82 100644
--- a/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
+++ b/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
@@ -14,6 +14,19 @@ Internal Representation and Key Implementation Points.
 	relatedAnchor:			<aSourceAnchor>			The anchor I'll get my relative sources from.
 	startPos:					<anInteger>				Position of the first character of my source in the source text of the relative anchor.
 
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #relatedAnchor Type: FamixTSourceAnchor Comment: Source anchor to which I am relative.
+- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #startPos Type: Number Comment: Start position in the source
+
 "
 Trait {
 	#name : #FamixTRelativeSourceAnchor,
diff --git a/src/Famix-Traits/FamixTSourceAnchor.trait.st b/src/Famix-Traits/FamixTSourceAnchor.trait.st
index 4a614ef97..9bb2ffcdd 100644
--- a/src/Famix-Traits/FamixTSourceAnchor.trait.st
+++ b/src/Famix-Traits/FamixTSourceAnchor.trait.st
@@ -1,5 +1,13 @@
 "
 FamixTSourceAnchor is an abstract class representing a pointer to a source. The source can be identified in multiple ways as specified by the subclasses.  The famix entity that this class is a source pointer for, is accessible via element property.
+
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
 "
 Trait {
 	#name : #FamixTSourceAnchor,
diff --git a/src/Famix-Traits/FamixTSourceEntity.trait.st b/src/Famix-Traits/FamixTSourceEntity.trait.st
index d21053180..f66d0007f 100644
--- a/src/Famix-Traits/FamixTSourceEntity.trait.st
+++ b/src/Famix-Traits/FamixTSourceEntity.trait.st
@@ -1,5 +1,17 @@
 "
 FamixTSourcedEntity models any fact in a program source and it is the superclass (root class) of all source code entities and their relationships. It is a FamixTEntity and it can hold comments, a source anchor and a source language.
+
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
 "
 Trait {
 	#name : #FamixTSourceEntity,
diff --git a/src/Famix-Traits/FamixTSourceLanguage.trait.st b/src/Famix-Traits/FamixTSourceLanguage.trait.st
index ac6ec44aa..f02a0e008 100644
--- a/src/Famix-Traits/FamixTSourceLanguage.trait.st
+++ b/src/Famix-Traits/FamixTSourceLanguage.trait.st
@@ -3,6 +3,14 @@ FamixTSourceLanguage represents the programming language in which an entity is w
 
 A source language has a name and entities that are written in this language. 
 One can create a default source language for a project by not associating any entities to it. In this case, all entities that do not have specific source langauge, belong to the default source language. One can attach entities to a sourceLanguage using addSourceEntity:.
+
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
 "
 Trait {
 	#name : #FamixTSourceLanguage,
diff --git a/src/Famix-Traits/FamixTStructuralEntity.trait.st b/src/Famix-Traits/FamixTStructuralEntity.trait.st
index f208bcf4e..991831569 100644
--- a/src/Famix-Traits/FamixTStructuralEntity.trait.st
+++ b/src/Famix-Traits/FamixTStructuralEntity.trait.st
@@ -1,5 +1,21 @@
 "
 FamixTStructuralEntity is the abstract superclass for basic data structure in the source code. A structural entity has a declaredType that points to the type of the variable.
+
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTStructuralEntity,
diff --git a/src/Famix-Traits/FamixTTemplate.trait.st b/src/Famix-Traits/FamixTTemplate.trait.st
index d3049de11..d30ace61b 100644
--- a/src/Famix-Traits/FamixTTemplate.trait.st
+++ b/src/Famix-Traits/FamixTTemplate.trait.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #templateOwner Type: #FamixTWithTemplates Opposite: #templates
+### Other
+- Relation: #templateUsers Type: #FamixTTemplateUser Opposite: #template
+
+
+"
 Trait {
 	#name : #FamixTTemplate,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTTemplateUser.trait.st b/src/Famix-Traits/FamixTTemplateUser.trait.st
index 881fa0f1a..9ba45db1e 100644
--- a/src/Famix-Traits/FamixTTemplateUser.trait.st
+++ b/src/Famix-Traits/FamixTTemplateUser.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #template Type: #FamixTTemplate Opposite: #templateUsers
+
+
+"
 Trait {
 	#name : #FamixTTemplateUser,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTTrait.trait.st b/src/Famix-Traits/FamixTTrait.trait.st
index 4a71859eb..3074207ac 100644
--- a/src/Famix-Traits/FamixTTrait.trait.st
+++ b/src/Famix-Traits/FamixTTrait.trait.st
@@ -1,5 +1,15 @@
 "
 FamixTTrait models a trait as it can be found in Pharo or PHP.
+
+## Relations
+======================
+
+### Parents
+- Relation: #traitOwner Type: #FamixTWithTraits Opposite: #traits
+### Outgoing dependencies
+- Relation: #incomingTraitUsages Type: #FamixTTraitUsage Opposite: #trait
+
+
 "
 Trait {
 	#name : #FamixTTrait,
diff --git a/src/Famix-Traits/FamixTTraitUsage.trait.st b/src/Famix-Traits/FamixTTraitUsage.trait.st
index eb7a7c8b2..2389e27e0 100644
--- a/src/Famix-Traits/FamixTTraitUsage.trait.st
+++ b/src/Famix-Traits/FamixTTraitUsage.trait.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #trait Type: #FamixTTrait Opposite: #incomingTraitUsages
+### Association target
+- Relation: #user Type: #FamixTTraitUser Opposite: #outgoingTraitUsages
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Trait {
 	#name : #FamixTTraitUsage,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTTraitUser.trait.st b/src/Famix-Traits/FamixTTraitUser.trait.st
index b6f2ccfa5..170b87e84 100644
--- a/src/Famix-Traits/FamixTTraitUser.trait.st
+++ b/src/Famix-Traits/FamixTTraitUser.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #outgoingTraitUsages Type: #FamixTTraitUsage Opposite: #user
+
+
+"
 Trait {
 	#name : #FamixTTraitUser,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTType.trait.st b/src/Famix-Traits/FamixTType.trait.st
index 59fbf77c1..8565ccae2 100644
--- a/src/Famix-Traits/FamixTType.trait.st
+++ b/src/Famix-Traits/FamixTType.trait.st
@@ -4,6 +4,24 @@ A type is defined in a container (instance of FamixTContainer).
 The container is typically a namespace (instance of FamixTNamespace), but may also be a class (in the case of nested classes), or a method (in the case of anonymous classes).
 
 A type can have multiple subtypes or supertypes. These are modelled by means of FamixTInheritance instances.
+
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
 "
 Trait {
 	#name : #FamixTType,
diff --git a/src/Famix-Traits/FamixTTypeAlias.trait.st b/src/Famix-Traits/FamixTTypeAlias.trait.st
index 7ad9ce115..84fec2cd3 100644
--- a/src/Famix-Traits/FamixTTypeAlias.trait.st
+++ b/src/Famix-Traits/FamixTTypeAlias.trait.st
@@ -3,6 +3,14 @@ This entity models a typedef in C.
 
 Instance Variables:
 	aliasedType	<ProtoObject | PseudoContext>
+
+## Relations
+======================
+
+### Other
+- Relation: #aliasedType Type: #FamixTWithTypeAliases Opposite: #typeAliases Comment: Points to the actual type.
+
+
 "
 Trait {
 	#name : #FamixTTypeAlias,
diff --git a/src/Famix-Traits/FamixTTypedAnnotationInstance.trait.st b/src/Famix-Traits/FamixTTypedAnnotationInstance.trait.st
index e1cd0def1..a04a60de1 100644
--- a/src/Famix-Traits/FamixTTypedAnnotationInstance.trait.st
+++ b/src/Famix-Traits/FamixTTypedAnnotationInstance.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #annotationType Type: #FamixTAnnotationType Opposite: #instances Comment: Refers to the type of an annotation. (In some languages, Java and C#, an annotation as an explicit type). 
+
+
+"
 Trait {
 	#name : #FamixTTypedAnnotationInstance,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTTypedAnnotationInstanceAttribute.trait.st b/src/Famix-Traits/FamixTTypedAnnotationInstanceAttribute.trait.st
index f4f278ef2..ccfe7a9be 100644
--- a/src/Famix-Traits/FamixTTypedAnnotationInstanceAttribute.trait.st
+++ b/src/Famix-Traits/FamixTTypedAnnotationInstanceAttribute.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
+
+
+"
 Trait {
 	#name : #FamixTTypedAnnotationInstanceAttribute,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTTypedEntity.trait.st b/src/Famix-Traits/FamixTTypedEntity.trait.st
index ae1af109f..bd35d4551 100644
--- a/src/Famix-Traits/FamixTTypedEntity.trait.st
+++ b/src/Famix-Traits/FamixTTypedEntity.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+
+"
 Trait {
 	#name : #FamixTTypedEntity,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTUnknownSourceLanguage.trait.st b/src/Famix-Traits/FamixTUnknownSourceLanguage.trait.st
index 006c48d7d..0f39b4e89 100644
--- a/src/Famix-Traits/FamixTUnknownSourceLanguage.trait.st
+++ b/src/Famix-Traits/FamixTUnknownSourceLanguage.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Trait {
 	#name : #FamixTUnknownSourceLanguage,
 	#traits : 'FamixTSourceLanguage',
diff --git a/src/Famix-Traits/FamixTUnknownVariable.trait.st b/src/Famix-Traits/FamixTUnknownVariable.trait.st
index 285b7d952..492060fad 100644
--- a/src/Famix-Traits/FamixTUnknownVariable.trait.st
+++ b/src/Famix-Traits/FamixTUnknownVariable.trait.st
@@ -1,3 +1,20 @@
+"
+## Relations
+======================
+
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Trait {
 	#name : #FamixTUnknownVariable,
 	#traits : 'FamixTStructuralEntity',
diff --git a/src/Famix-Traits/FamixTWithAccesses.trait.st b/src/Famix-Traits/FamixTWithAccesses.trait.st
index 567e85f25..28e283354 100644
--- a/src/Famix-Traits/FamixTWithAccesses.trait.st
+++ b/src/Famix-Traits/FamixTWithAccesses.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+
+
+"
 Trait {
 	#name : #FamixTWithAccesses,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithAnnotationInstanceAttributes.trait.st b/src/Famix-Traits/FamixTWithAnnotationInstanceAttributes.trait.st
index 022ea206c..50bb0b8db 100644
--- a/src/Famix-Traits/FamixTWithAnnotationInstanceAttributes.trait.st
+++ b/src/Famix-Traits/FamixTWithAnnotationInstanceAttributes.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #attributes Type: #FamixTAnnotationInstanceAttribute Opposite: #parentAnnotationInstance Comment: This corresponds to the actual values of the attributes in an AnnotationInstance
+
+
+"
 Trait {
 	#name : #FamixTWithAnnotationInstanceAttributes,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithAnnotationInstances.trait.st b/src/Famix-Traits/FamixTWithAnnotationInstances.trait.st
index f69529f4e..17ba79bc4 100644
--- a/src/Famix-Traits/FamixTWithAnnotationInstances.trait.st
+++ b/src/Famix-Traits/FamixTWithAnnotationInstances.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
+
+
+"
 Trait {
 	#name : #FamixTWithAnnotationInstances,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithAnnotationTypes.trait.st b/src/Famix-Traits/FamixTWithAnnotationTypes.trait.st
index 1728364f9..88bf7553b 100644
--- a/src/Famix-Traits/FamixTWithAnnotationTypes.trait.st
+++ b/src/Famix-Traits/FamixTWithAnnotationTypes.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #definedAnnotationTypes Type: #FamixTAnnotationType Opposite: #annotationTypesContainer Comment: The container in which the AnnotationTypes may be declared
+
+
+"
 Trait {
 	#name : #FamixTWithAnnotationTypes,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithAttributes.trait.st b/src/Famix-Traits/FamixTWithAttributes.trait.st
index 8583f4ae6..4fc87c8c6 100644
--- a/src/Famix-Traits/FamixTWithAttributes.trait.st
+++ b/src/Famix-Traits/FamixTWithAttributes.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+
+
+"
 Trait {
 	#name : #FamixTWithAttributes,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithClasses.trait.st b/src/Famix-Traits/FamixTWithClasses.trait.st
index 7db6f6bd6..744b00c53 100644
--- a/src/Famix-Traits/FamixTWithClasses.trait.st
+++ b/src/Famix-Traits/FamixTWithClasses.trait.st
@@ -1,3 +1,13 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+
+
+"
 Trait {
 	#name : #FamixTWithClasses,
 	#traits : 'FamixTWithTypes',
diff --git a/src/Famix-Traits/FamixTWithComments.trait.st b/src/Famix-Traits/FamixTWithComments.trait.st
index b22441038..57f3bc228 100644
--- a/src/Famix-Traits/FamixTWithComments.trait.st
+++ b/src/Famix-Traits/FamixTWithComments.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+
+
+"
 Trait {
 	#name : #FamixTWithComments,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithCompilationUnits.trait.st b/src/Famix-Traits/FamixTWithCompilationUnits.trait.st
index fc7d0a16c..cdf452b2e 100644
--- a/src/Famix-Traits/FamixTWithCompilationUnits.trait.st
+++ b/src/Famix-Traits/FamixTWithCompilationUnits.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #compilationUnit Type: #FamixTCompilationUnit Opposite: #compilationUnitOwner
+
+
+"
 Trait {
 	#name : #FamixTWithCompilationUnits,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithDereferencedInvocations.trait.st b/src/Famix-Traits/FamixTWithDereferencedInvocations.trait.st
index 506356722..4a089455a 100644
--- a/src/Famix-Traits/FamixTWithDereferencedInvocations.trait.st
+++ b/src/Famix-Traits/FamixTWithDereferencedInvocations.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #dereferencedInvocations Type: #FamixTDereferencedInvocation Opposite: #referencer Comment: List of invocations performed on BehaviouralEntities referenced by this entity
+
+
+"
 Trait {
 	#name : #FamixTWithDereferencedInvocations,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithEnumValues.trait.st b/src/Famix-Traits/FamixTWithEnumValues.trait.st
index 662ce6342..446cd99c5 100644
--- a/src/Famix-Traits/FamixTWithEnumValues.trait.st
+++ b/src/Famix-Traits/FamixTWithEnumValues.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #enumValues Type: #FamixTEnumValue Opposite: #parentEnum
+
+
+"
 Trait {
 	#name : #FamixTWithEnumValues,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithExceptions.trait.st b/src/Famix-Traits/FamixTWithExceptions.trait.st
index cb45b4cc4..a78e95a4d 100644
--- a/src/Famix-Traits/FamixTWithExceptions.trait.st
+++ b/src/Famix-Traits/FamixTWithExceptions.trait.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #declaredExceptions Type: #FamixTException Opposite: #declaringEntities Comment: The exceptions declared by the method
+- Relation: #thrownExceptions Type: #FamixTException Opposite: #throwingEntities Comment: The exceptions thrown by the method
+- Relation: #caughtExceptions Type: #FamixTException Opposite: #catchingEntities Comment: The exceptions caught by the method
+
+
+"
 Trait {
 	#name : #FamixTWithExceptions,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithFileIncludes.trait.st b/src/Famix-Traits/FamixTWithFileIncludes.trait.st
index 0592f878a..19b4bfdfd 100644
--- a/src/Famix-Traits/FamixTWithFileIncludes.trait.st
+++ b/src/Famix-Traits/FamixTWithFileIncludes.trait.st
@@ -1,3 +1,13 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #outgoingIncludeRelations Type: #FamixTFileInclude Opposite: #source Comment: The include entities that have this file as a source.
+- Relation: #incomingIncludeRelations Type: #FamixTFileInclude Opposite: #target Comment: The include entities that have this file as a target.
+
+
+"
 Trait {
 	#name : #FamixTWithFileIncludes,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithFiles.trait.st b/src/Famix-Traits/FamixTWithFiles.trait.st
index 6aefca687..ab199a0de 100644
--- a/src/Famix-Traits/FamixTWithFiles.trait.st
+++ b/src/Famix-Traits/FamixTWithFiles.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #containerFiles Type: #FamixTFile Opposite: #entities Comment: List of files containing the entity
+
+
+"
 Trait {
 	#name : #FamixTWithFiles,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithFunctions.trait.st b/src/Famix-Traits/FamixTWithFunctions.trait.st
index 81adaa0b7..595993a1e 100644
--- a/src/Famix-Traits/FamixTWithFunctions.trait.st
+++ b/src/Famix-Traits/FamixTWithFunctions.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #functions Type: #FamixTFunction Opposite: #functionOwner Comment: Functions defined in the container, if any.
+
+
+"
 Trait {
 	#name : #FamixTWithFunctions,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithGlobalVariables.trait.st b/src/Famix-Traits/FamixTWithGlobalVariables.trait.st
index d93e8c0a6..2526f3f7e 100644
--- a/src/Famix-Traits/FamixTWithGlobalVariables.trait.st
+++ b/src/Famix-Traits/FamixTWithGlobalVariables.trait.st
@@ -1,5 +1,13 @@
 "
 A container having Global variables
+
+## Relations
+======================
+
+### Children
+- Relation: #globalVariables Type: #FamixTGlobalVariable Opposite: #parentScope Comment: Global variables defined in the scope, if any.
+
+
 "
 Trait {
 	#name : #FamixTWithGlobalVariables,
diff --git a/src/Famix-Traits/FamixTWithHeaders.trait.st b/src/Famix-Traits/FamixTWithHeaders.trait.st
index 0f6cc5c17..454a92d0f 100644
--- a/src/Famix-Traits/FamixTWithHeaders.trait.st
+++ b/src/Famix-Traits/FamixTWithHeaders.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #header Type: #FamixTHeader Opposite: #headerOwner Comment: The header file that defines this module
+
+
+"
 Trait {
 	#name : #FamixTWithHeaders,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithImplicitVariables.trait.st b/src/Famix-Traits/FamixTWithImplicitVariables.trait.st
index 20035dd16..9b696ea9d 100644
--- a/src/Famix-Traits/FamixTWithImplicitVariables.trait.st
+++ b/src/Famix-Traits/FamixTWithImplicitVariables.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+
+
+"
 Trait {
 	#name : #FamixTWithImplicitVariables,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithImports.trait.st b/src/Famix-Traits/FamixTWithImports.trait.st
index f55cbaf4b..3509f29d6 100644
--- a/src/Famix-Traits/FamixTWithImports.trait.st
+++ b/src/Famix-Traits/FamixTWithImports.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
+
+
+"
 Trait {
 	#name : #FamixTWithImports,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithInheritances.trait.st b/src/Famix-Traits/FamixTWithInheritances.trait.st
index e98855bb8..c8eafa3da 100644
--- a/src/Famix-Traits/FamixTWithInheritances.trait.st
+++ b/src/Famix-Traits/FamixTWithInheritances.trait.st
@@ -1,3 +1,14 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+
+
+"
 Trait {
 	#name : #FamixTWithInheritances,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithInvocations.trait.st b/src/Famix-Traits/FamixTWithInvocations.trait.st
index 73571ddfb..1300a79ea 100644
--- a/src/Famix-Traits/FamixTWithInvocations.trait.st
+++ b/src/Famix-Traits/FamixTWithInvocations.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+
+
+"
 Trait {
 	#name : #FamixTWithInvocations,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithLocalVariables.trait.st b/src/Famix-Traits/FamixTWithLocalVariables.trait.st
index 8553ab086..a19ee6498 100644
--- a/src/Famix-Traits/FamixTWithLocalVariables.trait.st
+++ b/src/Famix-Traits/FamixTWithLocalVariables.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+
+
+"
 Trait {
 	#name : #FamixTWithLocalVariables,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithMethods.trait.st b/src/Famix-Traits/FamixTWithMethods.trait.st
index 1c4471f43..7ad24d621 100644
--- a/src/Famix-Traits/FamixTWithMethods.trait.st
+++ b/src/Famix-Traits/FamixTWithMethods.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+
+
+"
 Trait {
 	#name : #FamixTWithMethods,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithParameterizedTypeUsers.trait.st b/src/Famix-Traits/FamixTWithParameterizedTypeUsers.trait.st
index 9a356c016..8e391ca0d 100644
--- a/src/Famix-Traits/FamixTWithParameterizedTypeUsers.trait.st
+++ b/src/Famix-Traits/FamixTWithParameterizedTypeUsers.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #arguments Type: #FamixTParameterizedTypeUser Opposite: #argumentsInParameterizedTypes
+
+
+"
 Trait {
 	#name : #FamixTWithParameterizedTypeUsers,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithParameterizedTypes.trait.st b/src/Famix-Traits/FamixTWithParameterizedTypes.trait.st
index 9b7d34764..757b2f19d 100644
--- a/src/Famix-Traits/FamixTWithParameterizedTypes.trait.st
+++ b/src/Famix-Traits/FamixTWithParameterizedTypes.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #parameterizedTypes Type: #FamixTParameterizedType Opposite: #parameterizableClass
+
+
+"
 Trait {
 	#name : #FamixTWithParameterizedTypes,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithParameters.trait.st b/src/Famix-Traits/FamixTWithParameters.trait.st
index 3f35c4830..3869b285c 100644
--- a/src/Famix-Traits/FamixTWithParameters.trait.st
+++ b/src/Famix-Traits/FamixTWithParameters.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+
+
+"
 Trait {
 	#name : #FamixTWithParameters,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithReferences.trait.st b/src/Famix-Traits/FamixTWithReferences.trait.st
index 427581c01..1f0598f1d 100644
--- a/src/Famix-Traits/FamixTWithReferences.trait.st
+++ b/src/Famix-Traits/FamixTWithReferences.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+
+
+"
 Trait {
 	#name : #FamixTWithReferences,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithSourceLanguages.trait.st b/src/Famix-Traits/FamixTWithSourceLanguages.trait.st
index db713f5b9..2c731f93c 100644
--- a/src/Famix-Traits/FamixTWithSourceLanguages.trait.st
+++ b/src/Famix-Traits/FamixTWithSourceLanguages.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+
+
+"
 Trait {
 	#name : #FamixTWithSourceLanguages,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithStatements.trait.st b/src/Famix-Traits/FamixTWithStatements.trait.st
index 1ec819c98..6362f0342 100644
--- a/src/Famix-Traits/FamixTWithStatements.trait.st
+++ b/src/Famix-Traits/FamixTWithStatements.trait.st
@@ -1,3 +1,20 @@
+"
+## Relations
+======================
+
+### Outgoing dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Trait {
 	#name : #FamixTWithStatements,
 	#traits : 'FamixTSourceEntity + FamixTWithAccesses + FamixTWithInvocations + FamixTWithReferences',
diff --git a/src/Famix-Traits/FamixTWithTemplates.trait.st b/src/Famix-Traits/FamixTWithTemplates.trait.st
index 1402522f6..61296637b 100644
--- a/src/Famix-Traits/FamixTWithTemplates.trait.st
+++ b/src/Famix-Traits/FamixTWithTemplates.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #templates Type: #FamixTTemplate Opposite: #templateOwner
+
+
+"
 Trait {
 	#name : #FamixTWithTemplates,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithTraits.trait.st b/src/Famix-Traits/FamixTWithTraits.trait.st
index 091613bda..ca6880f71 100644
--- a/src/Famix-Traits/FamixTWithTraits.trait.st
+++ b/src/Famix-Traits/FamixTWithTraits.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #traits Type: #FamixTTrait Opposite: #traitOwner
+
+
+"
 Trait {
 	#name : #FamixTWithTraits,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithTypeAliases.trait.st b/src/Famix-Traits/FamixTWithTypeAliases.trait.st
index 121a8a181..3e53e9904 100644
--- a/src/Famix-Traits/FamixTWithTypeAliases.trait.st
+++ b/src/Famix-Traits/FamixTWithTypeAliases.trait.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #typeAliases Type: #FamixTTypeAlias Opposite: #aliasedType Comment: Aliases
+
+
+"
 Trait {
 	#name : #FamixTWithTypeAliases,
 	#instVars : [
diff --git a/src/Famix-Traits/FamixTWithTypes.trait.st b/src/Famix-Traits/FamixTWithTypes.trait.st
index 6fc8990f0..e166574e4 100644
--- a/src/Famix-Traits/FamixTWithTypes.trait.st
+++ b/src/Famix-Traits/FamixTWithTypes.trait.st
@@ -1,3 +1,13 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+
+
+"
 Trait {
 	#name : #FamixTWithTypes,
 	#instVars : [
diff --git a/src/FamixDocumentor-TestMetaModel/FDClass1.class.st b/src/FamixDocumentor-TestMetaModel/FDClass1.class.st
index 0f1998d61..e7384272a 100644
--- a/src/FamixDocumentor-TestMetaModel/FDClass1.class.st
+++ b/src/FamixDocumentor-TestMetaModel/FDClass1.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #myTrait Type: #FDTrait4 Opposite: #class1
+
+
+"
 Class {
 	#name : #FDClass1,
 	#superclass : #FDEntity,
diff --git a/src/FamixDocumentor-TestMetaModel/FDTEntityCreator.trait.st b/src/FamixDocumentor-TestMetaModel/FDTEntityCreator.trait.st
index 86dc9499e..a2d9a4357 100644
--- a/src/FamixDocumentor-TestMetaModel/FDTEntityCreator.trait.st
+++ b/src/FamixDocumentor-TestMetaModel/FDTEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #FDTEntityCreator,
diff --git a/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st b/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
index 25f73aa70..9d39c4d06 100644
--- a/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
+++ b/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
@@ -1,3 +1,17 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #class1 Type: #FDClass1 Opposite: #myTrait
+
+## Properties
+======================
+
+- Named: #someProp Type: String Comment: A property in the trait
+- Named: #otherProp Type: Object Comment: Another property in the trait
+
+"
 Trait {
 	#name : #FDTrait4,
 	#instVars : [
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st
index 42e00c649..2d6185f81 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
+### Incomming dependencies
+- Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestAttribute,
 	#superclass : #MooseMSEImporterTestNamedEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st
index 00c09af7c..490640fff 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st
@@ -1,3 +1,30 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Children
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+### Outgoing dependencies
+- Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
+### Incomming dependencies
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestClass,
 	#superclass : #MooseMSEImporterTestNamedEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestComment.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestComment.class.st
index 3182b6814..2982bce26 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestComment.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestComment.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #commentedEntity Type: #FamixTWithComments Opposite: #comments Comment: Source code commented by the comment
+
+## Properties
+======================
+
+- Named: #content Type: String Comment: Content of the comment as a String
+
+"
 Class {
 	#name : #MooseMSEImporterTestComment,
 	#superclass : #MooseMSEImporterTestSourcedEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st
index 51e1f7e95..497083588 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Association source
+- Relation: #subclass Type: #FamixTWithInheritances Opposite: #superInheritances Comment: Subclass linked to in this relationship. from-side of the association
+### Association target
+- Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
+### Other
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #MooseMSEImporterTestInheritance,
 	#superclass : #MooseMSEImporterTestEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st
index 1703d29ea..0c2a5ecf4 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st
@@ -1,3 +1,31 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
+### Children
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+### Outgoing dependencies
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incomming dependencies
+- Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
+### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestMethod,
 	#superclass : #MooseMSEImporterTestNamedEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamedEntity.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamedEntity.class.st
index 1463f8def..5661b8836 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamedEntity.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamedEntity.class.st
@@ -1,3 +1,10 @@
+"
+## Properties
+======================
+
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestNamedEntity,
 	#superclass : #MooseMSEImporterTestEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamespace.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamespace.class.st
index 44d317109..d05ddb4e3 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamespace.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestNamespace.class.st
@@ -1,3 +1,20 @@
+"
+## Relations
+======================
+
+### Children
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestNamespace,
 	#superclass : #MooseMSEImporterTestNamedEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPackage.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPackage.class.st
index f9ce6cbd7..8ee793935 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPackage.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPackage.class.st
@@ -1,3 +1,23 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+### Children
+- Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+- Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
+#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestPackage,
 	#superclass : #MooseMSEImporterTestNamedEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st
index e972940b2..b9ce860c4 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st
@@ -1,3 +1,22 @@
+"
+## Relations
+======================
+
+### Parents
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
+### Incomming dependencies
+- Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+### Other
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+
+"
 Class {
 	#name : #MooseMSEImporterTestPrimitiveType,
 	#superclass : #MooseMSEImporterTestEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceAnchor.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceAnchor.class.st
index 0459ada57..27d484026 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceAnchor.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceAnchor.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+
+"
 Class {
 	#name : #MooseMSEImporterTestSourceAnchor,
 	#superclass : #MooseMSEImporterTestEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceLanguage.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceLanguage.class.st
index c97e0b439..a87df9f20 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceLanguage.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #MooseMSEImporterTestSourceLanguage,
 	#superclass : #MooseMSEImporterTestEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceTextAnchor.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceTextAnchor.class.st
index 7aaed2c65..e4fefd011 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceTextAnchor.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourceTextAnchor.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #element Type: #FamixTSourceEntity Opposite: #sourceAnchor Comment: Enable the accessibility to the famix entity that this class is a source pointer for
+
+## Properties
+======================
+
+- Named: #source Type: String Comment: Actual source code of the source entity
+
+"
 Class {
 	#name : #MooseMSEImporterTestSourceTextAnchor,
 	#superclass : #MooseMSEImporterTestSourceAnchor,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourcedEntity.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourcedEntity.class.st
index 964a3a1ca..9139c7ba2 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourcedEntity.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestSourcedEntity.class.st
@@ -1,3 +1,16 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+
+## Properties
+======================
+
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+
+"
 Class {
 	#name : #MooseMSEImporterTestSourcedEntity,
 	#superclass : #MooseMSEImporterTestEntity,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestTEntityCreator.trait.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestTEntityCreator.trait.st
index b3ba94db5..f529748bc 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestTEntityCreator.trait.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestTEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #MooseMSEImporterTestTEntityCreator,
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestUnknownSourceLanguage.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestUnknownSourceLanguage.class.st
index 3f7632dea..a9326ddc6 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestUnknownSourceLanguage.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestUnknownSourceLanguage.class.st
@@ -1,3 +1,12 @@
+"
+## Relations
+======================
+
+### Other
+- Relation: #sourcedEntities Type: #FamixTWithSourceLanguages Opposite: #declaredSourceLanguage Comment: References to the entities saying explicitly that are written in this language.
+
+
+"
 Class {
 	#name : #MooseMSEImporterTestUnknownSourceLanguage,
 	#superclass : #MooseMSEImporterTestSourceLanguage,
diff --git a/src/Moose-Core/MooseTEntityCreator.trait.st b/src/Moose-Core/MooseTEntityCreator.trait.st
index 75c869056..23a50767a 100644
--- a/src/Moose-Core/MooseTEntityCreator.trait.st
+++ b/src/Moose-Core/MooseTEntityCreator.trait.st
@@ -1,6 +1,8 @@
 "
 This trait is used by Famix models.
 It provides an API for creating entities and adding them to the model.
+
+
 "
 Trait {
 	#name : #MooseTEntityCreator,

From 2616e365fa5a97724842bf0e520b18281a13527f Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.me>
Date: Mon, 15 Jan 2024 17:19:54 +0100
Subject: [PATCH 2/4] Sort properties to keep a common order

---
 .../FamixJavaAccess.class.st                  |  2 +-
 .../FamixJavaAnnotationType.class.st          |  4 ++--
 .../FamixJavaAnnotationTypeAttribute.class.st |  8 +++----
 .../FamixJavaAttribute.class.st               | 12 +++++-----
 .../FamixJavaClass.class.st                   | 14 +++++------
 .../FamixJavaEnum.class.st                    |  8 +++----
 .../FamixJavaEnumValue.class.st               |  6 ++---
 .../FamixJavaException.class.st               | 10 ++++----
 .../FamixJavaImplementation.class.st          |  2 +-
 .../FamixJavaImplicitVariable.class.st        |  4 ++--
 .../FamixJavaImport.class.st                  |  2 +-
 .../FamixJavaIndexedFileAnchor.class.st       |  6 ++---
 .../FamixJavaInheritance.class.st             |  2 +-
 .../FamixJavaInterface.class.st               |  8 +++----
 .../FamixJavaInvocation.class.st              |  4 ++--
 .../FamixJavaLocalVariable.class.st           |  6 ++---
 .../FamixJavaMethod.class.st                  | 24 +++++++++----------
 .../FamixJavaNamedEntity.class.st             |  2 +-
 .../FamixJavaPackage.class.st                 |  6 ++---
 .../FamixJavaParameter.class.st               |  8 +++----
 .../FamixJavaParameterizedType.class.st       |  2 +-
 .../FamixJavaPrimitiveType.class.st           |  4 ++--
 .../FamixJavaReference.class.st               |  2 +-
 .../FamixJavaType.class.st                    |  4 ++--
 .../FamixJavaUnknownVariable.class.st         |  4 ++--
 .../FmxMBBehavior.class.st                    |  4 ++--
 .../FamixStAnnotationTypeAttribute.class.st   |  8 +++----
 .../FamixStAttribute.class.st                 |  8 +++----
 .../FamixStClass.class.st                     | 14 +++++------
 .../FamixStGlobalVariable.class.st            |  6 ++---
 .../FamixStImplicitVariable.class.st          |  6 ++---
 .../FamixStInvocation.class.st                |  6 ++---
 .../FamixStLocalVariable.class.st             |  6 ++---
 .../FamixStMethod.class.st                    | 22 ++++++++---------
 .../FamixStNamespace.class.st                 |  2 +-
 .../FamixStPackage.class.st                   |  4 ++--
 .../FamixStParameter.class.st                 |  6 ++---
 .../FamixStUnknownVariable.class.st           |  6 ++---
 .../FamixTest1Attribute.class.st              |  6 ++---
 .../FamixTest1Class.class.st                  | 10 ++++----
 .../FamixTest1FileAnchor.class.st             |  6 ++---
 .../FamixTest1IndexedFileAnchor.class.st      |  6 ++---
 .../FamixTest1Method.class.st                 | 14 +++++------
 .../FamixTest1SourcedEntity.class.st          |  2 +-
 .../FamixTest2Class.class.st                  |  6 ++---
 .../FamixTest2Inheritance.class.st            |  2 +-
 .../FamixTest3Access.class.st                 |  4 ++--
 .../FamixTest3Attribute.class.st              |  2 +-
 .../FamixTest3Class.class.st                  |  4 ++--
 .../FamixTest3Invocation.class.st             |  4 ++--
 .../FamixTest3Method.class.st                 |  6 ++---
 .../FamixTest3PrimitiveType.class.st          |  2 +-
 .../FamixTest3Reference.class.st              |  2 +-
 .../FamixTest3Type.class.st                   |  4 ++--
 .../FamixTest4School.class.st                 |  4 ++--
 .../FamixTest7Class.class.st                  | 10 ++++----
 .../FamixTest7Inheritance.class.st            |  4 ++--
 .../FamixTest7Method.class.st                 | 12 +++++-----
 .../FamixTest8Animal.class.st                 |  2 +-
 .../FamixTest8Biotope.class.st                |  2 +-
 .../FamixTest8Infection.class.st              |  4 ++--
 .../FamixTest8Plant.class.st                  |  2 +-
 .../FamixTest8Residence.class.st              |  4 ++--
 .../FamixTest8TBiotope.trait.st               |  2 +-
 .../FamixTest8TInfectious.trait.st            |  2 +-
 .../FamixTestComposedAssociation.class.st     |  2 +-
 .../FamixTestComposedCustomEntity3.class.st   |  2 +-
 .../FamixTestComposedCustomEntity4.class.st   |  2 +-
 .../FamixTestComposed1Class.class.st          | 10 ++++----
 .../FamixTestComposed1Method.class.st         |  4 ++--
 .../FamixTestComposed2Class.class.st          | 10 ++++----
 .../FamixTestComposed2Method.class.st         |  8 +++----
 src/Famix-Traits/FamixTAccess.trait.st        |  4 ++--
 src/Famix-Traits/FamixTAccessible.trait.st    |  2 +-
 .../FamixTAnnotationTypeAttribute.trait.st    |  6 ++---
 src/Famix-Traits/FamixTAssociation.trait.st   |  2 +-
 src/Famix-Traits/FamixTAttribute.trait.st     |  4 ++--
 src/Famix-Traits/FamixTClass.trait.st         |  6 ++---
 .../FamixTClassWithVisibility.trait.st        |  8 +++----
 .../FamixTCompilationUnit.trait.st            |  2 +-
 .../FamixTDereferencedInvocation.trait.st     |  8 +++----
 src/Famix-Traits/FamixTEnum.trait.st          |  2 +-
 src/Famix-Traits/FamixTEnumValue.trait.st     |  4 ++--
 src/Famix-Traits/FamixTException.trait.st     | 14 +++++------
 src/Famix-Traits/FamixTFileAnchor.trait.st    |  4 ++--
 src/Famix-Traits/FamixTFileInclude.trait.st   |  6 ++---
 .../FamixTFileNavigation.trait.st             |  6 ++---
 src/Famix-Traits/FamixTFunction.trait.st      |  8 +++----
 .../FamixTGlobalVariable.trait.st             |  4 ++--
 src/Famix-Traits/FamixTHeader.trait.st        |  2 +-
 src/Famix-Traits/FamixTImplementable.trait.st |  2 +-
 .../FamixTImplementation.trait.st             |  2 +-
 .../FamixTImplicitVariable.trait.st           |  4 ++--
 src/Famix-Traits/FamixTImport.trait.st        |  2 +-
 src/Famix-Traits/FamixTImportable.trait.st    |  2 +-
 .../FamixTIndexedFileNavigation.trait.st      |  6 ++---
 src/Famix-Traits/FamixTInheritance.trait.st   |  2 +-
 src/Famix-Traits/FamixTInvocable.trait.st     |  2 +-
 src/Famix-Traits/FamixTInvocation.trait.st    |  6 ++---
 src/Famix-Traits/FamixTLocalVariable.trait.st |  4 ++--
 src/Famix-Traits/FamixTMethod.trait.st        | 12 +++++-----
 src/Famix-Traits/FamixTParameter.trait.st     |  4 ++--
 src/Famix-Traits/FamixTPrimitiveType.trait.st |  2 +-
 src/Famix-Traits/FamixTReference.trait.st     |  2 +-
 src/Famix-Traits/FamixTReferenceable.trait.st |  2 +-
 .../FamixTRelativeSourceAnchor.trait.st       |  2 +-
 .../FamixTStructuralEntity.trait.st           |  4 ++--
 src/Famix-Traits/FamixTTraitUsage.trait.st    |  2 +-
 src/Famix-Traits/FamixTTraitUser.trait.st     |  2 +-
 src/Famix-Traits/FamixTType.trait.st          |  2 +-
 .../FamixTUnknownVariable.trait.st            |  4 ++--
 .../FamixTWithExceptions.trait.st             |  2 +-
 .../FamixTWithFileIncludes.trait.st           |  2 +-
 .../FamixTWithInheritances.trait.st           |  2 +-
 .../FamixTWithStatements.trait.st             |  4 ++--
 .../FDTrait4.trait.st                         |  2 +-
 .../MooseMSEImporterTestAttribute.class.st    |  2 +-
 .../MooseMSEImporterTestClass.class.st        | 10 ++++----
 .../MooseMSEImporterTestInheritance.class.st  |  2 +-
 .../MooseMSEImporterTestMethod.class.st       |  8 +++----
 ...MooseMSEImporterTestPrimitiveType.class.st |  4 ++--
 121 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/src/Famix-Java-Entities/FamixJavaAccess.class.st b/src/Famix-Java-Entities/FamixJavaAccess.class.st
index e216ddb7f..81a8f6b56 100644
--- a/src/Famix-Java-Entities/FamixJavaAccess.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAccess.class.st
@@ -8,8 +8,8 @@
 - Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
 ### Other
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st b/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st
index 5e8a7855e..3e3b191f5 100644
--- a/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAnnotationType.class.st
@@ -3,13 +3,13 @@
 ======================
 
 ### Parents
-- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
 - Relation: #annotationTypesContainer Type: #FamixTWithAnnotationTypes Opposite: #definedAnnotationTypes Comment: Container in which an AnnotationType may reside
+- Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
 ### Children
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
diff --git a/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st b/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st
index b70a4675b..5c83f71da 100644
--- a/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAnnotationTypeAttribute.class.st
@@ -4,20 +4,20 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
 - Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaAttribute.class.st b/src/Famix-Java-Entities/FamixJavaAttribute.class.st
index 3aea33cda..65d1da198 100644
--- a/src/Famix-Java-Entities/FamixJavaAttribute.class.st
+++ b/src/Famix-Java-Entities/FamixJavaAttribute.class.st
@@ -4,24 +4,24 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #visibility Type: String Comment: Visibility of the entity
-- Named: #isTransient Type: Boolean Comment: Entity can be declared transient
 - Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isTransient Type: Boolean Comment: Entity can be declared transient
 - Named: #isVolatile Type: Boolean Comment: Entity can be declared volatile
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
-- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #visibility Type: String Comment: Visibility of the entity
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaClass.class.st b/src/Famix-Java-Entities/FamixJavaClass.class.st
index 98f30c3f5..de073d695 100644
--- a/src/Famix-Java-Entities/FamixJavaClass.class.st
+++ b/src/Famix-Java-Entities/FamixJavaClass.class.st
@@ -6,31 +6,31 @@
 - Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
+- Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
 - Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-- Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 
 ## Properties
 ======================
 
-- Named: #isFinal Type: Boolean Comment: Entity can be declared final
-- Named: #visibility Type: String Comment: Visibility of the entity
 - Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
 - Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #visibility Type: String Comment: Visibility of the entity
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaEnum.class.st b/src/Famix-Java-Entities/FamixJavaEnum.class.st
index f6c579e9a..ae26ed123 100644
--- a/src/Famix-Java-Entities/FamixJavaEnum.class.st
+++ b/src/Famix-Java-Entities/FamixJavaEnum.class.st
@@ -5,16 +5,16 @@
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
 - Relation: #enumValues Type: #FamixTEnumValue Opposite: #parentEnum
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
@@ -23,8 +23,8 @@
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #visibility Type: String Comment: Visibility of the entity
 
 "
diff --git a/src/Famix-Java-Entities/FamixJavaEnumValue.class.st b/src/Famix-Java-Entities/FamixJavaEnumValue.class.st
index 993a698ac..f3acfb0f4 100644
--- a/src/Famix-Java-Entities/FamixJavaEnumValue.class.st
+++ b/src/Famix-Java-Entities/FamixJavaEnumValue.class.st
@@ -4,18 +4,18 @@
 
 ### Parents
 - Relation: #parentEnum Type: #FamixTWithEnumValues Opposite: #enumValues Comment: The Enum declaring this value. It offers the implementation of belongsTo
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaException.class.st b/src/Famix-Java-Entities/FamixJavaException.class.st
index 76fca8d56..40c81fc4b 100644
--- a/src/Famix-Java-Entities/FamixJavaException.class.st
+++ b/src/Famix-Java-Entities/FamixJavaException.class.st
@@ -12,24 +12,24 @@
 ### Outgoing dependencies
 - Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
-- Relation: #throwingEntities Type: #FamixTWithExceptions Opposite: #thrownExceptions
 - Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
 - Relation: #catchingEntities Type: #FamixTWithExceptions Opposite: #caughtExceptions
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaringEntities Type: #FamixTWithExceptions Opposite: #declaredExceptions
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #throwingEntities Type: #FamixTWithExceptions Opposite: #thrownExceptions
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #visibility Type: String Comment: Visibility of the entity
 
 "
diff --git a/src/Famix-Java-Entities/FamixJavaImplementation.class.st b/src/Famix-Java-Entities/FamixJavaImplementation.class.st
index ee7e3ce71..95bd66abc 100644
--- a/src/Famix-Java-Entities/FamixJavaImplementation.class.st
+++ b/src/Famix-Java-Entities/FamixJavaImplementation.class.st
@@ -8,8 +8,8 @@
 - Relation: #interface Type: #FamixTImplementable Opposite: #implementations Comment: Interface linked to in this relationship. to-side of the association
 ### Other
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st b/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st
index 592950c64..fc3f301a9 100644
--- a/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st
+++ b/src/Famix-Java-Entities/FamixJavaImplicitVariable.class.st
@@ -4,7 +4,7 @@
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithImplicitVariables Opposite: #implicitVariables Comment: The behaviour containing this implicit variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
@@ -14,8 +14,8 @@
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaImport.class.st b/src/Famix-Java-Entities/FamixJavaImport.class.st
index b2e45face..3beb67b19 100644
--- a/src/Famix-Java-Entities/FamixJavaImport.class.st
+++ b/src/Famix-Java-Entities/FamixJavaImport.class.st
@@ -8,8 +8,8 @@
 - Relation: #importedEntity Type: #FamixTImportable Opposite: #incomingImports Comment: Imported entity
 ### Other
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st b/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st
index 2cab490be..75f0982b9 100644
--- a/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st
+++ b/src/Famix-Java-Entities/FamixJavaIndexedFileAnchor.class.st
@@ -2,11 +2,11 @@
 ## Properties
 ======================
 
-- Named: #endPos Type: Number Comment: Stop position in the source
-- Named: #startPos Type: Number Comment: Start position in the source
 - Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
-- Named: #fileName Type: String Comment: Name of the source file
 - Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #fileName Type: String Comment: Name of the source file
+- Named: #startPos Type: Number Comment: Start position in the source
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaInheritance.class.st b/src/Famix-Java-Entities/FamixJavaInheritance.class.st
index b1cf98f79..b9c6c77db 100644
--- a/src/Famix-Java-Entities/FamixJavaInheritance.class.st
+++ b/src/Famix-Java-Entities/FamixJavaInheritance.class.st
@@ -8,8 +8,8 @@
 - Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
 ### Other
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaInterface.class.st b/src/Famix-Java-Entities/FamixJavaInterface.class.st
index cde852938..72075edb1 100644
--- a/src/Famix-Java-Entities/FamixJavaInterface.class.st
+++ b/src/Famix-Java-Entities/FamixJavaInterface.class.st
@@ -5,18 +5,18 @@
 ### Parents
 - Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #outgoingImports Type: #FamixTImport Opposite: #importingEntity
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
-- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
+### Incoming dependencies
 - Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
+- Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaInvocation.class.st b/src/Famix-Java-Entities/FamixJavaInvocation.class.st
index f3a413af4..1523362c2 100644
--- a/src/Famix-Java-Entities/FamixJavaInvocation.class.st
+++ b/src/Famix-Java-Entities/FamixJavaInvocation.class.st
@@ -7,16 +7,16 @@
 ### Association target
 - Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
 ### Other
-- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st b/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st
index 35dd94d89..69f29c777 100644
--- a/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st
+++ b/src/Famix-Java-Entities/FamixJavaLocalVariable.class.st
@@ -4,20 +4,20 @@
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithLocalVariables Opposite: #localVariables Comment: Behavioural entity declaring this local variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isFinal Type: Boolean Comment: Entity can be declared final
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaMethod.class.st b/src/Famix-Java-Entities/FamixJavaMethod.class.st
index 33d628a10..b0bd36a15 100644
--- a/src/Famix-Java-Entities/FamixJavaMethod.class.st
+++ b/src/Famix-Java-Entities/FamixJavaMethod.class.st
@@ -6,35 +6,35 @@
 - Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
 - Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
-- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
 - Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
+- Relation: #caughtExceptions Type: #FamixTException Opposite: #catchingEntities Comment: The exceptions caught by the method
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredExceptions Type: #FamixTException Opposite: #declaringEntities Comment: The exceptions declared by the method
-- Relation: #thrownExceptions Type: #FamixTException Opposite: #throwingEntities Comment: The exceptions thrown by the method
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
-- Relation: #caughtExceptions Type: #FamixTException Opposite: #catchingEntities Comment: The exceptions caught by the method
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #thrownExceptions Type: #FamixTException Opposite: #throwingEntities Comment: The exceptions thrown by the method
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
-- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
-- Named: #isSynchronized Type: Boolean Comment: Entity can be declared synchronized
-- Named: #visibility Type: String Comment: Visibility of the entity
 - Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isFinal Type: Boolean Comment: Entity can be declared final
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isSynchronized Type: Boolean Comment: Entity can be declared synchronized
+- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #signature Type: String Comment: Signature of the message being sent
-- Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #visibility Type: String Comment: Visibility of the entity
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st b/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st
index ae141eea1..4cbb88478 100644
--- a/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st
+++ b/src/Famix-Java-Entities/FamixJavaNamedEntity.class.st
@@ -3,8 +3,8 @@
 ======================
 
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaPackage.class.st b/src/Famix-Java-Entities/FamixJavaPackage.class.st
index 3b35d46bd..aacc32199 100644
--- a/src/Famix-Java-Entities/FamixJavaPackage.class.st
+++ b/src/Famix-Java-Entities/FamixJavaPackage.class.st
@@ -6,17 +6,17 @@
 - Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
 ### Children
 - Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaParameter.class.st b/src/Famix-Java-Entities/FamixJavaParameter.class.st
index e12f96b89..941ff9060 100644
--- a/src/Famix-Java-Entities/FamixJavaParameter.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameter.class.st
@@ -4,19 +4,19 @@
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithParameters Opposite: #parameters Comment: Behavioural entity containing this parameter. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #isFinal Type: Boolean Comment: Entity can be declared final
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st b/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st
index b1e88bf5d..056bfb7a8 100644
--- a/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaParameterizedType.class.st
@@ -5,7 +5,7 @@
 ### Outgoing dependencies
 - Relation: #interfaceImplementations Type: #FamixTImplementation Opposite: #implementingClass Comment: Implementation relationships
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
diff --git a/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st b/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st
index 7e115239c..0744de4fe 100644
--- a/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaPrimitiveType.class.st
@@ -4,7 +4,7 @@
 
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
@@ -13,8 +13,8 @@
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaReference.class.st b/src/Famix-Java-Entities/FamixJavaReference.class.st
index a1c9e9820..d681e6c40 100644
--- a/src/Famix-Java-Entities/FamixJavaReference.class.st
+++ b/src/Famix-Java-Entities/FamixJavaReference.class.st
@@ -8,8 +8,8 @@
 - Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
 ### Other
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Java-Entities/FamixJavaType.class.st b/src/Famix-Java-Entities/FamixJavaType.class.st
index 854584b1e..7dd2e0dd6 100644
--- a/src/Famix-Java-Entities/FamixJavaType.class.st
+++ b/src/Famix-Java-Entities/FamixJavaType.class.st
@@ -6,7 +6,7 @@
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
 - Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
 - Relation: #argumentsInParameterizedTypes Type: #FamixTWithParameterizedTypeUsers Opposite: #arguments
@@ -16,8 +16,8 @@
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st b/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st
index 32c69837e..bf0e72da5 100644
--- a/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st
+++ b/src/Famix-Java-Entities/FamixJavaUnknownVariable.class.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
@@ -12,8 +12,8 @@
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
index 26ea43a5c..c370cfe14 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
@@ -148,7 +148,7 @@ FmxMBBehavior >> commentWithRelations [
 								  nextPutAll: relationKind;
 								  lf.
 
-							  parents do: [ :parent |
+							  (parents sorted: [ :parent | parent side generationStrategy relationSide name ] ascending) do: [ :parent |
 								  | strategy |
 								  strategy := parent side generationStrategy.
 
@@ -175,7 +175,7 @@ FmxMBBehavior >> commentWithRelations [
 				  lf;
 				  lf.
 
-			  props do: [ :property |
+			  (props sorted: #name ascending) do: [ :property |
 				  aStream
 					  nextPutAll: '- Named: #';
 					  nextPutAll: property name;
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st
index b165229d6..70ddeb9cd 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAnnotationTypeAttribute.class.st
@@ -4,19 +4,19 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
 - Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #annotationTypeAttribute Type: #FamixTAnnotationTypeAttribute Opposite: #annotationAttributeInstances Comment: This corresponds to the type of the attribute in an AnnotationInstance
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st
index bfc449abd..224b673b4 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStAttribute.class.st
@@ -4,19 +4,19 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
index 6913643e0..98ff3417a 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStClass.class.st
@@ -3,30 +3,30 @@
 ======================
 
 ### Parents
-- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 - Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
+- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
 #types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
-- Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st
index cd9f94611..071450863 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStGlobalVariable.class.st
@@ -4,18 +4,18 @@
 
 ### Parents
 - Relation: #parentScope Type: #FamixTWithGlobalVariables Opposite: #globalVariables Comment: Scope declaring the global variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
index 120887408..ab33ce116 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
@@ -4,18 +4,18 @@
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithImplicitVariables Opposite: #implicitVariables Comment: The behaviour containing this implicit variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st
index b7c129634..04325199b 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStInvocation.class.st
@@ -7,16 +7,16 @@
 ### Association target
 - Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
index bfcde0b7f..b107907ad 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
@@ -4,18 +4,18 @@
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithLocalVariables Opposite: #localVariables Comment: Behavioural entity declaring this local variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st
index fe79b9649..bc551fff5 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStMethod.class.st
@@ -3,35 +3,35 @@
 ======================
 
 ### Parents
-- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 - Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+- Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
 - Relation: #definedAnnotationTypes Type: #FamixTAnnotationType Opposite: #annotationTypesContainer Comment: The container in which the AnnotationTypes may be declared
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
 - Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
-- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #annotationInstances Type: #FamixTAnnotationInstance Opposite: #annotatedEntity Comment: This property corresponds to the set of annotations associated to the entity
 
 ## Properties
 ======================
 
-- Named: #protocol Type: String Comment: Protocol of the method
-- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
 - Named: #isAbstract Type: Boolean Comment: Entity can be declared abstract
-- Named: #signature Type: String Comment: Signature of the message being sent
+- Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
+- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #protocol Type: String Comment: Protocol of the method
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st
index 3a4b1a3c3..a76be723d 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStNamespace.class.st
@@ -13,8 +13,8 @@
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st
index cb42533e2..7f8dc012b 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStPackage.class.st
@@ -4,17 +4,17 @@
 
 ### Children
 - Relation: #childEntities Type: #FamixTPackageable Opposite: #parentPackage
+- Relation: #globalVariables Type: #FamixTGlobalVariable Opposite: #parentScope Comment: Global variables defined in the scope, if any.
 - Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
 #types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
-- Relation: #globalVariables Type: #FamixTGlobalVariable Opposite: #parentScope Comment: Global variables defined in the scope, if any.
 ### Other
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
index 6375e604e..0840f25a8 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
@@ -4,18 +4,18 @@
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithParameters Opposite: #parameters Comment: Behavioural entity containing this parameter. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st
index 32599e350..c5ba8bfc2 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStUnknownVariable.class.st
@@ -2,18 +2,18 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Test1-Entities/FamixTest1Attribute.class.st b/src/Famix-Test1-Entities/FamixTest1Attribute.class.st
index 7b781a2fe..610f72250 100644
--- a/src/Famix-Test1-Entities/FamixTest1Attribute.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Attribute.class.st
@@ -4,19 +4,19 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
 - Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Test1-Entities/FamixTest1Class.class.st b/src/Famix-Test1-Entities/FamixTest1Class.class.st
index 04d4003ff..22473348a 100644
--- a/src/Famix-Test1-Entities/FamixTest1Class.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Class.class.st
@@ -5,22 +5,22 @@ This a comment for the Class entity
 ======================
 
 ### Parents
-- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 - Relation: #parentPackage Type: #FamixTPackage Opposite: #childEntities Comment: Package containing the entity in the code structure (if applicable)
+- Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
 - Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st
index 35a6f970d..b7fc750ae 100644
--- a/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1FileAnchor.class.st
@@ -3,12 +3,12 @@
 ======================
 
 - Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endColumn Type: Number Comment: Number of the end column
+- Named: #endLine Type: Number Comment: Number of the end line
 - Named: #fileName Type: String Comment: Name of the source file
 - Named: #startColumn Type: Number Comment: Number of the start column
 - Named: #startLine Type: Number Comment: Number of the start line
-- Named: #endLine Type: Number Comment: Number of the end line
-- Named: #encoding Type: String Comment: A string representing the encoding of a file
-- Named: #endColumn Type: Number Comment: Number of the end column
 
 "
 Class {
diff --git a/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st b/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st
index 0286fad22..79ada6fee 100644
--- a/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1IndexedFileAnchor.class.st
@@ -2,11 +2,11 @@
 ## Properties
 ======================
 
-- Named: #fileName Type: String Comment: Name of the source file
-- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
 - Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #fileName Type: String Comment: Name of the source file
 - Named: #startPos Type: Number Comment: Start position in the source
-- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
 
 "
 Class {
diff --git a/src/Famix-Test1-Entities/FamixTest1Method.class.st b/src/Famix-Test1-Entities/FamixTest1Method.class.st
index d39ecf821..088eb3350 100644
--- a/src/Famix-Test1-Entities/FamixTest1Method.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1Method.class.st
@@ -6,28 +6,28 @@
 - Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
 - Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
-- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
 - Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
-- Named: #signature Type: String Comment: Signature of the message being sent
-- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
 - Named: #isClassSide Type: Boolean Comment: Entity can be declared class side i.e. static
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #kind Type: String Comment: Tag indicating a setter, getter, constant, constructor method
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Class {
diff --git a/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st b/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st
index 5978afda2..7dd7c946a 100644
--- a/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st
+++ b/src/Famix-Test1-Entities/FamixTest1SourcedEntity.class.st
@@ -3,9 +3,9 @@
 ======================
 
 ### Other
+- Relation: #containerFiles Type: #FamixTFile Opposite: #entities Comment: List of files containing the entity
 - Relation: #declaredSourceLanguage Type: #FamixTSourceLanguage Opposite: #sourcedEntities Comment: The declared SourceLanguage for the source code of this entity
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #containerFiles Type: #FamixTFile Opposite: #entities Comment: List of files containing the entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Test2-Entities/FamixTest2Class.class.st b/src/Famix-Test2-Entities/FamixTest2Class.class.st
index 8f855fc2a..8e1aca066 100644
--- a/src/Famix-Test2-Entities/FamixTest2Class.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2Class.class.st
@@ -9,14 +9,14 @@
 - Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st b/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st
index 6529cabd9..d1043e1c0 100644
--- a/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st
+++ b/src/Famix-Test2-Entities/FamixTest2Inheritance.class.st
@@ -8,8 +8,8 @@
 - Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
 ### Other
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Test3-Entities/FamixTest3Access.class.st b/src/Famix-Test3-Entities/FamixTest3Access.class.st
index ba4666e9b..dd89048cf 100644
--- a/src/Famix-Test3-Entities/FamixTest3Access.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Access.class.st
@@ -7,15 +7,15 @@
 ### Association target
 - Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
 ### Other
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #isWrite Type: Boolean Comment: Write access
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isWrite Type: Boolean Comment: Write access
 
 "
 Class {
diff --git a/src/Famix-Test3-Entities/FamixTest3Attribute.class.st b/src/Famix-Test3-Entities/FamixTest3Attribute.class.st
index dfba52e43..7287615c1 100644
--- a/src/Famix-Test3-Entities/FamixTest3Attribute.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Attribute.class.st
@@ -4,7 +4,7 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
diff --git a/src/Famix-Test3-Entities/FamixTest3Class.class.st b/src/Famix-Test3-Entities/FamixTest3Class.class.st
index d40259ff9..f9b968971 100644
--- a/src/Famix-Test3-Entities/FamixTest3Class.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Class.class.st
@@ -10,14 +10,14 @@
 - Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Famix-Test3-Entities/FamixTest3Invocation.class.st b/src/Famix-Test3-Entities/FamixTest3Invocation.class.st
index 7bc54777a..a12d217a2 100644
--- a/src/Famix-Test3-Entities/FamixTest3Invocation.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Invocation.class.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
 ### Other
-- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
diff --git a/src/Famix-Test3-Entities/FamixTest3Method.class.st b/src/Famix-Test3-Entities/FamixTest3Method.class.st
index db60c6bb9..609eecf6b 100644
--- a/src/Famix-Test3-Entities/FamixTest3Method.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Method.class.st
@@ -10,9 +10,9 @@
 - Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
 - Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
@@ -22,8 +22,8 @@
 ======================
 
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Class {
diff --git a/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st b/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st
index af9f10b5b..6d5eef7cd 100644
--- a/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3PrimitiveType.class.st
@@ -5,7 +5,7 @@
 ### Children
 - Relation: #types Type: #FamixTType Opposite: #typeContainer Comment: Types contained (declared) in this entity, if any.
 #types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 
 
diff --git a/src/Famix-Test3-Entities/FamixTest3Reference.class.st b/src/Famix-Test3-Entities/FamixTest3Reference.class.st
index f8feff999..3c9c26ea6 100644
--- a/src/Famix-Test3-Entities/FamixTest3Reference.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Reference.class.st
@@ -7,8 +7,8 @@
 ### Association target
 - Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
 ### Other
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
diff --git a/src/Famix-Test3-Entities/FamixTest3Type.class.st b/src/Famix-Test3-Entities/FamixTest3Type.class.st
index 637295204..e735e3b7e 100644
--- a/src/Famix-Test3-Entities/FamixTest3Type.class.st
+++ b/src/Famix-Test3-Entities/FamixTest3Type.class.st
@@ -4,11 +4,11 @@
 
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Famix-Test4-Entities/FamixTest4School.class.st b/src/Famix-Test4-Entities/FamixTest4School.class.st
index 059c3602d..06bce983f 100644
--- a/src/Famix-Test4-Entities/FamixTest4School.class.st
+++ b/src/Famix-Test4-Entities/FamixTest4School.class.st
@@ -3,10 +3,10 @@
 ======================
 
 ### Children
+- Relation: #principal Type: #FamixTest4Principal Opposite: #school
 - Relation: #rooms Type: #FamixTest4Room Opposite: #school
-- Relation: #teachers Type: #FamixTest4Teacher Opposite: #school
 - Relation: #students Type: #FamixTest4Student Opposite: #school
-- Relation: #principal Type: #FamixTest4Principal Opposite: #school
+- Relation: #teachers Type: #FamixTest4Teacher Opposite: #school
 
 
 "
diff --git a/src/Famix-Test7-Entities/FamixTest7Class.class.st b/src/Famix-Test7-Entities/FamixTest7Class.class.st
index dfa800f69..ad6b3aa2e 100644
--- a/src/Famix-Test7-Entities/FamixTest7Class.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Class.class.st
@@ -5,24 +5,24 @@
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 
 "
 Class {
diff --git a/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st b/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st
index a59cd80b2..91a4d0feb 100644
--- a/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Inheritance.class.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Test7-Entities/FamixTest7Method.class.st b/src/Famix-Test7-Entities/FamixTest7Method.class.st
index 399bff913..a01fb241c 100644
--- a/src/Famix-Test7-Entities/FamixTest7Method.class.st
+++ b/src/Famix-Test7-Entities/FamixTest7Method.class.st
@@ -6,23 +6,23 @@
 - Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
 - Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
-- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #name Type: String Comment: Basic name of the entity, not full reference.
 - Named: #signature Type: String Comment: Signature of the message being sent
 
 "
diff --git a/src/Famix-Test8-Entities/FamixTest8Animal.class.st b/src/Famix-Test8-Entities/FamixTest8Animal.class.st
index a9f3bc5be..ab86d7624 100644
--- a/src/Famix-Test8-Entities/FamixTest8Animal.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Animal.class.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingInfections Type: #FamixTest8Infection Opposite: #infectious
 
 
diff --git a/src/Famix-Test8-Entities/FamixTest8Biotope.class.st b/src/Famix-Test8-Entities/FamixTest8Biotope.class.st
index b72af6b08..4beca36d7 100644
--- a/src/Famix-Test8-Entities/FamixTest8Biotope.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Biotope.class.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingResidences Type: #FamixTest8Residence Opposite: #biotope
 
 
diff --git a/src/Famix-Test8-Entities/FamixTest8Infection.class.st b/src/Famix-Test8-Entities/FamixTest8Infection.class.st
index fb8fc1345..29dc86643 100644
--- a/src/Famix-Test8-Entities/FamixTest8Infection.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Infection.class.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #infectious Type: #FamixTest8TInfectious Opposite: #incomingInfections
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Test8-Entities/FamixTest8Plant.class.st b/src/Famix-Test8-Entities/FamixTest8Plant.class.st
index 8ac044942..acb0a2748 100644
--- a/src/Famix-Test8-Entities/FamixTest8Plant.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Plant.class.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingInfections Type: #FamixTest8Infection Opposite: #infectious
 
 
diff --git a/src/Famix-Test8-Entities/FamixTest8Residence.class.st b/src/Famix-Test8-Entities/FamixTest8Residence.class.st
index f0db76fdd..b6b613439 100644
--- a/src/Famix-Test8-Entities/FamixTest8Residence.class.st
+++ b/src/Famix-Test8-Entities/FamixTest8Residence.class.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #biotope Type: #FamixTest8TBiotope Opposite: #incomingResidences
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st b/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st
index 7d3719fbe..dc4cf7cd1 100644
--- a/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TBiotope.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingResidences Type: #FamixTest8Residence Opposite: #biotope
 
 
diff --git a/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st b/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st
index 87200a576..427ed8dbd 100644
--- a/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st
+++ b/src/Famix-Test8-Entities/FamixTest8TInfectious.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingInfections Type: #FamixTest8Infection Opposite: #infectious
 
 
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st
index 1a85920eb..125c67173 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedAssociation.class.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #c15 Type: #FamixTestComposed1CustomEntity5 Opposite: #associations
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st
index d5cc67e83..703bcccbf 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity3.class.st
@@ -3,8 +3,8 @@
 ======================
 
 ### Other
-- Relation: #customEntity3 Type: #FamixTestComposed1CustomEntity3 Opposite: #customEntities3
 - Relation: #c23 Type: #FamixTestComposed2CustomEntity3 Opposite: #c3s
+- Relation: #customEntity3 Type: #FamixTestComposed1CustomEntity3 Opposite: #customEntities3
 
 
 "
diff --git a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st
index afa99c405..b377f3575 100644
--- a/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st
+++ b/src/Famix-TestComposedMetamodel-Entities/FamixTestComposedCustomEntity4.class.st
@@ -3,8 +3,8 @@
 ======================
 
 ### Other
-- Relation: #customEntities4 Type: #FamixTestComposed1CustomEntity4 Opposite: #customEntities4
 - Relation: #c24s Type: #FamixTestComposed2CustomEntity4 Opposite: #c4s
+- Relation: #customEntities4 Type: #FamixTestComposed1CustomEntity4 Opposite: #customEntities4
 
 
 "
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st
index e69a19cf1..43509f1d0 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Class.class.st
@@ -5,18 +5,18 @@
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st
index 4e85f1968..e8191af16 100644
--- a/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st
+++ b/src/Famix-TestComposedSubmetamodel1-Entities/FamixTestComposed1Method.class.st
@@ -12,11 +12,11 @@
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
 - Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st
index c88a2ccd7..e8f819c70 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Class.class.st
@@ -5,18 +5,18 @@
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 
 ## Properties
 ======================
diff --git a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st
index 10b1392e5..ca4c3503c 100644
--- a/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st
+++ b/src/Famix-TestComposedSubmetamodel2-Entities/FamixTestComposed2Method.class.st
@@ -5,14 +5,14 @@
 ### Parents
 - Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
-- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
-- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
 - Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
+- Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
 - Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
diff --git a/src/Famix-Traits/FamixTAccess.trait.st b/src/Famix-Traits/FamixTAccess.trait.st
index 3f7c7875f..70d60d783 100644
--- a/src/Famix-Traits/FamixTAccess.trait.st
+++ b/src/Famix-Traits/FamixTAccess.trait.st
@@ -20,15 +20,15 @@ For each access in the source code, there is one famix access created even if it
 ### Association target
 - Relation: #variable Type: #FamixTAccessible Opposite: #incomingAccesses Comment: Variable accessed. to-side of the association
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
 
-- Named: #isWrite Type: Boolean Comment: Write access
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #isWrite Type: Boolean Comment: Write access
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTAccessible.trait.st b/src/Famix-Traits/FamixTAccessible.trait.st
index 7063cc1c4..990470e4f 100644
--- a/src/Famix-Traits/FamixTAccessible.trait.st
+++ b/src/Famix-Traits/FamixTAccessible.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 
 
diff --git a/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st b/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st
index 3f37b71a1..068f19164 100644
--- a/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st
+++ b/src/Famix-Traits/FamixTAnnotationTypeAttribute.trait.st
@@ -21,12 +21,12 @@ Instance Variables:
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
 - Relation: #annotationAttributeInstances Type: #FamixTTypedAnnotationInstanceAttribute Opposite: #annotationTypeAttribute Comment: A collection of AnnotationInstanceAttribute which hold the usages of this attribute in actual AnnotationInstances
+- Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTAssociation.trait.st b/src/Famix-Traits/FamixTAssociation.trait.st
index db0097cc5..b81b95d53 100644
--- a/src/Famix-Traits/FamixTAssociation.trait.st
+++ b/src/Famix-Traits/FamixTAssociation.trait.st
@@ -20,9 +20,9 @@ will produce two invocation associations first from method a to method b, and se
 ======================
 
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTAttribute.trait.st b/src/Famix-Traits/FamixTAttribute.trait.st
index a94b1c51e..bb91eebc6 100644
--- a/src/Famix-Traits/FamixTAttribute.trait.st
+++ b/src/Famix-Traits/FamixTAttribute.trait.st
@@ -6,11 +6,11 @@ FamixTAttribute represents a field of a class. It is an attribute of the parent
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTClass.trait.st b/src/Famix-Traits/FamixTClass.trait.st
index 992a41762..ef8f2c758 100644
--- a/src/Famix-Traits/FamixTClass.trait.st
+++ b/src/Famix-Traits/FamixTClass.trait.st
@@ -15,13 +15,13 @@ A class is typically scoped in a namespace. To model nested or anonymous classes
 - Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
diff --git a/src/Famix-Traits/FamixTClassWithVisibility.trait.st b/src/Famix-Traits/FamixTClassWithVisibility.trait.st
index 12c1a5b96..79e994daf 100644
--- a/src/Famix-Traits/FamixTClassWithVisibility.trait.st
+++ b/src/Famix-Traits/FamixTClassWithVisibility.trait.st
@@ -9,21 +9,21 @@
 - Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
 
-- Named: #visibility Type: String Comment: Visibility of the entity
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #visibility Type: String Comment: Visibility of the entity
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTCompilationUnit.trait.st b/src/Famix-Traits/FamixTCompilationUnit.trait.st
index 253d52104..cb487d4c4 100644
--- a/src/Famix-Traits/FamixTCompilationUnit.trait.st
+++ b/src/Famix-Traits/FamixTCompilationUnit.trait.st
@@ -5,8 +5,8 @@ I represent a compilation unit file. Typically a .c or .cpp file
 ======================
 
 ### Parents
-- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
 - Relation: #compilationUnitOwner Type: #FamixTWithCompilationUnits Opposite: #compilationUnit Comment: The compilation unit that defines this module
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
 ### Other
 - Relation: #entities Type: #FamixTWithFiles Opposite: #containerFiles Comment: List of entities defined in the file
 
diff --git a/src/Famix-Traits/FamixTDereferencedInvocation.trait.st b/src/Famix-Traits/FamixTDereferencedInvocation.trait.st
index ddc2a36d1..cdfb0bc43 100644
--- a/src/Famix-Traits/FamixTDereferencedInvocation.trait.st
+++ b/src/Famix-Traits/FamixTDereferencedInvocation.trait.st
@@ -13,17 +13,17 @@ It has a referencer which is the pointer variable
 ### Association target
 - Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
 ### Other
-- Relation: #referencer Type: #FamixTWithDereferencedInvocations Opposite: #dereferencedInvocations Comment: Structural entity that references the BehaviouralEntity invoked
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #referencer Type: #FamixTWithDereferencedInvocations Opposite: #dereferencedInvocations Comment: Structural entity that references the BehaviouralEntity invoked
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTEnum.trait.st b/src/Famix-Traits/FamixTEnum.trait.st
index bd03b4a80..f88149d2f 100644
--- a/src/Famix-Traits/FamixTEnum.trait.st
+++ b/src/Famix-Traits/FamixTEnum.trait.st
@@ -18,7 +18,7 @@ Instance Variables:
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
 - Relation: #enumValues Type: #FamixTEnumValue Opposite: #parentEnum
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
diff --git a/src/Famix-Traits/FamixTEnumValue.trait.st b/src/Famix-Traits/FamixTEnumValue.trait.st
index c950de792..b8457a14f 100644
--- a/src/Famix-Traits/FamixTEnumValue.trait.st
+++ b/src/Famix-Traits/FamixTEnumValue.trait.st
@@ -16,11 +16,11 @@ Instance Variables:
 
 ### Parents
 - Relation: #parentEnum Type: #FamixTWithEnumValues Opposite: #enumValues Comment: The Enum declaring this value. It offers the implementation of belongsTo
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTException.trait.st b/src/Famix-Traits/FamixTException.trait.st
index 02aeab9ad..5804ec210 100644
--- a/src/Famix-Traits/FamixTException.trait.st
+++ b/src/Famix-Traits/FamixTException.trait.st
@@ -7,21 +7,21 @@ This is the abstract representation of an Exception. It is specific to Java. It
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
-- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
-- Relation: #throwingEntities Type: #FamixTWithExceptions Opposite: #thrownExceptions
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #catchingEntities Type: #FamixTWithExceptions Opposite: #caughtExceptions
+- Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
 - Relation: #declaringEntities Type: #FamixTWithExceptions Opposite: #declaredExceptions
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #throwingEntities Type: #FamixTWithExceptions Opposite: #thrownExceptions
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTFileAnchor.trait.st b/src/Famix-Traits/FamixTFileAnchor.trait.st
index 3b3d613e8..6fd5738b3 100644
--- a/src/Famix-Traits/FamixTFileAnchor.trait.st
+++ b/src/Famix-Traits/FamixTFileAnchor.trait.st
@@ -4,9 +4,9 @@ This offers a source anchor that connects a sourced entity to a file through a r
 ## Properties
 ======================
 
-- Named: #fileName Type: String Comment: Name of the source file
-- Named: #encoding Type: String Comment: A string representing the encoding of a file
 - Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+- Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #fileName Type: String Comment: Name of the source file
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTFileInclude.trait.st b/src/Famix-Traits/FamixTFileInclude.trait.st
index b348a4a2f..911344851 100644
--- a/src/Famix-Traits/FamixTFileInclude.trait.st
+++ b/src/Famix-Traits/FamixTFileInclude.trait.st
@@ -3,11 +3,11 @@
 ======================
 
 ### Other
-- Relation: #target Type: #FamixTWithFileIncludes Opposite: #incomingIncludeRelations Comment: The file that is included
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #source Type: #FamixTWithFileIncludes Opposite: #outgoingIncludeRelations Comment: The file that is including
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #target Type: #FamixTWithFileIncludes Opposite: #incomingIncludeRelations Comment: The file that is included
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTFileNavigation.trait.st b/src/Famix-Traits/FamixTFileNavigation.trait.st
index 2c21e2cda..534aefaf0 100644
--- a/src/Famix-Traits/FamixTFileNavigation.trait.st
+++ b/src/Famix-Traits/FamixTFileNavigation.trait.st
@@ -2,13 +2,13 @@
 ## Properties
 ======================
 
-- Named: #endColumn Type: Number Comment: Number of the end column
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
 - Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endColumn Type: Number Comment: Number of the end column
 - Named: #endLine Type: Number Comment: Number of the end line
-- Named: #startLine Type: Number Comment: Number of the start line
 - Named: #fileName Type: String Comment: Name of the source file
 - Named: #startColumn Type: Number Comment: Number of the start column
-- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+- Named: #startLine Type: Number Comment: Number of the start line
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTFunction.trait.st b/src/Famix-Traits/FamixTFunction.trait.st
index ecaa336e6..2322f1058 100644
--- a/src/Famix-Traits/FamixTFunction.trait.st
+++ b/src/Famix-Traits/FamixTFunction.trait.st
@@ -10,19 +10,19 @@ FamixTFunction represents a behavioural entity in a procedural language.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
 - Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTGlobalVariable.trait.st b/src/Famix-Traits/FamixTGlobalVariable.trait.st
index 21403d45d..9e9fdbc5d 100644
--- a/src/Famix-Traits/FamixTGlobalVariable.trait.st
+++ b/src/Famix-Traits/FamixTGlobalVariable.trait.st
@@ -6,11 +6,11 @@ FamixTGlobalVariable represents a global variable in the source code.
 
 ### Parents
 - Relation: #parentScope Type: #FamixTWithGlobalVariables Opposite: #globalVariables Comment: Scope declaring the global variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTHeader.trait.st b/src/Famix-Traits/FamixTHeader.trait.st
index 8064e1a27..3cd7d6022 100644
--- a/src/Famix-Traits/FamixTHeader.trait.st
+++ b/src/Famix-Traits/FamixTHeader.trait.st
@@ -5,8 +5,8 @@ I represent a header file. Typically a .h or .hpp
 ======================
 
 ### Parents
-- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
 - Relation: #headerOwner Type: #FamixTWithHeaders Opposite: #header
+- Relation: #parentFolder Type: #FamixTFolder Opposite: #childrenFileSystemEntities Comment: Folder entity containing this file.
 ### Other
 - Relation: #entities Type: #FamixTWithFiles Opposite: #containerFiles Comment: List of entities defined in the file
 
diff --git a/src/Famix-Traits/FamixTImplementable.trait.st b/src/Famix-Traits/FamixTImplementable.trait.st
index d6235a260..bdf7d2aa8 100644
--- a/src/Famix-Traits/FamixTImplementable.trait.st
+++ b/src/Famix-Traits/FamixTImplementable.trait.st
@@ -4,7 +4,7 @@ I can be the target of an implementation cf Interface
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #implementations Type: #FamixTImplementation Opposite: #interface Comment: Implementation relationships.
 
 
diff --git a/src/Famix-Traits/FamixTImplementation.trait.st b/src/Famix-Traits/FamixTImplementation.trait.st
index 8b67879aa..2d2851e0c 100644
--- a/src/Famix-Traits/FamixTImplementation.trait.st
+++ b/src/Famix-Traits/FamixTImplementation.trait.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #interface Type: #FamixTImplementable Opposite: #implementations Comment: Interface linked to in this relationship. to-side of the association
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTImplicitVariable.trait.st b/src/Famix-Traits/FamixTImplicitVariable.trait.st
index 695aafa33..f832df4ac 100644
--- a/src/Famix-Traits/FamixTImplicitVariable.trait.st
+++ b/src/Famix-Traits/FamixTImplicitVariable.trait.st
@@ -6,11 +6,11 @@ FamixTImplicitVariable represents a variable defined by the compiler in a contex
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithImplicitVariables Opposite: #implicitVariables Comment: The behaviour containing this implicit variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTImport.trait.st b/src/Famix-Traits/FamixTImport.trait.st
index 53a023f98..8db2b9c0c 100644
--- a/src/Famix-Traits/FamixTImport.trait.st
+++ b/src/Famix-Traits/FamixTImport.trait.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #importedEntity Type: #FamixTImportable Opposite: #incomingImports Comment: Imported entity
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTImportable.trait.st b/src/Famix-Traits/FamixTImportable.trait.st
index efb00726d..5946d7d31 100644
--- a/src/Famix-Traits/FamixTImportable.trait.st
+++ b/src/Famix-Traits/FamixTImportable.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingImports Type: #FamixTImport Opposite: #importedEntity Comment: List of imports of this entity
 
 
diff --git a/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st b/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st
index 6a57435ea..7251e8cea 100644
--- a/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st
+++ b/src/Famix-Traits/FamixTIndexedFileNavigation.trait.st
@@ -2,11 +2,11 @@
 ## Properties
 ======================
 
-- Named: #endPos Type: Number Comment: Stop position in the source
-- Named: #startPos Type: Number Comment: Start position in the source
+- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
 - Named: #encoding Type: String Comment: A string representing the encoding of a file
+- Named: #endPos Type: Number Comment: Stop position in the source
 - Named: #fileName Type: String Comment: Name of the source file
-- Named: #correspondingFile Type: FamixTFile Comment: File associated to this source anchor
+- Named: #startPos Type: Number Comment: Start position in the source
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTInheritance.trait.st b/src/Famix-Traits/FamixTInheritance.trait.st
index 7f963923a..5400c2806 100644
--- a/src/Famix-Traits/FamixTInheritance.trait.st
+++ b/src/Famix-Traits/FamixTInheritance.trait.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTInvocable.trait.st b/src/Famix-Traits/FamixTInvocable.trait.st
index e8a1d6f4e..9e15a5999 100644
--- a/src/Famix-Traits/FamixTInvocable.trait.st
+++ b/src/Famix-Traits/FamixTInvocable.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 
 
diff --git a/src/Famix-Traits/FamixTInvocation.trait.st b/src/Famix-Traits/FamixTInvocation.trait.st
index 9e8fa61f4..594430a9e 100644
--- a/src/Famix-Traits/FamixTInvocation.trait.st
+++ b/src/Famix-Traits/FamixTInvocation.trait.st
@@ -17,16 +17,16 @@ will produce one invocation association from current method to a variable anObje
 ### Association target
 - Relation: #candidates Type: #FamixTInvocable Opposite: #incomingInvocations Comment: List of candidate behavioural entities for receiving the invocation
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #receiver Type: #FamixTInvocationsReceiver Opposite: #receivingInvocations Comment: Named entity (variable, class...) receiving the invocation. to-side of the association
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTLocalVariable.trait.st b/src/Famix-Traits/FamixTLocalVariable.trait.st
index 69e158065..f2791df70 100644
--- a/src/Famix-Traits/FamixTLocalVariable.trait.st
+++ b/src/Famix-Traits/FamixTLocalVariable.trait.st
@@ -6,11 +6,11 @@ FamixTLocalVariable represents a local variable in the scope of a behavioural en
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithLocalVariables Opposite: #localVariables Comment: Behavioural entity declaring this local variable. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTMethod.trait.st b/src/Famix-Traits/FamixTMethod.trait.st
index 896437526..91878a58a 100644
--- a/src/Famix-Traits/FamixTMethod.trait.st
+++ b/src/Famix-Traits/FamixTMethod.trait.st
@@ -9,25 +9,25 @@ A FamixTMethod is always contained in a parentType.
 ### Parents
 - Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
-- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 - Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
+- Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
-### Incomming dependencies
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Trait {
diff --git a/src/Famix-Traits/FamixTParameter.trait.st b/src/Famix-Traits/FamixTParameter.trait.st
index ed380d748..854bb47ac 100644
--- a/src/Famix-Traits/FamixTParameter.trait.st
+++ b/src/Famix-Traits/FamixTParameter.trait.st
@@ -15,11 +15,11 @@ int addNumbers(int a, int b) {
 
 ### Parents
 - Relation: #parentBehaviouralEntity Type: #FamixTWithParameters Opposite: #parameters Comment: Behavioural entity containing this parameter. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTPrimitiveType.trait.st b/src/Famix-Traits/FamixTPrimitiveType.trait.st
index c34c23b23..11780d683 100644
--- a/src/Famix-Traits/FamixTPrimitiveType.trait.st
+++ b/src/Famix-Traits/FamixTPrimitiveType.trait.st
@@ -4,7 +4,7 @@
 
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
diff --git a/src/Famix-Traits/FamixTReference.trait.st b/src/Famix-Traits/FamixTReference.trait.st
index dff20b0b1..b3c7debbb 100644
--- a/src/Famix-Traits/FamixTReference.trait.st
+++ b/src/Famix-Traits/FamixTReference.trait.st
@@ -19,9 +19,9 @@ Note that FamixTReference was defined between two FamixTContainerEntity entities
 ### Association target
 - Relation: #referredType Type: #FamixTReferenceable Opposite: #incomingReferences Comment: Target entity referenced. to-side of the association
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTReferenceable.trait.st b/src/Famix-Traits/FamixTReferenceable.trait.st
index 13a058c99..6f0e10921 100644
--- a/src/Famix-Traits/FamixTReferenceable.trait.st
+++ b/src/Famix-Traits/FamixTReferenceable.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 
 
diff --git a/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st b/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
index be86c5c82..5fe485812 100644
--- a/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
+++ b/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
@@ -23,8 +23,8 @@ Internal Representation and Key Implementation Points.
 ## Properties
 ======================
 
-- Named: #relatedAnchor Type: FamixTSourceAnchor Comment: Source anchor to which I am relative.
 - Named: #endPos Type: Number Comment: Stop position in the source
+- Named: #relatedAnchor Type: FamixTSourceAnchor Comment: Source anchor to which I am relative.
 - Named: #startPos Type: Number Comment: Start position in the source
 
 "
diff --git a/src/Famix-Traits/FamixTStructuralEntity.trait.st b/src/Famix-Traits/FamixTStructuralEntity.trait.st
index 991831569..fce5a0016 100644
--- a/src/Famix-Traits/FamixTStructuralEntity.trait.st
+++ b/src/Famix-Traits/FamixTStructuralEntity.trait.st
@@ -4,11 +4,11 @@ FamixTStructuralEntity is the abstract superclass for basic data structure in th
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTTraitUsage.trait.st b/src/Famix-Traits/FamixTTraitUsage.trait.st
index 2389e27e0..e82f6bbc7 100644
--- a/src/Famix-Traits/FamixTTraitUsage.trait.st
+++ b/src/Famix-Traits/FamixTTraitUsage.trait.st
@@ -7,9 +7,9 @@
 ### Association target
 - Relation: #user Type: #FamixTTraitUser Opposite: #outgoingTraitUsages
 ### Other
+- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
-- Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTTraitUser.trait.st b/src/Famix-Traits/FamixTTraitUser.trait.st
index 170b87e84..a9122bd2a 100644
--- a/src/Famix-Traits/FamixTTraitUser.trait.st
+++ b/src/Famix-Traits/FamixTTraitUser.trait.st
@@ -2,7 +2,7 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #outgoingTraitUsages Type: #FamixTTraitUsage Opposite: #user
 
 
diff --git a/src/Famix-Traits/FamixTType.trait.st b/src/Famix-Traits/FamixTType.trait.st
index 8565ccae2..48d1d0c5f 100644
--- a/src/Famix-Traits/FamixTType.trait.st
+++ b/src/Famix-Traits/FamixTType.trait.st
@@ -10,7 +10,7 @@ A type can have multiple subtypes or supertypes. These are modelled by means of
 
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
diff --git a/src/Famix-Traits/FamixTUnknownVariable.trait.st b/src/Famix-Traits/FamixTUnknownVariable.trait.st
index 492060fad..bc775b5c2 100644
--- a/src/Famix-Traits/FamixTUnknownVariable.trait.st
+++ b/src/Famix-Traits/FamixTUnknownVariable.trait.st
@@ -2,11 +2,11 @@
 ## Relations
 ======================
 
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
-- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
+- Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
 ======================
diff --git a/src/Famix-Traits/FamixTWithExceptions.trait.st b/src/Famix-Traits/FamixTWithExceptions.trait.st
index a78e95a4d..d8a7bdb4b 100644
--- a/src/Famix-Traits/FamixTWithExceptions.trait.st
+++ b/src/Famix-Traits/FamixTWithExceptions.trait.st
@@ -3,9 +3,9 @@
 ======================
 
 ### Other
+- Relation: #caughtExceptions Type: #FamixTException Opposite: #catchingEntities Comment: The exceptions caught by the method
 - Relation: #declaredExceptions Type: #FamixTException Opposite: #declaringEntities Comment: The exceptions declared by the method
 - Relation: #thrownExceptions Type: #FamixTException Opposite: #throwingEntities Comment: The exceptions thrown by the method
-- Relation: #caughtExceptions Type: #FamixTException Opposite: #catchingEntities Comment: The exceptions caught by the method
 
 
 "
diff --git a/src/Famix-Traits/FamixTWithFileIncludes.trait.st b/src/Famix-Traits/FamixTWithFileIncludes.trait.st
index 19b4bfdfd..151d8aaea 100644
--- a/src/Famix-Traits/FamixTWithFileIncludes.trait.st
+++ b/src/Famix-Traits/FamixTWithFileIncludes.trait.st
@@ -3,8 +3,8 @@
 ======================
 
 ### Other
-- Relation: #outgoingIncludeRelations Type: #FamixTFileInclude Opposite: #source Comment: The include entities that have this file as a source.
 - Relation: #incomingIncludeRelations Type: #FamixTFileInclude Opposite: #target Comment: The include entities that have this file as a target.
+- Relation: #outgoingIncludeRelations Type: #FamixTFileInclude Opposite: #source Comment: The include entities that have this file as a source.
 
 
 "
diff --git a/src/Famix-Traits/FamixTWithInheritances.trait.st b/src/Famix-Traits/FamixTWithInheritances.trait.st
index c8eafa3da..1b54ef2f8 100644
--- a/src/Famix-Traits/FamixTWithInheritances.trait.st
+++ b/src/Famix-Traits/FamixTWithInheritances.trait.st
@@ -4,7 +4,7 @@
 
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 
 
diff --git a/src/Famix-Traits/FamixTWithStatements.trait.st b/src/Famix-Traits/FamixTWithStatements.trait.st
index 6362f0342..77664ce17 100644
--- a/src/Famix-Traits/FamixTWithStatements.trait.st
+++ b/src/Famix-Traits/FamixTWithStatements.trait.st
@@ -3,9 +3,9 @@
 ======================
 
 ### Outgoing dependencies
-- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
+- Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
 ### Other
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
diff --git a/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st b/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
index 9d39c4d06..3e6cccd8d 100644
--- a/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
+++ b/src/FamixDocumentor-TestMetaModel/FDTrait4.trait.st
@@ -8,8 +8,8 @@
 ## Properties
 ======================
 
-- Named: #someProp Type: String Comment: A property in the trait
 - Named: #otherProp Type: Object Comment: Another property in the trait
+- Named: #someProp Type: String Comment: A property in the trait
 
 "
 Trait {
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st
index 2d6185f81..21059b305 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestAttribute.class.st
@@ -4,7 +4,7 @@
 
 ### Parents
 - Relation: #parentType Type: #FamixTWithAttributes Opposite: #attributes Comment: Type declaring the attribute. belongsTo implementation
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingAccesses Type: #FamixTAccess Opposite: #variable Comment: All Famix accesses pointing to this structural entity
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st
index 490640fff..80e3656b2 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestClass.class.st
@@ -5,18 +5,18 @@
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
 ### Children
-- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 - Relation: #attributes Type: #FamixTAttribute Opposite: #parentType Comment: List of attributes declared by this type.
+- Relation: #methods Type: #FamixTMethod Opposite: #parentType Comment: Methods declared by this type.
 ### Outgoing dependencies
 - Relation: #superInheritances Type: #FamixTInheritance Opposite: #subclass Comment: Superinheritance relationships, i.e. known superclasses of this type.
-### Incomming dependencies
-- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
+- Relation: #subInheritances Type: #FamixTInheritance Opposite: #superclass Comment: Subinheritance relationships, i.e. known subclasses of this type.
 ### Other
-- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 - Relation: #comments Type: #FamixTComment Opposite: #commentedEntity Comment: List of comments for the entity
+- Relation: #receivingInvocations Type: #FamixTInvocation Opposite: #receiver Comment: List of invocations performed on this entity (considered as the receiver)
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st
index 497083588..4d0fb2dad 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestInheritance.class.st
@@ -7,8 +7,8 @@
 ### Association target
 - Relation: #superclass Type: #FamixTWithInheritances Opposite: #subInheritances Comment: Superclass linked to in this relationship. to-side of the association
 ### Other
-- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #next Type: #FamixTAssociation Opposite: #previous Comment: Next association in an ordered collection of associations. Currently not supported by the Moose importer
+- Relation: #previous Type: #FamixTAssociation Opposite: #next Comment: Previous association in an ordered collection of associations. Currently not supported by the Moose importer
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
 
 ## Properties
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st
index 0c2a5ecf4..39046ecde 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestMethod.class.st
@@ -5,14 +5,14 @@
 ### Parents
 - Relation: #parentType Type: #FamixTWithMethods Opposite: #methods Comment: Type declaring the method. It provides the implementation for belongsTo.
 ### Children
+- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
 - Relation: #localVariables Type: #FamixTLocalVariable Opposite: #parentBehaviouralEntity Comment: Variables locally defined by this behaviour.
 - Relation: #parameters Type: #FamixTParameter Opposite: #parentBehaviouralEntity Comment: List of formal parameters declared by this behaviour.
-- Relation: #implicitVariables Type: #FamixTImplicitVariable Opposite: #parentBehaviouralEntity Comment: Implicit variables used locally by this behaviour.
 ### Outgoing dependencies
-- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #accesses Type: #FamixTAccess Opposite: #accessor Comment: Accesses to variables made by this behaviour.
+- Relation: #outgoingInvocations Type: #FamixTInvocation Opposite: #sender Comment: Outgoing invocations sent by this behaviour.
 - Relation: #outgoingReferences Type: #FamixTReference Opposite: #referencer Comment: References from this entity to other entities.
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingInvocations Type: #FamixTInvocation Opposite: #candidates Comment: Incoming invocations from other behaviours computed by the candidate operator.
 ### Other
 - Relation: #declaredType Type: #FamixTType Opposite: #typedEntities Comment: Type of the entity, if any
@@ -21,9 +21,9 @@
 ## Properties
 ======================
 
-- Named: #signature Type: String Comment: Signature of the message being sent
 - Named: #isStub Type: Boolean Comment: Flag true if the entity attributes are incomplete, either because the entity is missing or not imported.
 - Named: #name Type: String Comment: Basic name of the entity, not full reference.
+- Named: #signature Type: String Comment: Signature of the message being sent
 
 "
 Class {
diff --git a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st
index b9ce860c4..318f9e4fb 100644
--- a/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st
+++ b/src/Moose-Core-Tests-Entities/MooseMSEImporterTestPrimitiveType.class.st
@@ -4,11 +4,11 @@
 
 ### Parents
 - Relation: #typeContainer Type: #FamixTWithTypes Opposite: #types Comment: Container entity to which this type belongs. Container is a namespace, not a package (Smalltalk).
-### Incomming dependencies
+### Incoming dependencies
 - Relation: #incomingReferences Type: #FamixTReference Opposite: #referredType Comment: References to this entity by other entities.
 ### Other
-- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 - Relation: #sourceAnchor Type: #FamixTSourceAnchor Opposite: #element Comment: SourceAnchor entity linking to the original source code for this entity
+- Relation: #typedEntities Type: #FamixTTypedEntity Opposite: #declaredType Comment: Entities that have this type as declaredType
 
 ## Properties
 ======================

From 2cd7d1f0bcc2d7718c3f9a6f9ac8e56eb22547f0 Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.me>
Date: Mon, 15 Jan 2024 17:23:51 +0100
Subject: [PATCH 3/4] Fix more tests

---
 .../FmxMBBehaviorTest.class.st                   |  6 ++----
 .../FmxMBBuilderTest.class.st                    | 16 ++++++----------
 .../FmxMBClassTest.class.st                      |  6 ++----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/Famix-MetamodelBuilder-Tests/FmxMBBehaviorTest.class.st b/src/Famix-MetamodelBuilder-Tests/FmxMBBehaviorTest.class.st
index a8e44d923..07961ab25 100644
--- a/src/Famix-MetamodelBuilder-Tests/FmxMBBehaviorTest.class.st
+++ b/src/Famix-MetamodelBuilder-Tests/FmxMBBehaviorTest.class.st
@@ -24,17 +24,15 @@ FmxMBBehaviorTest >> newEntityNamed: aString [
 
 { #category : #tests }
 FmxMBBehaviorTest >> testComment [
-
 	"test assigning of a comment to a class"
 
 	| simpleClass generated commentString |
-	
-	simpleClass := self newEntityNamed: #Comment.	
+	simpleClass := self newEntityNamed: #Comment.
 	commentString := 'Simple testing class'.
 	simpleClass comment: commentString.
 	builder generate.
 	generated := builder testingEnvironment ask classNamed: 'TstComment'.
-	self assert: generated comment content equals: commentString.
+	self assert: (generated comment content beginsWith: commentString)
 ]
 
 { #category : #tests }
diff --git a/src/Famix-MetamodelBuilder-Tests/FmxMBBuilderTest.class.st b/src/Famix-MetamodelBuilder-Tests/FmxMBBuilderTest.class.st
index 321ccbf78..e48d6a7a9 100644
--- a/src/Famix-MetamodelBuilder-Tests/FmxMBBuilderTest.class.st
+++ b/src/Famix-MetamodelBuilder-Tests/FmxMBBuilderTest.class.st
@@ -121,32 +121,28 @@ FmxMBBuilderTest >> testMultipleTraitsCreation [
 FmxMBBuilderTest >> testNewClassNamedComment [
 
 	| c1 aClass |
-	
 	aClass := builder newClassNamed: #C1 comment: 'comment'.
 	self assert: aClass comment equals: 'comment'.
 	self assert: aClass isMetamodelClass.
-	
+
 	builder generate.
-	
+
 	c1 := builder testingEnvironment ask classNamed: 'TstC1'.
-	self assert: c1 comment content equals: 'comment'
-	
+	self assert: (c1 comment content beginsWith: 'comment')
 ]
 
 { #category : #tests }
 FmxMBBuilderTest >> testNewTraitNamedComment [
 
 	| t1 aTrait |
-	
 	aTrait := builder newTraitNamed: #T1 comment: 'comment'.
 	self assert: aTrait comment equals: 'comment'.
 	self assert: aTrait isMetamodelTrait.
-	
+
 	builder generate.
-	
+
 	t1 := builder testingEnvironment ask traitNamed: 'TstT1'.
-	self assert: t1 comment content equals: 'comment'
-	
+	self assert: (t1 comment content beginsWith: 'comment')
 ]
 
 { #category : #tests }
diff --git a/src/Famix-MetamodelBuilder-Tests/FmxMBClassTest.class.st b/src/Famix-MetamodelBuilder-Tests/FmxMBClassTest.class.st
index e03e1e377..364ff0514 100644
--- a/src/Famix-MetamodelBuilder-Tests/FmxMBClassTest.class.st
+++ b/src/Famix-MetamodelBuilder-Tests/FmxMBClassTest.class.st
@@ -101,17 +101,15 @@ FmxMBClassTest >> testBuilderPrefixChange [
 
 { #category : #tests }
 FmxMBClassTest >> testCommentOnTrait [
-
 	"test assigning of a comment to a trait"
 
 	| simpleTrait generated commentString |
-	
-	simpleTrait := builder newTraitNamed: #TComment.	
+	simpleTrait := builder newTraitNamed: #TComment.
 	commentString := 'Simple testing class'.
 	simpleTrait comment: commentString.
 	builder generate.
 	generated := builder testingEnvironment ask classNamed: 'TstTComment'.
-	self assert: generated comment content equals: commentString.
+	self assert: (generated comment content beginsWith: commentString)
 ]
 
 { #category : #'tests - settings' }

From 8754aa8e62ce71ecb4b5355ee7d6c0fb8849f70c Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.me>
Date: Tue, 16 Jan 2024 14:16:47 +0100
Subject: [PATCH 4/4] Use cr instead of lf since it's used internally by Pharo

---
 .../FmxMBBehavior.class.st                    | 20 +++++++++----------
 .../FmxMBRealRingEnvironment.class.st         |  1 +
 src/Famix-Traits/FamixTAssociation.trait.st   |  1 +
 src/Famix-Traits/FamixTAttribute.trait.st     |  1 +
 .../FamixTGlobalVariable.trait.st             |  1 +
 src/Famix-Traits/FamixTInvocation.trait.st    |  1 +
 src/Famix-Traits/FamixTModule.trait.st        |  1 +
 src/Famix-Traits/FamixTParameter.trait.st     |  1 +
 .../FamixTRelativeSourceAnchor.trait.st       |  1 +
 9 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
index c370cfe14..a4f3568fe 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBBehavior.class.st
@@ -121,14 +121,14 @@ FmxMBBehavior >> commentWithRelations [
 		  aStream nextPutAll: self comment.
 		  self comment ifNotEmpty: [
 			  aStream
-				  lf;
-				  lf ].
+				  cr;
+				  cr ].
 		  self allRelations ifNotEmpty: [ :rels |
 			  aStream
 				  nextPutAll: '## Relations
 ======================';
-				  lf;
-				  lf.
+				  cr;
+				  cr.
 			  OrderedDictionary new
 				  at: 'Parents' put: [ :relation | relation side isContainer ];
 				  at: 'Children' put: [ :relation | relation oppositeSide isContainer ];
@@ -146,7 +146,7 @@ FmxMBBehavior >> commentWithRelations [
 							  aStream
 								  nextPutAll: '### ';
 								  nextPutAll: relationKind;
-								  lf.
+								  cr.
 
 							  (parents sorted: [ :parent | parent side generationStrategy relationSide name ] ascending) do: [ :parent |
 								  | strategy |
@@ -165,15 +165,15 @@ FmxMBBehavior >> commentWithRelations [
 										  nextPutAll: ' Comment: ';
 										  nextPutAll: com ].
 
-								  aStream lf ] ] ].
-			  aStream lf ].
+								  aStream cr ] ] ].
+			  aStream cr ].
 
 		  (self allProperties reject: [ :p | p isRelation ]) ifNotEmpty: [ :props |
 			  aStream
 				  nextPutAll: '## Properties
 ======================';
-				  lf;
-				  lf.
+				  cr;
+				  cr.
 
 			  (props sorted: #name ascending) do: [ :property |
 				  aStream
@@ -186,7 +186,7 @@ FmxMBBehavior >> commentWithRelations [
 					  aStream
 						  nextPutAll: ' Comment: ';
 						  nextPutAll: com ].
-				  aStream lf ] ] ]
+				  aStream cr ] ] ]
 ]
 
 { #category : #'settings - default' }
diff --git a/src/Famix-MetamodelBuilder-Core/FmxMBRealRingEnvironment.class.st b/src/Famix-MetamodelBuilder-Core/FmxMBRealRingEnvironment.class.st
index 834c1ef01..319257128 100644
--- a/src/Famix-MetamodelBuilder-Core/FmxMBRealRingEnvironment.class.st
+++ b/src/Famix-MetamodelBuilder-Core/FmxMBRealRingEnvironment.class.st
@@ -113,6 +113,7 @@ FmxMBRealRingEnvironment >> recordClassChangesFor: aRGClass [
 
 { #category : #installing }
 FmxMBRealRingEnvironment >> recordClassCommentChangeOf: realClass to: anRGClass [
+
 	| newComment |
 	newComment := anRGClass comment content.
 	(realClass isNotNil and: [ newComment = realClass comment ]) ifTrue: [ ^ self ].
diff --git a/src/Famix-Traits/FamixTAssociation.trait.st b/src/Famix-Traits/FamixTAssociation.trait.st
index b81b95d53..539d97fce 100644
--- a/src/Famix-Traits/FamixTAssociation.trait.st
+++ b/src/Famix-Traits/FamixTAssociation.trait.st
@@ -16,6 +16,7 @@ will produce two invocation associations first from method a to method b, and se
 
 
 
+
 ## Relations
 ======================
 
diff --git a/src/Famix-Traits/FamixTAttribute.trait.st b/src/Famix-Traits/FamixTAttribute.trait.st
index bb91eebc6..3cf0520c5 100644
--- a/src/Famix-Traits/FamixTAttribute.trait.st
+++ b/src/Famix-Traits/FamixTAttribute.trait.st
@@ -1,6 +1,7 @@
 "
 FamixTAttribute represents a field of a class. It is an attribute of the parent type.
 
+
 ## Relations
 ======================
 
diff --git a/src/Famix-Traits/FamixTGlobalVariable.trait.st b/src/Famix-Traits/FamixTGlobalVariable.trait.st
index 9e9fdbc5d..e2181550f 100644
--- a/src/Famix-Traits/FamixTGlobalVariable.trait.st
+++ b/src/Famix-Traits/FamixTGlobalVariable.trait.st
@@ -1,6 +1,7 @@
 "
 FamixTGlobalVariable represents a global variable in the source code.
 
+
 ## Relations
 ======================
 
diff --git a/src/Famix-Traits/FamixTInvocation.trait.st b/src/Famix-Traits/FamixTInvocation.trait.st
index 594430a9e..cf1877691 100644
--- a/src/Famix-Traits/FamixTInvocation.trait.st
+++ b/src/Famix-Traits/FamixTInvocation.trait.st
@@ -9,6 +9,7 @@ In an invocation, From is the sender of the message and To is the list of candid
 anObject aSelector.
 will produce one invocation association from current method to a variable anObject with candidate aSelector. The list of candidates will also contain all the methods defining a similar signature as aSelector. 
 
+
 ## Relations
 ======================
 
diff --git a/src/Famix-Traits/FamixTModule.trait.st b/src/Famix-Traits/FamixTModule.trait.st
index a322083f8..572632861 100644
--- a/src/Famix-Traits/FamixTModule.trait.st
+++ b/src/Famix-Traits/FamixTModule.trait.st
@@ -1,6 +1,7 @@
 "
 FamixTModule represents a that basically provides a simple scoping abstraction for a .C/.CPP/.H files.
 
+
 ## Relations
 ======================
 
diff --git a/src/Famix-Traits/FamixTParameter.trait.st b/src/Famix-Traits/FamixTParameter.trait.st
index 854bb47ac..7f5c0f5f2 100644
--- a/src/Famix-Traits/FamixTParameter.trait.st
+++ b/src/Famix-Traits/FamixTParameter.trait.st
@@ -10,6 +10,7 @@ int addNumbers(int a, int b) {
 }
 ```
 
+
 ## Relations
 ======================
 
diff --git a/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st b/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
index 5fe485812..83b11f4da 100644
--- a/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
+++ b/src/Famix-Traits/FamixTRelativeSourceAnchor.trait.st
@@ -14,6 +14,7 @@ Internal Representation and Key Implementation Points.
 	relatedAnchor:			<aSourceAnchor>			The anchor I'll get my relative sources from.
 	startPos:					<anInteger>				Position of the first character of my source in the source text of the relative anchor.
 
+
 ## Relations
 ======================