diff --git a/composer.lock b/composer.lock
index 6edd98ac..57d591ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2535,16 +2535,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "11.3.7",
+            "version": "11.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "bb36d7d09b0132185bd33be730ec2e6d35c2d627"
+                "reference": "d40f45fa436fb089cd54029d2dab387c3040fc2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/bb36d7d09b0132185bd33be730ec2e6d35c2d627",
-                "reference": "bb36d7d09b0132185bd33be730ec2e6d35c2d627",
+                "url": "https://api.github.com/repos/drupal/core/zipball/d40f45fa436fb089cd54029d2dab387c3040fc2c",
+                "reference": "d40f45fa436fb089cd54029d2dab387c3040fc2c",
                 "shasum": ""
             },
             "require": {
@@ -2702,13 +2702,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/11.3.7"
+                "source": "https://github.com/drupal/core/tree/11.3.8"
             },
-            "time": "2026-04-15T15:47:32+00:00"
+            "time": "2026-04-20T07:33:20+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "11.3.7",
+            "version": "11.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -2752,7 +2752,7 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/11.3.7"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/11.3.8"
             },
             "time": "2026-02-10T11:39:53+00:00"
         },
@@ -2815,26 +2815,26 @@
         },
         {
             "name": "drupal/csp",
-            "version": "2.2.2",
+            "version": "2.2.3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/csp.git",
-                "reference": "2.2.2"
+                "reference": "2.2.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/csp-2.2.2.zip",
-                "reference": "2.2.2",
-                "shasum": "4ae305859e6997c62296ddbeee480ba619557fe8"
+                "url": "https://ftp.drupal.org/files/projects/csp-2.2.3.zip",
+                "reference": "2.2.3",
+                "shasum": "a02939b221ecb66273530d7be3b2a287f897fa3c"
             },
             "require": {
-                "drupal/core": "^10.2 || ^11"
+                "drupal/core": "^11.2 || ^12"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.2.2",
-                    "datestamp": "1741822236",
+                    "version": "2.2.3",
+                    "datestamp": "1776729271",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4485,16 +4485,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.16.65",
+            "version": "6.16.70",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "ed99684b2cc3feffea17ce6986e42faa24abec63"
+                "reference": "b30aa236a9a992b9f53adfb0bd72e25fcb0c7d94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/ed99684b2cc3feffea17ce6986e42faa24abec63",
-                "reference": "ed99684b2cc3feffea17ce6986e42faa24abec63",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b30aa236a9a992b9f53adfb0bd72e25fcb0c7d94",
+                "reference": "b30aa236a9a992b9f53adfb0bd72e25fcb0c7d94",
                 "shasum": ""
             },
             "require": {
@@ -4513,10 +4513,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.16.65",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.16.70",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2026-04-16T13:52:25+00:00"
+            "time": "2026-04-21T07:27:59+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -4607,16 +4607,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.8.16",
+            "version": "2.8.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "ed6fe3a30d33c39ed6351edbacf807de106a898e"
+                "reference": "989784a16b9f4336a67e8d2c33e71f44813bd45d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/ed6fe3a30d33c39ed6351edbacf807de106a898e",
-                "reference": "ed6fe3a30d33c39ed6351edbacf807de106a898e",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/989784a16b9f4336a67e8d2c33e71f44813bd45d",
+                "reference": "989784a16b9f4336a67e8d2c33e71f44813bd45d",
                 "shasum": ""
             },
             "require": {
@@ -4625,7 +4625,8 @@
                 "drupal/entity": "^1.0",
                 "drupal/health_check": "^3.0",
                 "drupal/monolog": "^3.0",
-                "drupal/raven": "^5.0 || ^6.0",
+                "drupal/raven": "^6.0 || ^7.0",
+                "drupal/redis": "^1.0",
                 "ext-curl": "*",
                 "firebase/php-jwt": "^7.0",
                 "php": "^8.1",
@@ -4658,10 +4659,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.8.16",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.8.19",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2026-04-08T06:51:52+00:00"
+            "time": "2026-04-21T08:39:47+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -4789,16 +4790,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "5.1.39",
+            "version": "5.1.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "2ea2cb20c54f7a7742464ecff6e26c68427a763f"
+                "reference": "90ea1221ee2bb76d7bf4966d0888ed876809cce4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2ea2cb20c54f7a7742464ecff6e26c68427a763f",
-                "reference": "2ea2cb20c54f7a7742464ecff6e26c68427a763f",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/90ea1221ee2bb76d7bf4966d0888ed876809cce4",
+                "reference": "90ea1221ee2bb76d7bf4966d0888ed876809cce4",
                 "shasum": ""
             },
             "require": {
@@ -4868,6 +4869,7 @@
                 "symfony/property-access": "^7.3"
             },
             "conflict": {
+                "drupal/core": "<11.3.8",
                 "drupal/external_entities": "<3.0.0-beta7",
                 "drush/drush": "<12"
             },
