diff --git a/app/config/schema/schema.json b/app/config/schema/schema.json
index 52e689317..2a4f45b43 100644
--- a/app/config/schema/schema.json
+++ b/app/config/schema/schema.json
@@ -663,6 +663,19 @@
         "ext_identity_sources_records_i2": { "columns": [ "external_identity_id" ] },
         "ext_identity_sources_records_i3": { "columns": [ "external_identity_source_id", "source_key" ] }
       }
+    },
+
+    "application_states": {
+      "columns": {
+        "id": {},
+        "person_id": {},
+         "tag": { "type": "string", "size": 128 },
+        "value": { "type": "string", "size": 256 }
+      },
+      "indexes": {
+        "application_states_i1": { "columns": [ "person_id" ] }
+      },
+      "changelog": false
     }
   },
   
diff --git a/app/src/Model/Entity/ApplicationState.php b/app/src/Model/Entity/ApplicationState.php
new file mode 100644
index 000000000..db92f2ad9
--- /dev/null
+++ b/app/src/Model/Entity/ApplicationState.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * COmanage Registry Application State Entity
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+declare(strict_types = 1);
+
+namespace App\Model\Entity;
+
+use Cake\ORM\Entity;
+
+class ApplicationState extends Entity {
+  protected $_accessible = [
+    '*' => true,
+    'id' => false,
+    'slug' => false, 
+  ];
+}
\ No newline at end of file
diff --git a/app/src/Model/Table/ApplicationStatesTable.php b/app/src/Model/Table/ApplicationStatesTable.php
new file mode 100644
index 000000000..24d260fa0
--- /dev/null
+++ b/app/src/Model/Table/ApplicationStatesTable.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * COmanage Registry Application States Table
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+declare(strict_types = 1);
+
+namespace App\Model\Table;
+
+use Cake\ORM\Table;
+use Cake\Validation\Validator;
+
+class ApplicationStatesTable extends Table {
+  use \App\Lib\Traits\TableMetaTrait;
+  use \App\Lib\Traits\ValidationTrait;
+  
+  /**
+   * Perform Cake Model initialization.
+   *
+   * @since  COmanage Registry v5.0.0
+   * @param  array  $config Configuration options passed to constructor
+   */
+  
+  public function initialize(array $config): void {
+    // Timestamp behavior handles created/modified updates
+    $this->addBehavior('Log');
+    $this->addBehavior('Timestamp');
+    
+    $this->setTableType(\App\Lib\Enum\TableTypeEnum::Metadata);
+    
+    // Define associations
+    $this->belongsTo('People');
+    
+    $this->setDisplayField('tag');
+  }
+  
+  /**
+   * Set validation rules.
+   * 
+   * @since  COmanage Registry v5.0.0
+   * @param  Validator $validator Validator
+   * @return Validator            Validator
+   * @throws InvalidArgumentException
+   * @throws RecordNotFoundException
+   */
+  
+  public function validationDefault(Validator $validator): Validator {
+    $schema = $this->getSchema();
+
+    $this->registerPrimaryKeyValidation($validator, $this->getPrimaryLinks());
+    
+    $this->registerStringValidation($validator, $schema, 'tag', true);
+    
+    $this->registerStringValidation($validator, $schema, 'value', false);
+    
+    return $validator; 
+  }
+}
\ No newline at end of file
diff --git a/app/src/Model/Table/PeopleTable.php b/app/src/Model/Table/PeopleTable.php
index 74f95c0f1..64d337900 100644
--- a/app/src/Model/Table/PeopleTable.php
+++ b/app/src/Model/Table/PeopleTable.php
@@ -89,6 +89,9 @@ public function initialize(array $config): void {
     $this->hasMany('AdHocAttributes')
          ->setDependent(true)
          ->setCascadeCallbacks(true);
+    $this->hasMany('ApplicationStates')
+         ->setDependent(true)
+         ->setCascadeCallbacks(true);
     $this->hasMany('EmailAddresses')
          ->setDependent(true)
          ->setCascadeCallbacks(true);