diff --git a/config/schema/user_default_page_config_entity.schema.yml b/config/schema/user_default_page_config_entity.schema.yml
index 3d5cb60..c38b3b5 100644
--- a/config/schema/user_default_page_config_entity.schema.yml
+++ b/config/schema/user_default_page_config_entity.schema.yml
@@ -10,3 +10,18 @@ user_default_page.user_default_page_config_entity.*:
       label: 'Label'
     uuid:
       type: string
+    user_roles:
+      type: string
+      label: 'User Role'
+    login_redirect:
+      type: string
+      label: 'Login Redirect'
+    login_redirect_message:
+      type: string
+      label: 'Login Redirect Message'
+    logout_redirect:
+      type: string
+      label: 'Logout Redirect'
+    logout_redirect_message:
+      type: string
+      label: 'Logout Redirect Message'
diff --git a/src/Entity/UserDefaultPageConfigEntity.php b/src/Entity/UserDefaultPageConfigEntity.php
index 6bb052d..2abae69 100644
--- a/src/Entity/UserDefaultPageConfigEntity.php
+++ b/src/Entity/UserDefaultPageConfigEntity.php
@@ -32,7 +32,12 @@ use Drupal\user_default_page\UserDefaultPageConfigEntityInterface;
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "label",
- *     "uuid" = "uuid"
+ *     "uuid" = "uuid",
+ *     "user_roles" = "user_roles",
+ *     "login_redirect" = "login_redirect",
+ *     "login_redirect_message" = "login_redirect_message",
+ *     "logout_redirect" = "logout_redirect",
+ *     "logout_redirect_message" = "logout_redirect_message"
  *   },
  *   links = {
  *     "canonical" = "/admin/structure/user_default_page_config_entity/{user_default_page_config_entity}",
@@ -58,4 +63,39 @@ class UserDefaultPageConfigEntity extends ConfigEntityBase implements UserDefaul
    */
   protected $label;
 
+  /**
+   * The User default page label.
+   *
+   * @var string
+   */
+  protected $user_roles;
+
+  /**
+   * The User default page label.
+   *
+   * @var string
+   */
+  protected $login_redirect_message;
+
+  /**
+   * The User default page label.
+   *
+   * @var string
+   */
+  protected $logout_redirect;
+
+  /**
+   * The User default page label.
+   *
+   * @var string
+   */
+  protected $logout_redirect_message;
+
+  /**
+   * The User default page label.
+   *
+   * @var string
+   */
+  protected $login_redirect;
+
 }
diff --git a/src/Form/UserDefaultPageConfigEntityForm.php b/src/Form/UserDefaultPageConfigEntityForm.php
index e73bb86..6f6deca 100644
--- a/src/Form/UserDefaultPageConfigEntityForm.php
+++ b/src/Form/UserDefaultPageConfigEntityForm.php
@@ -42,11 +42,13 @@ class UserDefaultPageConfigEntityForm extends EntityForm {
     );
 
     /* You will need additional form elements for your custom properties. */
+    // $entity = $user_default_page_config_entity->;
+    // $aaa = '';
     $form['roles_fieldset'] = array(
       '#type' => 'fieldset',
       '#title' => t('Role'),
-      '#collapsible' => TRUE, // Added
-      '#collapsed' => FALSE,  // Added
+      '#collapsible' => TRUE,
+      '#collapsed' => FALSE,
     );
     $roles = ['' => '-Select-'];
     foreach (user_roles() as $role) {
@@ -57,7 +59,7 @@ class UserDefaultPageConfigEntityForm extends EntityForm {
       '#type' => 'select',
       '#description' => $this->t("Select user roles"),
       '#options' => $roles,
-      // '#default_value' => $config->get('user_reg'),
+      // '#default_value' => isset($entity['user_roles']) ? $entity['user_roles'] : '',
       '#required' => TRUE,
     ];
 
@@ -65,9 +67,8 @@ class UserDefaultPageConfigEntityForm extends EntityForm {
     $form['login_fieldset'] = array(
       '#type' => 'fieldset',
       '#title' => t('Login'),
-      '#collapsible' => TRUE, // Added
-      '#collapsed' => TRUE
-    ,  // Added
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
     );
     $form['login_fieldset']['login_redirect'] = [
       '#title' => $this->t('Redirect to URL'),
@@ -75,21 +76,21 @@ class UserDefaultPageConfigEntityForm extends EntityForm {
       '#size' => 64,
       '#description' => $this->t("Enter the internal path."),
       '#required' => TRUE,
-      // '#default_value' => $config->get('user_reg'),
+      // '#default_value' => isset($entity['login_redirect']) ? $entity['login_redirect'] : '',
     ];
     $form['login_fieldset']['login_redirect_message'] = [
       '#title' => $this->t('Message'),
       '#type' => 'textarea',
       '#description' => $this->t("Enter the message to be displayed."),
       '#required' => TRUE,
-      // '#default_value' => $config->get('user_reg'),
+      // '#default_value' => isset($entity['login_redirect_message']) ? $entity['login_redirect_message'] : '',
     ];
 
     $form['logout_fieldset'] = array(
       '#type' => 'fieldset',
       '#title' => t('Logout'),
-      '#collapsible' => TRUE, // Added
-      '#collapsed' => TRUE,  // Added
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
     );
     $form['logout_fieldset']['logout_redirect'] = [
       '#title' => $this->t('Redirect to URL'),
@@ -97,14 +98,14 @@ class UserDefaultPageConfigEntityForm extends EntityForm {
       '#size' => 64,
       '#description' => $this->t("Enter the internal path."),
       '#required' => TRUE,
-      // '#default_value' => $config->get('user_reg'),
+      // '#default_value' => isset($entity['logout_redirect']) ? $entity['logout_redirect'] : '',
     ];
     $form['logout_fieldset']['logout_redirect_message'] = [
       '#title' => $this->t('Message'),
       '#type' => 'textarea',
       '#description' => $this->t("Enter the message to be displayed."),
       '#required' => TRUE,
-      // '#default_value' => $config->get('user_reg'),
+      // '#default_value' => isset($entity['logout_redirect_message']) ? $entity['logout_redirect_message'] : '',
     ];
 
     return $form;
diff --git a/src/UserDefaultPageConfigEntityListBuilder.php b/src/UserDefaultPageConfigEntityListBuilder.php
index 1933f53..cdff2cb 100644
--- a/src/UserDefaultPageConfigEntityListBuilder.php
+++ b/src/UserDefaultPageConfigEntityListBuilder.php
@@ -30,6 +30,9 @@ class UserDefaultPageConfigEntityListBuilder extends ConfigEntityListBuilder {
     $row['label'] = $entity->label();
     $row['id'] = $entity->id();
     // You probably want a few more properties here...
+
+    // $row['login_redirect'] = $entity->getTypedData()->get('login_redirect');
+
     return $row + parent::buildRow($entity);
   }
 
diff --git a/user_default_page.module b/user_default_page.module
index d3a0842..27aa91d 100644
--- a/user_default_page.module
+++ b/user_default_page.module
@@ -7,7 +7,6 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Drupal\user\Entity\User;
 
 /**
  * Implements hook_help().