@@ -4884,8 +4886,7 @@
                         "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "./public/modules/contrib/helfi_platform_config/patches/2873353-20.patch",
                         "[#UHF-9952, #UHF-9980] Duplicate <br /> tags (https://www.drupal.org/i/3083786)": "./public/modules/contrib/helfi_platform_config/patches/3083786.patch",
                         "[#UHF-11025] Status message templates missing theme when bigpipe is enabled (https://www.drupal.org/i/3396318)": "./public/modules/contrib/helfi_platform_config/patches/3396318.patch",
-                        "[#UHF-11784] Sort the source and target arrays in the configuration storage comparer to avoid false positives": "./public/modules/contrib/helfi_platform_config/patches/drupal-core-sort-storage-comparer-source-and-target-arrays.patch",
-                        "[#UHF-13130] ConfigInstaller isSyncing does not persist to hook_modules_installed() when multiple modules are installed (https://www.drupal.org/i/3584812)": "./public/modules/contrib/helfi_platform_config/patches/3584812-7.patch"
+                        "[#UHF-11784] Sort the source and target arrays in the configuration storage comparer to avoid false positives": "./public/modules/contrib/helfi_platform_config/patches/drupal-core-sort-storage-comparer-source-and-target-arrays.patch"
                     },
                     "drupal/diff": {
                         "Revision overview form problem (https://www.drupal.org/i/3390329)": "./public/modules/contrib/helfi_platform_config/patches/diff_8.x_1.3_revision_overview_form.patch"
@@ -4914,10 +4915,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/5.1.39",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/5.1.42",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2026-04-17T04:57:55+00:00"
+            "time": "2026-04-21T10:23:14+00:00"
         },
         {
             "name": "drupal/helfi_tpr",
@@ -6334,33 +6335,33 @@
         },
         {
             "name": "drupal/raven",
-            "version": "6.0.16",
+            "version": "7.3.8",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/raven.git",
-                "reference": "6.0.16"
+                "reference": "7.3.8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/raven-6.0.16.zip",
-                "reference": "6.0.16",
-                "shasum": "7859678b6c935afbdacf72f5ca3508784d9b0948"
+                "url": "https://ftp.drupal.org/files/projects/raven-7.3.8.zip",
+                "reference": "7.3.8",
+                "shasum": "78e4219650a9b49a7f35ae165cb8d6077ceb46bc"
             },
             "require": {
-                "drupal/core": "^10.2 || ^11",
-                "sentry/sentry": "^4.9"
+                "drupal/core": "^11.1",
+                "sentry/sentry": "^4.20"
             },
             "require-dev": {
                 "drupal/csp": "^1.17 || ^2.0",
                 "drupal/monitoring": "^1.13",
                 "drupal/seckit": "^2.0",
-                "drush/drush": "^11.0 || ^12.0 || ^13.0"
+                "drush/drush": "^13.0"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "6.0.16",
-                    "datestamp": "1755300523",
+                    "version": "7.3.8",
+                    "datestamp": "1775584686",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -6389,6 +6390,10 @@
                     "type": "github",
                     "url": "https://github.com/sponsors/mfb"
                 },
