diff --git a/airflow/dags/EOSC_indexes.py b/airflow/dags/EOSC_indexes.py
index 93218a7..edd7fd4 100644
--- a/airflow/dags/EOSC_indexes.py
+++ b/airflow/dags/EOSC_indexes.py
@@ -6,15 +6,26 @@ mappings['datasource'] = {
         "data_source_classification": {
             "type": "keyword"
         },
+        "eoscId": {
+            "type": "keyword"
+        },
+        "identifiers": {
+            "type": "object",
+            "properties": {
+                "scheme": {
+                    "type": "keyword"
+                },
+                "value": {
+                    "type": "keyword"
+                }
+            }
+        },
         "jurisdiction": {
             "type": "keyword"
         },
         "local_identifier": {
             "type": "keyword"
         },
-        "eoscId": {
-            "type": "keyword"
-        },
         "name": {
             "fields": {
                 "keyword": {
@@ -23,6 +34,44 @@ mappings['datasource'] = {
             },
             "type": "text"
         },
+        "organization": {
+            "type": "object",
+            "properties": {
+                "isni": {
+                    "type": "keyword"
+                },
+                "local_identifier": {
+                    "type": "keyword"
+                },
+                "name": {
+                    "fields": {
+                        "keyword": {
+                            "type": "keyword",
+                            "ignore_above": 256
+                        }
+                    },
+                    "type": "text"
+                },
+                "rinGold": {
+                    "type": "keyword"
+                },
+                "ror": {
+                    "type": "keyword"
+                },
+                "wikidata": {
+                    "type": "keyword"
+                }
+            }
+        },
+        "preservation_policy_url": {
+            "type": "text"
+        },
+        "research_product_access_policy": {
+            "type": "keyword"
+        },
+        "research_product_metadata_access_policy": {
+            "type": "keyword"
+        },
         "research_product_type": {
             "type": "keyword"
         },
@@ -31,54 +80,7 @@ mappings['datasource'] = {
         },
         "version_control": {
             "type": "boolean"
-        },
-
-        # TODO: THOSE WERE NOT INFERREd AUTOMATICALLY
-        "submission_policy_url": {
-            "type": "text"
-        },
-        "preservation_policy_url": {
-            "type": "text"
-        },
-        "persistent_identity_systems": {
-            "type": "object",
-            "properties": {
-                "product_type": {
-                    "type": "keyword"
-                },
-                "pid_schemes": {
-                    "type": "keyword"
-                }
-            }
-        },
-        "research_product_license": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "text"
-                },
-                "url": {
-                    "type": "text"
-                }
-            }
-        },
-        "research_product_access_policy": {
-            "type": "keyword"
-        },
-        "research_metadata_license": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "text"
-                },
-                "url": {
-                    "type": "text"
-                }
-            }
-        },
-        "research_metadata_access_policy": {
-            "type": "keyword"
-        },
+        }
     }
 }
 
@@ -241,7 +243,7 @@ mappings['organizations'] = {
 
 mappings['grants'] = {
     "properties": {
-        "acronym": {  # TODO: could be keyword only??
+        "acronym": {
             "fields": {
                 "keyword": {
                     "type": "keyword"
@@ -249,6 +251,35 @@ mappings['grants'] = {
             },
             "type": "text"
         },
+        "beneficiaries": {
+            "type": "object",
+            "properties": {
+                "isni": {
+                    "type": "keyword"
+                },
+                "local_identifier": {
+                    "type": "keyword"
+                },
+                "name": {
+                    "fields": {
+                        "keyword": {
+                            "type": "keyword",
+                            "ignore_above": 256
+                        }
+                    },
+                    "type": "text"
+                },
+                "rinGold": {
+                    "type": "keyword"
+                },
+                "ror": {
+                    "type": "keyword"
+                },
+                "wikidata": {
+                    "type": "keyword"
+                }
+            }
+        },
         "currency": {
             "type": "keyword"
         },