diff --git a/scripts/update_metadata_docs.py b/scripts/update_metadata_docs.py
old mode 100644
new mode 100755
diff --git a/user_docs/metadata/data_dictionary/Individual.md b/user_docs/metadata/data_dictionary/Individual.md
index 13fee27..709733a 100644
--- a/user_docs/metadata/data_dictionary/Individual.md
+++ b/user_docs/metadata/data_dictionary/Individual.md
@@ -35,19 +35,19 @@ An Individual is a Person who is participating in a Study.
///
### ***geographical_region_term***
-**description** : The geographical region where the Individual is located.
+**description** : The geographical region where the Individual is located. The Geographical Region is captured using a concept from the NCIT "country" class (NCIT:C25464) (e.g., Austria, Germany, Italy).
**required** : False
**data type** : string
### ***geographical_region_id***
-**description** : The geographical region where the Individual is located.
+**description** : The corresponding ID to the NCIT vocabulary (e.g., NCIT:C16312, NCIT:C16636, NCIT:C16761).
**required** : False
**data type** : string
### ***ancestry_terms***
-**description** : A person's descent or lineage from a population.
+**description** : A person's descent or lineage from a population. The Ancestry is captured using a concept from the Human Ancestry Ontology "ancestry category" (HANCESTRO:0004) branch (e.g., African, European, Oceanian).
**required** : False
**data type** : string
### ***ancestry_ids***
-**description** : A person's descent or lineage from a population.
+**description** : The corresponding ID to the HANCESTRO vocabulary (e.g., HANCESTRO:0010, HANCESTRO:0005, HANCESTRO:0017).
**required** : False
**data type** : string
### ***alias***
diff --git a/user_docs/metadata/data_dictionary/Sample.md b/user_docs/metadata/data_dictionary/Sample.md
index 7bca9a7..97c05ae 100644
--- a/user_docs/metadata/data_dictionary/Sample.md
+++ b/user_docs/metadata/data_dictionary/Sample.md
@@ -150,11 +150,11 @@ A Sample is a limited quantity of something to be used for testing, analysis, in
### ***biospecimen_tissue_term***
**description** : The tissue this Biospecimen originated from. Should be a term from the BRENDA Tissue Ontology vocabulary (e.g., kidney, blood, melanoma cell).
-**required** : True
+**required** : False
**data type** : string
### ***biospecimen_tissue_id***
**description** : The corresponding ontology ID for the biospecimen_tissue_term (e.g., BTO:0000671, BTO:0000089, BTO:0000848).
-**required** : True
+**required** : False
**data type** : string
### ***biospecimen_isolation***
**description** : Method or device employed for collecting/isolating this Biospecimen.
diff --git a/user_docs/metadata/entities.md b/user_docs/metadata/entities.md
index 916a09f..ffb28e4 100644
--- a/user_docs/metadata/entities.md
+++ b/user_docs/metadata/entities.md
@@ -25,19 +25,17 @@ If the data submitters have additional information to provide about the *Individ
#### **Individual Supporting File metadata properties**
The **Individual Supporting File** requires the following information: file format, file name, dataset associated with this file as well as if the file is included as part of the submission.
-### **Biospecimen/Sample**
+### **Sample**
-The *Biospecimen/Sample* describes the extracted sample and tissue for an experimental process. Furthermore, a *Sample* is defined as a limited quantity of something to be used for testing, analysis, inspection, investigation, demonstration, or trial use. A sample is prepared from a biospecimen (isolate or tissue).
+The *Sample* describes the extracted sample and tissue for an experimental process. Furthermore, the *Sample* is defined as a limited quantity of something to be used for testing, analysis, inspection, investigation, demonstration, or trial use. A sample is prepared from a biospecimen (isolate or tissue). The *Sample* entity includes slots describing the *Biospecimen* from which the sample was prepared, which are highlighted with a "*biospecimen_*" -prefix. The *Biospecimen* is defined as any natural material taken from a biological entity for testing, diagnostics, treatment or research purposes.
-A *Biospecimen* is defined in GHGAs metadata as any natural material taken from a biological entity for testing, diagnostics, treatment or research purposes. The *Biospecimen* is linked to the *Individual* entity from which the biospecimen itself has been derived.
+The *Sample* is linked to the *Individual* entity describing the collection of biological material. Further, it is linked to the *Experiment*.
-The *Biospecimen/Sample* is linked to the *Individual* entity describing the collection of biological material. Further, it is linked to the *Experiment*.
-
-#### **Biospecimen/Sample metadata properties**
+#### **Sample metadata properties**
The *Sample* entity requires data submitters to provide the name, description, whether the sample is case or control, as well as the alias to the *Individual* from which the *Sample* was derived. In addition to the mandatory information, the data submitter is recommended to provide information about the storage, whether the sample can be classified as diseased or healthy, and biological replicate information. Other optional fields include the type of the sample and an EGA accession ID.
-The *Biospecimen* entity requires data submitters to provide information about the age of the individual at the time of sampling and the biospecimen tissue. The recommended properties include a name for the biospecimen, its type, the vital status of the individual at the time of sampling, and the biospecimen isolation and storage.
+To further describe the *Biospecimen* from which the sample was prepared, data submitters are required to provide information about the age of the individual at the time of sampling and the biospecimen tissue. The recommended properties include a name for the biospecimen, its type, the vital status of the individual at the time of sampling, and the biospecimen isolation and storage.
### **Experiment**