diff --git a/collections/CDS1_temperature.yaml b/collections/CDS1_temperature.yaml
index 35c719e8..5764aa75 100644
--- a/collections/CDS1_temperature.yaml
+++ b/collections/CDS1_temperature.yaml
@@ -2,30 +2,49 @@ Name: temperature
 Title: Global temperature
 EodashIdentifier: CDS1_temperature
 Subtitle: Global temperature description
-Description: CDS1_temperature/CDS.md
+Description: CDS1_temperature/CDS1_temperature.md
 Themes:
-    - air
+  - air
 Tags:
-    - placeholder
-Satellite:
-    - ICEYE
-Sensor:
-    - placeholder
+  - Copernicus Services
+  - C3S
+  - CDS
+  - Open data
+DataSource:
+  Other:
+    - ERA5
 Agency:
-    - ESA
-License: MIT
+  - European Commission
+  - ECMWF
+License:
+  - Url: https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf
+    Type: application/pdf
+    Title: Licence to Use Copernicus Products
+Provider: 
+  - Name: Copernicus Climate Change Service
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+  - Name: Climate Data Store
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+Citation:
+  Citation: |
+    Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
+    The results contain modified Copernicus Climate Change Service information 2020. 
+    Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
+  DOI: 10.24381/cds.68d2bb30
+  Publication:
+    - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
+      DOI: 10.1038/s41467-020-19546-7
+Image: CDS1_temperature/CDS1_temperature.png
+Legend: CDS1_temperature/CDS1_legend.png
 Resources:
-    - Group: Sentinel Hub Resources
-    - EndPoint: https://services.sentinel-hub.com
-      Name: Sentinel Hub
-      Type: byoc
-      CollectionId: 0b3eebec-30de-4fa6-9cd3-4b252d45d847
-      LayerId: AWS_VIS_2MTEMPERATURE
+  - EndPoint: https://services.sentinel-hub.com
+    Name: Sentinel Hub
+    Type: byoc
+    CollectionId: 0b3eebec-30de-4fa6-9cd3-4b252d45d847
+    LayerId: AWS_VIS_2MTEMPERATURE
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     Type: byoc
     CollectionId: 0b3eebec-30de-4fa6-9cd3-4b252d45d847
-    Script: CDS1_temperature/script.js
-Image: CDS1_temperature/thumbnail.png
-Legend: CDS1_temperature/cm_legend.png
+    Script: CDS1_temperature/CDS1_temperature.js
diff --git a/collections/CDS2_relative_humidity.yaml b/collections/CDS2_relative_humidity.yaml
index d3d4ee72..df2f6cbd 100644
--- a/collections/CDS2_relative_humidity.yaml
+++ b/collections/CDS2_relative_humidity.yaml
@@ -2,30 +2,49 @@ Name: relative_humidity
 Title: Relative humidity
 EodashIdentifier: CDS2_relative_humidity
 Subtitle: Global relative humidity
-Description: CDS2_relative_humidity/CDS.md
+Description: CDS2_relative_humidity/CDS2_relative_humidity.md
 Themes:
-    - air
+  - air
 Tags:
-    - placeholder
-Satellite:
-    - ICEYE
-Sensor:
-    - placeholder
+  - Copernicus Services
+  - C3S
+  - CDS
+  - Open data
+DataSource:
+  Other:
+    - ERA5
 Agency:
-    - ESA
-License: MIT
+  - European Commission
+  - ECMWF
+License:
+  - Url: https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf
+    Type: application/pdf
+    Title: Licence to Use Copernicus Products
+Provider: 
+  - Name: Copernicus Climate Change Service
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+  - Name: Climate Data Store
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+Citation:
+  Citation: |
+    Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
+    The results contain modified Copernicus Climate Change Service information 2020. 
+    Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
+  DOI: 10.24381/cds.68d2bb30
+  Publication:
+    - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
+      DOI: 10.1038/s41467-020-19546-7
+Image: CDS2_relative_humidity/CDS2_relative_humidity.png
+Legend: CDS2_relative_humidity/CDS2_legend.png
 Resources:
-    - Group: Sentinel Hub Resources
-    - EndPoint: https://services.sentinel-hub.com
-      Name: Sentinel Hub
-      Type: byoc
-      CollectionId: c3f87cba-4fdd-46c5-ab45-e6889d506f93
-      LayerId: AWS_VIS_RELHUMIDITY1000HPA
+  - EndPoint: https://services.sentinel-hub.com
+    Name: Sentinel Hub
+    Type: byoc
+    CollectionId: c3f87cba-4fdd-46c5-ab45-e6889d506f93
+    LayerId: AWS_VIS_RELHUMIDITY1000HPA
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     Type: byoc
     CollectionId: c3f87cba-4fdd-46c5-ab45-e6889d506f93
-    Script: CDS2_relative_humidity/script.js
-Image: CDS2_relative_humidity/thumbnail.png
-Legend: CDS2_relative_humidity/cm_legend.png
+    Script: CDS2_relative_humidity/CDS2_relative_humidity.js
diff --git a/generators/generate_indicators.py b/generators/generate_indicators.py
index 8210cc4b..537a6143 100644
--- a/generators/generate_indicators.py
+++ b/generators/generate_indicators.py
@@ -1033,21 +1033,45 @@ def add_collection_information(config, collection, data):
     # Add metadata information
     # Check license identifier
     if "License" in data:
-        license = lookup.by_id(data["License"])
-        if license is not None:
-            collection.license = license.id
-            if license.sources:
-                # add links to licenses
-                for source in license.sources:
-                    collection.links.append(Link(
+        # Check if list was provided
+        if isinstance(data["License"], list):
+            if len(data["License"]) == 1:
+                collection.license = 'proprietary'
+                link = Link(
+                    rel="license",
+                    target=data["License"][0]["Url"],
+                    media_type=data["License"][0]["Type"] if "Type" in data["License"][0] else "text/html",
+                )
+                if "Title" in data["License"][0]:
+                    link.title = data["License"][0]["Title"]
+                collection.links.append(link)
+            elif len(data["License"]) > 1:
+                collection.license = 'various'
+                for l in data["License"]:
+                    link = Link(
                         rel="license",
-                        target=source,
-                        media_type="text/html",
-                    ))
+                        target=l["Url"],
+                        media_type="text/html" if "Type" in l else l["Type"],
+                    )
+                    if "Title" in l:
+                        link.title = l["Title"]
+                    collection.links.append(link)
         else:
-            # fallback to proprietary
-            print("WARNING: License could not be parsed, falling back to proprietary")
-            collection.license = "proprietary"
+            license = lookup.by_id(data["License"])
+            if license is not None:
+                collection.license = license.id
+                if license.sources:
+                    # add links to licenses
+                    for source in license.sources:
+                        collection.links.append(Link(
+                            rel="license",
+                            target=source,
+                            media_type="text/html",
+                        ))
+            else:
+                # fallback to proprietary
+                print("WARNING: License could not be parsed, falling back to proprietary")
+                collection.license = "proprietary"
     else:
         # print("WARNING: No license was provided, falling back to proprietary")
         pass