+                {
+                    "type": "ko-fi",
+                    "url": "https://ko-fi.com/mfb"
+                },
                 {
                     "type": "patreon",
                     "url": "https://www.patreon.com/mfb"
@@ -8996,16 +9001,16 @@
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.16",
+            "version": "v0.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "11e7d5f93803a2190b00e145142cb00a33d17ad2"
+                "reference": "6a82ac19a28b916ae0885828795dbd4c59d9a818"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/11e7d5f93803a2190b00e145142cb00a33d17ad2",
-                "reference": "11e7d5f93803a2190b00e145142cb00a33d17ad2",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/6a82ac19a28b916ae0885828795dbd4c59d9a818",
+                "reference": "6a82ac19a28b916ae0885828795dbd4c59d9a818",
                 "shasum": ""
             },
             "require": {
@@ -9049,9 +9054,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.16"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.17"
             },
-            "time": "2026-03-23T14:35:33+00:00"
+            "time": "2026-04-20T16:07:33+00:00"
         },
         {
             "name": "league/container",
@@ -16771,7 +16776,7 @@
         },
         {
             "name": "drupal/core-dev",
-            "version": "11.3.7",
+            "version": "11.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -16821,7 +16826,7 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/11.3.7"
+                "source": "https://github.com/drupal/core-dev/tree/11.3.8"
             },
             "time": "2026-02-04T09:01:40+00:00"
         },
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
index 30b6091c..99659a5a 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -15,15 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  announcement_assistive_technology_close_button_title:
+  id:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_title"]'
-            required_field: false
+            mapping: $.id
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -31,14 +31,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_link_text:
+  uuid:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_link"]["title"]'
+            mapping: $.id
             required_field: false
             main_property: true
             data_processors:
@@ -47,15 +47,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_link_url:
+  title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_link"]["uri"]'
-            required_field: false
+            mapping: '$.attributes["title"]'
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -63,14 +63,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  announcement_type:
+  status:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_announcement_type"]'
+            mapping: '$.attributes["status"]'
             required_field: false
             main_property: true
             data_processors:
@@ -79,14 +79,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  body:
+  published_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["body"]["value"]'
+            mapping: '$.attributes["published_at"]'
             required_field: false
             main_property: true
             data_processors:
@@ -95,15 +95,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  id:
+  unpublish_on:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
-            required_field: true
+            mapping: '$.attributes["unpublish_on"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -111,14 +111,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  notification:
+  body:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["notification"]'
+            mapping: '$.attributes["body"]["value"]'
             required_field: false
             main_property: true
             data_processors:
@@ -127,14 +127,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  published_at:
+  notification:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["published_at"]'
+            mapping: '$.attributes["notification"]'
             required_field: false
             main_property: true
             data_processors:
@@ -143,14 +143,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  status:
+  announcement_type:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["status"]'
+            mapping: '$.attributes["field_announcement_type"]'
             required_field: false
             main_property: true
             data_processors:
@@ -159,15 +159,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  title:
+  announcement_link_text:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["title"]'
-            required_field: true
+            mapping: '$.attributes["field_announcement_link"]["title"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -175,14 +175,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  unpublish_on:
+  announcement_link_url:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["unpublish_on"]'
+            mapping: '$.attributes["field_announcement_link"]["uri"]'
             required_field: false
             main_property: true
             data_processors:
@@ -191,14 +191,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  uuid:
+  announcement_assistive_technology_close_button_title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
+            mapping: '$.attributes["field_announcement_title"]'
             required_field: false
             main_property: true
             data_processors:
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
index 70f699cb..1c335bea 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
@@ -15,15 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  abstract:
+  id:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.abstract
-            required_field: false
+            mapping: $.id
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -31,14 +31,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  close_at:
+  uuid:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.close_at
+            mapping: $.id
             required_field: false
             main_property: true
             data_processors:
