diff --git a/basic_data.info.yml b/basic_data.info.yml
index 4bd7ffe..39caecf 100644
--- a/basic_data.info.yml
+++ b/basic_data.info.yml
@@ -2,4 +2,5 @@ name: 'Basic Data Entity'
 type: module
 description: 'A basic entity type that stores data blobs.'
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: 'Data'
diff --git a/src/Form/BasicDataForm.php b/src/Form/BasicDataForm.php
index 5a7435a..ea60db4 100644
--- a/src/Form/BasicDataForm.php
+++ b/src/Form/BasicDataForm.php
@@ -34,13 +34,13 @@ class BasicDataForm extends ContentEntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Basic Data.', [
+        $this->messenger()->addStatus($this->t('Created the %label Basic Data.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Basic Data.', [
+        $this->messenger()->addStatus($this->t('Saved the %label Basic Data.', [
           '%label' => $entity->label(),
         ]));
     }
diff --git a/src/Form/BasicDataTypeDeleteForm.php b/src/Form/BasicDataTypeDeleteForm.php
index 1785873..60b5e6f 100644
--- a/src/Form/BasicDataTypeDeleteForm.php
+++ b/src/Form/BasicDataTypeDeleteForm.php
@@ -38,14 +38,12 @@ class BasicDataTypeDeleteForm extends EntityConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->delete();
 
-    drupal_set_message(
-      $this->t('content @type: deleted @label.',
-        [
-          '@type' => $this->entity->bundle(),
-          '@label' => $this->entity->label(),
-        ]
-        )
-    );
+    $this->messenger()->addStatus($this->t('content @type: deleted @label.',
+      [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label(),
+      ]
+      ));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
diff --git a/src/Form/BasicDataTypeForm.php b/src/Form/BasicDataTypeForm.php
index 7ba1742..99d98f9 100644
--- a/src/Form/BasicDataTypeForm.php
+++ b/src/Form/BasicDataTypeForm.php
@@ -49,13 +49,13 @@ class BasicDataTypeForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Basic Data type.', [
+        $this->messenger()->addStatus($this->t('Created the %label Basic Data type.', [
           '%label' => $basic_data_type->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label Basic Data type.', [
+        $this->messenger()->addStatus($this->t('Saved the %label Basic Data type.', [
           '%label' => $basic_data_type->label(),
         ]));
     }