diff --git a/airflow/dags/EOSC_indexes.py b/airflow/dags/EOSC_indexes.py
index 365bfd5..93218a7 100644
--- a/airflow/dags/EOSC_indexes.py
+++ b/airflow/dags/EOSC_indexes.py
@@ -326,6 +326,7 @@ mappings['grants'] = {
 mappings['products'] = {
     "properties": {
         ### Syntethic fields
+        ### generated by transformation
         "accessRights": {
             "type": "keyword"
         },
@@ -346,7 +347,7 @@ mappings['products'] = {
         "keyword": {
             "type": "keyword"
         },
-        ###
+        ### raw fields
         "abstracts": {
             "type": "object",
             "properties": {
@@ -356,12 +357,12 @@ mappings['products'] = {
                 }
             }
         },
-        # "accessRights": {
-        #     "type": "keyword"
-        # },
         "contributions": {
             "type": "object",
             "properties": {
+                "declared_affiliations": {
+                    "type": "keyword"
+                },
                 "person": {
                     "type": "object",
                     "properties": {
@@ -381,14 +382,11 @@ mappings['products'] = {
                         }
                     }
                 },
-                "declared_affiliations": {
-                    "type": "keyword"  # TODO: ask to Miriam, not mapped automatically
-                },
                 "rank": {
                     "type": "long"
                 },
                 "roles": {
-                    "type": "keyword"  # TODO: ask to Miriam, not mapped automatically
+                    "type": "keyword"
                 }
             }
         },
@@ -425,6 +423,22 @@ mappings['products'] = {
                 }
             }
         },
+        "indicator": {
+            "type": "object",
+            "properties": {
+                "downloadsAndViews": {
+                    "type": "object",
+                    "properties": {
+                        "downloads": {
+                            "type": "long"
+                        },
+                        "views": {
+                            "type": "long"
+                        }
+                    }
+                }
+            }
+        },
         "local_identifier": {
             "type": "keyword"
         },
@@ -437,9 +451,21 @@ mappings['products'] = {
                 "biblio": {
                     "type": "object",
                     "properties": {
+                        "edition": {
+                            "type": "text"
+                        },
                         "end_page": {
                             "type": "text"
                         },
+                        "hosting_data_source": {
+                            "type": "text"
+                        },
+                        "issue": {
+                            "type": "text"
+                        },
+                        "number": {
+                            "type": "text"
+                        },
                         "publisher": {
                             "type": "text"
                         },
@@ -448,18 +474,6 @@ mappings['products'] = {
                         },
                         "volume": {
                             "type": "text"
-                        },
-                        "issue": {
-                            "type": "text"
-                        },
-                        "edition": {
-                            "type": "text"
-                        },
-                        "number": {
-                            "type": "text"
-                        },
-                        "hosting_data_source": {
-                            "type": "text"
                         }
                     }
                 },
@@ -474,6 +488,9 @@ mappings['products'] = {
                         }
                     }
                 },
+                "eoscId": {
+                    "type": "keyword"
+                },
                 "hosting_datasource": {
                     "type": "object",
                     "properties": {
@@ -504,10 +521,10 @@ mappings['products'] = {
                     "type": "keyword"
                 },
                 "product_local_type": {
-                    "type": "text"
+                    "type": "keyword"
                 },
                 "product_local_type_schema": {
-                    "type": "text"
+                    "type": "keyword"
                 },
                 "url": {
                     "type": "text"
@@ -534,12 +551,18 @@ mappings['products'] = {
                 "product_list": {
                     "type": "object",
                     "properties": {
+                        "arxivid": {
+                            "type": "keyword"
+                        },
                         "doi": {
                             "type": "keyword"
                         },
                         "local_identifier": {
                             "type": "keyword"
                         },
+                        "pmid": {
+                            "type": "keyword"
+                        },
                         "title": {
                             "type": "text"
                         }
@@ -562,6 +585,9 @@ mappings['products'] = {
                 "name": {
                     "type": "text"
                 },
+                "rinGold": {
+                    "type": "keyword"
+                },
                 "ror": {
                     "type": "keyword"
                 },
@@ -579,10 +605,6 @@ mappings['products'] = {
                 }
             }
         },
-        "type": {
-            "type": "alias",
-            "path": "product_type"
-        },
         "topics": {
             "type": "object",
             "properties": {
@@ -594,7 +616,8 @@ mappings['products'] = {
                             "index": "false"
                         },
                         "type": {
-                            "type": "keyword"
+                            "type": "keyword",
+                            "index": "false"
                         }
                     }
                 },
@@ -604,17 +627,19 @@ mappings['products'] = {
                         "local_identifier": {
                             "type": "keyword"
                         },
+                        "scheme": {
+                            "type": "keyword"
+                        },
                         "value": {
-                            "fields": {
-                                "keyword": {
-                                    "type": "keyword"
-                                }
-                            },
-                            "type": "text"
+                            "type": "keyword"
                         }
                     }
                 }
             }
+        },
+        "type": {
+            "path": "product_type",
+            "type": "alias"
         }
     }
 }