@@ -47,15 +47,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  comments:
+  title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.n_comments
-            required_field: false
+            mapping: $.title
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -63,14 +63,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  count:
+  main_image:
     id: generic
     config:
       property_mappings:
-        value:
+        uri:
           id: jsonpath
           config:
-            mapping: $.count
+            mapping: $.main_image_url
             required_field: false
             main_property: true
             data_processors:
@@ -78,15 +78,17 @@ field_mappers:
                 id: default
                 config: {  }
             description: ''
+        title:
+          id: ''
       debug_level: 0
-  created_at:
+  close_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.created_at
+            mapping: $.close_at
             required_field: false
             main_property: true
             data_processors:
@@ -95,14 +97,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  existing_translations:
+  created_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.existing_translations
+            mapping: $.created_at
             required_field: false
             main_property: true
             data_processors:
@@ -111,15 +113,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  id:
+  open_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
-            required_field: true
+            mapping: $.open_at
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -127,14 +129,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  main_image:
+  slug:
     id: generic
     config:
       property_mappings:
-        uri:
+        value:
           id: jsonpath
           config:
-            mapping: $.main_image_url
+            mapping: $.slug
             required_field: false
             main_property: true
             data_processors:
@@ -142,17 +144,15 @@ field_mappers:
                 id: default
                 config: {  }
             description: ''
-        title:
-          id: ''
       debug_level: 0
-  main_image_title:
+  comments:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.main_image_caption
+            mapping: $.n_comments
             required_field: false
             main_property: true
             data_processors:
@@ -161,14 +161,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  open_at:
+  organization:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.open_at
+            mapping: $.organization
             required_field: false
             main_property: true
             data_processors:
@@ -177,14 +177,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  organization:
+  abstract:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.organization
+            mapping: $.abstract
             required_field: false
             main_property: true
             data_processors:
@@ -193,14 +193,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  slug:
+  main_image_title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.slug
+            mapping: $.main_image_caption
             required_field: false
             main_property: true
             data_processors:
@@ -209,15 +209,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  title:
+  url:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.title
-            required_field: true
+            mapping: $.url
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -225,14 +225,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  url:
+  count:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.url
+            mapping: $.count
             required_field: false
             main_property: true
             data_processors:
@@ -241,14 +241,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  uuid:
+  existing_translations:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
+            mapping: $.existing_translations
             required_field: false
             main_property: true
             data_processors:
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
index b1a684f6..5ab23035 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
@@ -15,15 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  body:
+  id:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["body"]["value"]'
-            required_field: false
+            mapping: $.id
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -31,10 +31,7 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  default_langcode:
-    id: null
-    config: { }
-  id:
+  uuid:
     id: generic
     config:
       property_mappings:
@@ -42,7 +39,7 @@ field_mappers:
           id: jsonpath
           config:
             mapping: $.id
-            required_field: true
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -50,29 +47,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  langcode:
-    id: generic
-    config:
-      property_mappings:
-        value:
-          id: jsonpath
-          config:
-            mapping: '$.attributes["langcode"]'
-            required_field: false
-            main_property: true
-            data_processors:
-              - id: default
-                config: { }
-            description: ''
-  published_at:
+  title:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["published_at"]'
-            required_field: false
+            mapping: '$.attributes["title"]'
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -96,14 +79,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  survey_link_text:
+  published_at:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_survey_link"]["title"]'
+            mapping: '$.attributes["published_at"]'
             required_field: false
             main_property: true
             data_processors:
@@ -112,14 +95,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  survey_link_url:
+  unpublish_on:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["field_survey_link"]["uri"]'
+            mapping: '$.attributes["unpublish_on"]'
             required_field: false
             main_property: true
             data_processors:
@@ -128,15 +111,15 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  title:
+  body:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["title"]'
-            required_field: true
+            mapping: '$.attributes["body"]["value"]'
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -144,14 +127,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  unpublish_on:
+  survey_link_text:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: '$.attributes["unpublish_on"]'
+            mapping: '$.attributes["field_survey_link"]["title"]'
             required_field: false
             main_property: true
             data_processors:
@@ -160,14 +143,14 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
-  uuid:
+  survey_link_url:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.id
+            mapping: '$.attributes["field_survey_link"]["uri"]'
             required_field: false
             main_property: true
             data_processors:
@@ -176,6 +159,7 @@ field_mappers:
                 config: {  }
             description: ''
       debug_level: 0
+field_save_order: null
 field_mapping_notes: ''
 data_aggregator:
   id: single
diff --git a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
index d6e68885..55e46af4 100644
--- a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
+++ b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
@@ -15,27 +15,15 @@ content_class: Drupal\external_entities\Entity\ExternalEntity
 read_only: true
 debug_level: 0
 field_mappers:
-  content_translation_source:
-    id: generic
-    config:
-      property_mappings:
-        value:
-          id: constant
-          config:
-            mapping: en
-            required_field: false
-            main_property: true
-            description: ''
-      debug_level: 0
-  end_time:
+  id:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.end_time
-            required_field: false
+            mapping: $.id
+            required_field: true
             main_property: true
             data_processors:
               -
@@ -45,14 +33,14 @@ field_mappers:
                   default: null
             description: ''
       debug_level: 0
-  external_link:
+  uuid:
     id: generic
     config:
       property_mappings:
-        uri:
+        value:
           id: jsonpath
           config:
-            mapping: $.external_link
+            mapping: $.id
             required_field: false
             main_property: true
             data_processors:
@@ -62,12 +50,17 @@ field_mappers:
                   datatype: ''
                   default: null
             description: ''
-        title:
+      debug_level: 0
+  title:
+    id: generic
+    config:
+      property_mappings:
+        value:
           id: jsonpath
           config:
-            mapping: $.name
-            required_field: false
-            main_property: false
+            mapping: $.title
+            required_field: true
+            main_property: true
             data_processors:
               -
                 id: default
@@ -76,22 +69,16 @@ field_mappers:
                   default: null
             description: ''
       debug_level: 0
-  id:
+  content_translation_source:
     id: generic
     config:
       property_mappings:
         value:
-          id: jsonpath
+          id: constant
           config:
-            mapping: $.id
-            required_field: true
+            mapping: en
+            required_field: false
             main_property: true
-            data_processors:
-              -
-                id: default
-                config:
-                  datatype: ''
-                  default: null
             description: ''
       debug_level: 0
   main_image:
@@ -143,15 +130,15 @@ field_mappers:
                   default: null
             description: ''
       debug_level: 0
-  title:
+  end_time:
     id: generic
     config:
       property_mappings:
         value:
           id: jsonpath
           config:
-            mapping: $.title
-            required_field: true
+            mapping: $.end_time
+            required_field: false
             main_property: true
             data_processors:
               -
@@ -161,14 +148,14 @@ field_mappers:
                   default: null
             description: ''
       debug_level: 0
-  uuid:
+  external_link:
     id: generic
     config:
       property_mappings:
-        value:
+        uri:
           id: jsonpath
           config:
-            mapping: $.id
+            mapping: $.external_link
             required_field: false
             main_property: true
             data_processors:
@@ -178,6 +165,19 @@ field_mappers:
                   datatype: ''
                   default: null
             description: ''
+        title:
+          id: jsonpath
+          config:
+            mapping: $.name
+            required_field: false
+            main_property: false
+            data_processors:
+              -
+                id: default
+                config:
+                  datatype: ''
+                  default: null
+            description: ''
       debug_level: 0
 field_save_order: null
 field_mapping_notes: ''
diff --git a/conf/cmi/helfi_api_base.features.yml b/conf/cmi/helfi_api_base.features.yml
index c6941665..e2da92c1 100644
--- a/conf/cmi/helfi_api_base.features.yml
+++ b/conf/cmi/helfi_api_base.features.yml
@@ -1,4 +1,5 @@
 disable_email_sending: true
 disable_user_password: true
 user_expire: true
+user_delete: true
 use_mock_responses: false