diff --git a/docs/API/ClassStoreClass.md b/docs/API/ClassStoreClass.md
new file mode 100644
index 00000000000000..c24a14ca7b37a0
--- /dev/null
+++ b/docs/API/ClassStoreClass.md
@@ -0,0 +1,58 @@
+---
+id: ClassStoreClass
+title: ClassStore
+---
+
+
+`4D.ClassStore` properties are available classes and class stores. 
+
+4D exposes two [class stores](../Concepts/classes.md#class-stores):
+
+- [`cs`](../commands/cs) for user classes and component class stores
+- [`4D`](../commands/4d) for built-in classes
+
+
+### Summary
+
+
+||
+|---|
+|[<!-- INCLUDE #ClassStoreClass.classClassName.Syntax -->](#classclassname)<br/><!-- INCLUDE #ClassStoreClass.classclassName.Summary -->|
+|[<!-- INCLUDE #ClassStoreClass.classStoreName.Syntax -->](#classstorename)<br/><!-- INCLUDE #ClassStoreClass.classStoreName.Summary -->|
+
+
+## *.classClassName*
+
+
+<!-- REF ClassStoreClass.classClassName.Syntax -->***.classClassName*** : 4D.Class<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classClassName.Summary -->exposed [`4D.Class`](./ClassClass.md) class in the class store<!-- END REF --> is available as a property of the class store.
+
+#### Example
+
+```4d
+var $myclass:=cs.EmployeeEntity
+	//$myclass is a class from the cs class store
+
+```
+
+
+## *.classStoreName*
+
+
+<!-- REF ClassStoreClass.classStoreName.Syntax -->***.classStoreName*** : 4D.ClassStore<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classStoreName.Summary -->`4D.ClassStore` published by a component<!-- END REF --> is available as a property of the class store.
+
+The name of the class store published by a component is the component namespace as [declared in the component's Settings page](../Extensions/develop-components.md#declaring-the-component-namespace).
+
+#### Example
+
+```4d
+var $classtore:=cs.AiKit
+	//$classtore is the class store of the 4D AIKit component
+```
diff --git a/docs/API/DataStoreClass.md b/docs/API/DataStoreClass.md
index 439a5ce1fbb8eb..ca480416fb69eb 100644
--- a/docs/API/DataStoreClass.md
+++ b/docs/API/DataStoreClass.md
@@ -53,7 +53,7 @@ A [Datastore](ORDA/dsMapping.md#datastore) is the interface object provided by O
 
 #### Description
 
-Each dataclass in a datastore is available as a property of the [DataStore object](ORDA/dsMapping.md#datastore)data. The returned object <!-- REF DataStoreClass.dataclassName.Summary -->contains a description of the dataclass<!-- END REF -->.
+Each dataclass in a datastore is available as a property of the [DataStore object](ORDA/dsMapping.md#datastore) data. The returned object <!-- REF DataStoreClass.dataclassName.Summary -->contains a description of the dataclass<!-- END REF -->.
 
 #### Example
 
diff --git a/docs/Concepts/classes.md b/docs/Concepts/classes.md
index ba337361bf59b2..5aabc1427cb823 100644
--- a/docs/Concepts/classes.md
+++ b/docs/Concepts/classes.md
@@ -52,8 +52,8 @@ You can also remove the .4dm class file from the "Classes" folder on your disk.
 
 Available classes are accessible from their class stores. Two class stores are available:
 
-- [`cs`](../commands/cs) for user class store
-- [`4D`](../commands/4d) for built-in class store
+- [`cs`](../commands/cs) for user classes and component class stores
+- [`4D`](../commands/4d) for built-in classes
 
 
 #### `cs`
@@ -67,7 +67,7 @@ Available classes are accessible from their class stores. Two class stores are a
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|User class store for the project or component|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|User class store for the project or component|
 </div>
 <!-- END REF -->
 
@@ -90,7 +90,7 @@ $instance:=cs.myClass.new()
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|4D class store|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|4D class store|
 </div>
 <!-- END REF -->
 
diff --git a/docs/language-legacy/Language/4d.md b/docs/language-legacy/Language/4d.md
index 64e32e0d273247..e94fc47a04f5e5 100644
--- a/docs/language-legacy/Language/4d.md
+++ b/docs/language-legacy/Language/4d.md
@@ -9,7 +9,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 | --- | --- | --- | --- |
-| classStore | Object | &#8592; | Class Store containing all built-in 4D classes |
+| classStore | [4D.ClassStore](../../API/ClassStoreClass.md)| &#8592; | Class Store containing all built-in 4D classes |
 
 
 <div class="no-index">
diff --git a/docs/language-legacy/Language/cs.md b/docs/language-legacy/Language/cs.md
index b68f1db2b0728e..1e5e855a79dfa8 100644
--- a/docs/language-legacy/Language/cs.md
+++ b/docs/language-legacy/Language/cs.md
@@ -7,7 +7,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 |---|---|---|---|
-| classStore | Object | &#8592; | User class store for the project or component |
+| classStore | [4D.ClassStore](../../API/ClassStoreClass.md)| &#8592; | User class store for the project or component |
 
 <div class="no-index">
 <details><summary>History</summary>
diff --git a/docs/preprocessing.conf b/docs/preprocessing.conf
index 84c2a0c7191049..17789410c6d96b 100644
--- a/docs/preprocessing.conf
+++ b/docs/preprocessing.conf
@@ -25,6 +25,7 @@
 <!-- REF #DataClassClass._alias_-->DataClass<!-- END REF -->
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 <!-- REF #HTTPAgentClass._alias_-->HTTPAgent<!-- END REF -->
 <!-- REF #HTTPRequestClass._alias_-->HTTPRequest<!-- END REF -->
diff --git a/i18n/es/docusaurus-plugin-content-docs/current/preprocessing.conf b/i18n/es/docusaurus-plugin-content-docs/current/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/es/docusaurus-plugin-content-docs/current/preprocessing.conf
+++ b/i18n/es/docusaurus-plugin-content-docs/current/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/es/docusaurus-plugin-content-docs/version-19/preprocessing.conf b/i18n/es/docusaurus-plugin-content-docs/version-19/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/es/docusaurus-plugin-content-docs/version-19/preprocessing.conf
+++ b/i18n/es/docusaurus-plugin-content-docs/version-19/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/es/docusaurus-plugin-content-docs/version-20/preprocessing.conf b/i18n/es/docusaurus-plugin-content-docs/version-20/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/es/docusaurus-plugin-content-docs/version-20/preprocessing.conf
+++ b/i18n/es/docusaurus-plugin-content-docs/version-20/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/es/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf b/i18n/es/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/es/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
+++ b/i18n/es/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/es/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf b/i18n/es/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/es/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
+++ b/i18n/es/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/es/docusaurus-plugin-content-docs/version-21/preprocessing.conf b/i18n/es/docusaurus-plugin-content-docs/version-21/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/es/docusaurus-plugin-content-docs/version-21/preprocessing.conf
+++ b/i18n/es/docusaurus-plugin-content-docs/version-21/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/preprocessing.conf b/i18n/fr/docusaurus-plugin-content-docs/current/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/current/preprocessing.conf
+++ b/i18n/fr/docusaurus-plugin-content-docs/current/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/version-19/preprocessing.conf b/i18n/fr/docusaurus-plugin-content-docs/version-19/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/version-19/preprocessing.conf
+++ b/i18n/fr/docusaurus-plugin-content-docs/version-19/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/version-20/preprocessing.conf b/i18n/fr/docusaurus-plugin-content-docs/version-20/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/version-20/preprocessing.conf
+++ b/i18n/fr/docusaurus-plugin-content-docs/version-20/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf b/i18n/fr/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
+++ b/i18n/fr/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf b/i18n/fr/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
+++ b/i18n/fr/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/version-21/preprocessing.conf b/i18n/fr/docusaurus-plugin-content-docs/version-21/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/version-21/preprocessing.conf
+++ b/i18n/fr/docusaurus-plugin-content-docs/version-21/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/preprocessing.conf b/i18n/ja/docusaurus-plugin-content-docs/current/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/current/preprocessing.conf
+++ b/i18n/ja/docusaurus-plugin-content-docs/current/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/version-19/preprocessing.conf b/i18n/ja/docusaurus-plugin-content-docs/version-19/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/version-19/preprocessing.conf
+++ b/i18n/ja/docusaurus-plugin-content-docs/version-19/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/version-20/preprocessing.conf b/i18n/ja/docusaurus-plugin-content-docs/version-20/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/version-20/preprocessing.conf
+++ b/i18n/ja/docusaurus-plugin-content-docs/version-20/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf b/i18n/ja/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
+++ b/i18n/ja/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf b/i18n/ja/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
+++ b/i18n/ja/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/version-21/preprocessing.conf b/i18n/ja/docusaurus-plugin-content-docs/version-21/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/version-21/preprocessing.conf
+++ b/i18n/ja/docusaurus-plugin-content-docs/version-21/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/pt/docusaurus-plugin-content-docs/current/preprocessing.conf b/i18n/pt/docusaurus-plugin-content-docs/current/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/pt/docusaurus-plugin-content-docs/current/preprocessing.conf
+++ b/i18n/pt/docusaurus-plugin-content-docs/current/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/pt/docusaurus-plugin-content-docs/version-19/preprocessing.conf b/i18n/pt/docusaurus-plugin-content-docs/version-19/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/pt/docusaurus-plugin-content-docs/version-19/preprocessing.conf
+++ b/i18n/pt/docusaurus-plugin-content-docs/version-19/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/pt/docusaurus-plugin-content-docs/version-20/preprocessing.conf b/i18n/pt/docusaurus-plugin-content-docs/version-20/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/pt/docusaurus-plugin-content-docs/version-20/preprocessing.conf
+++ b/i18n/pt/docusaurus-plugin-content-docs/version-20/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/pt/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf b/i18n/pt/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/pt/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
+++ b/i18n/pt/docusaurus-plugin-content-docs/version-21-R2/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/pt/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf b/i18n/pt/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/pt/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
+++ b/i18n/pt/docusaurus-plugin-content-docs/version-21-R3/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/i18n/pt/docusaurus-plugin-content-docs/version-21/preprocessing.conf b/i18n/pt/docusaurus-plugin-content-docs/version-21/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/i18n/pt/docusaurus-plugin-content-docs/version-21/preprocessing.conf
+++ b/i18n/pt/docusaurus-plugin-content-docs/version-21/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/sidebars.js b/sidebars.js
index 56f1df5e9cc37b..17c8ee1a6e1339 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -228,6 +228,7 @@ module.exports =
           items: [
             "API/BlobClass",
             "API/ClassClass",
+            "API/ClassStoreClass",
             "API/CollectionClass",
             "API/CryptoKeyClass",
             "API/DataClassClass",
diff --git a/versioned_docs/version-19/preprocessing.conf b/versioned_docs/version-19/preprocessing.conf
index df855c4b132ad7..32efc64382202c 100644
--- a/versioned_docs/version-19/preprocessing.conf
+++ b/versioned_docs/version-19/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 
 
diff --git a/versioned_docs/version-20/preprocessing.conf b/versioned_docs/version-20/preprocessing.conf
index b13e12e71697e9..a673757447d0a3 100644
--- a/versioned_docs/version-20/preprocessing.conf
+++ b/versioned_docs/version-20/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #DataClassAttributeClass._alias_-->DataClassAttribute<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 <!-- REF #HTTPRequestClass._alias_-->HTTPRequest<!-- END REF -->
 <!-- REF #FileHandleClass._alias_-->FileHandle<!-- END REF -->
diff --git a/versioned_docs/version-21-R2/API/ClassStoreClass.md b/versioned_docs/version-21-R2/API/ClassStoreClass.md
new file mode 100644
index 00000000000000..c24a14ca7b37a0
--- /dev/null
+++ b/versioned_docs/version-21-R2/API/ClassStoreClass.md
@@ -0,0 +1,58 @@
+---
+id: ClassStoreClass
+title: ClassStore
+---
+
+
+`4D.ClassStore` properties are available classes and class stores. 
+
+4D exposes two [class stores](../Concepts/classes.md#class-stores):
+
+- [`cs`](../commands/cs) for user classes and component class stores
+- [`4D`](../commands/4d) for built-in classes
+
+
+### Summary
+
+
+||
+|---|
+|[<!-- INCLUDE #ClassStoreClass.classClassName.Syntax -->](#classclassname)<br/><!-- INCLUDE #ClassStoreClass.classclassName.Summary -->|
+|[<!-- INCLUDE #ClassStoreClass.classStoreName.Syntax -->](#classstorename)<br/><!-- INCLUDE #ClassStoreClass.classStoreName.Summary -->|
+
+
+## *.classClassName*
+
+
+<!-- REF ClassStoreClass.classClassName.Syntax -->***.classClassName*** : 4D.Class<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classClassName.Summary -->exposed [`4D.Class`](./ClassClass.md) class in the class store<!-- END REF --> is available as a property of the class store.
+
+#### Example
+
+```4d
+var $myclass:=cs.EmployeeEntity
+	//$myclass is a class from the cs class store
+
+```
+
+
+## *.classStoreName*
+
+
+<!-- REF ClassStoreClass.classStoreName.Syntax -->***.classStoreName*** : 4D.ClassStore<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classStoreName.Summary -->`4D.ClassStore` published by a component<!-- END REF --> is available as a property of the class store.
+
+The name of the class store published by a component is the component namespace as [declared in the component's Settings page](../Extensions/develop-components.md#declaring-the-component-namespace).
+
+#### Example
+
+```4d
+var $classtore:=cs.AiKit
+	//$classtore is the class store of the 4D AIKit component
+```
diff --git a/versioned_docs/version-21-R2/Concepts/classes.md b/versioned_docs/version-21-R2/Concepts/classes.md
index 438f4d1f479eb3..f73e8a703100e4 100644
--- a/versioned_docs/version-21-R2/Concepts/classes.md
+++ b/versioned_docs/version-21-R2/Concepts/classes.md
@@ -119,7 +119,7 @@ Available classes are accessible from their class stores. Two class stores are a
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|User class store for the project or component|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|User class store for the project or component|
 </div>
 <!-- END REF -->
 
@@ -142,7 +142,7 @@ $instance:=cs.myClass.new()
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|4D class store|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|4D class store|
 </div>
 <!-- END REF -->
 
diff --git a/versioned_docs/version-21-R2/commands/4d.md b/versioned_docs/version-21-R2/commands/4d.md
index eb744f619d8cdd..b8e51b316fda86 100644
--- a/versioned_docs/version-21-R2/commands/4d.md
+++ b/versioned_docs/version-21-R2/commands/4d.md
@@ -8,7 +8,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 | --- | --- | --- | --- |
-| classStore | Object | &#8592; | Class Store containing all built-in 4D classes |
+| classStore | [4D.ClassStore](../API/ClassStoreClass.md)| &#8592; | Class Store containing all built-in 4D classes |
 
 
 <div class="no-index">
diff --git a/versioned_docs/version-21-R2/commands/cs.md b/versioned_docs/version-21-R2/commands/cs.md
index 264ef54541a362..b5128fca195558 100644
--- a/versioned_docs/version-21-R2/commands/cs.md
+++ b/versioned_docs/version-21-R2/commands/cs.md
@@ -6,7 +6,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 |---|---|---|---|
-| classStore | Object | &#8592; | User class store for the project or component |
+| classStore | [4D.ClassStore](../API/ClassStoreClass.md)| &#8592; | User class store for the project or component |
 
 <div class="no-index">
 <details><summary>History</summary>
diff --git a/versioned_docs/version-21-R2/preprocessing.conf b/versioned_docs/version-21-R2/preprocessing.conf
index a794cd670a9b0d..922f85fc9d905f 100644
--- a/versioned_docs/version-21-R2/preprocessing.conf
+++ b/versioned_docs/version-21-R2/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataClassClass._alias_-->DataClass<!-- END REF -->
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 <!-- REF #HTTPAgentClass._alias_-->HTTPAgent<!-- END REF -->
 <!-- REF #HTTPRequestClass._alias_-->HTTPRequest<!-- END REF -->
diff --git a/versioned_docs/version-21-R3/API/ClassStoreClass.md b/versioned_docs/version-21-R3/API/ClassStoreClass.md
new file mode 100644
index 00000000000000..c24a14ca7b37a0
--- /dev/null
+++ b/versioned_docs/version-21-R3/API/ClassStoreClass.md
@@ -0,0 +1,58 @@
+---
+id: ClassStoreClass
+title: ClassStore
+---
+
+
+`4D.ClassStore` properties are available classes and class stores. 
+
+4D exposes two [class stores](../Concepts/classes.md#class-stores):
+
+- [`cs`](../commands/cs) for user classes and component class stores
+- [`4D`](../commands/4d) for built-in classes
+
+
+### Summary
+
+
+||
+|---|
+|[<!-- INCLUDE #ClassStoreClass.classClassName.Syntax -->](#classclassname)<br/><!-- INCLUDE #ClassStoreClass.classclassName.Summary -->|
+|[<!-- INCLUDE #ClassStoreClass.classStoreName.Syntax -->](#classstorename)<br/><!-- INCLUDE #ClassStoreClass.classStoreName.Summary -->|
+
+
+## *.classClassName*
+
+
+<!-- REF ClassStoreClass.classClassName.Syntax -->***.classClassName*** : 4D.Class<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classClassName.Summary -->exposed [`4D.Class`](./ClassClass.md) class in the class store<!-- END REF --> is available as a property of the class store.
+
+#### Example
+
+```4d
+var $myclass:=cs.EmployeeEntity
+	//$myclass is a class from the cs class store
+
+```
+
+
+## *.classStoreName*
+
+
+<!-- REF ClassStoreClass.classStoreName.Syntax -->***.classStoreName*** : 4D.ClassStore<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classStoreName.Summary -->`4D.ClassStore` published by a component<!-- END REF --> is available as a property of the class store.
+
+The name of the class store published by a component is the component namespace as [declared in the component's Settings page](../Extensions/develop-components.md#declaring-the-component-namespace).
+
+#### Example
+
+```4d
+var $classtore:=cs.AiKit
+	//$classtore is the class store of the 4D AIKit component
+```
diff --git a/versioned_docs/version-21-R3/API/DataStoreClass.md b/versioned_docs/version-21-R3/API/DataStoreClass.md
index 439a5ce1fbb8eb..ca480416fb69eb 100644
--- a/versioned_docs/version-21-R3/API/DataStoreClass.md
+++ b/versioned_docs/version-21-R3/API/DataStoreClass.md
@@ -53,7 +53,7 @@ A [Datastore](ORDA/dsMapping.md#datastore) is the interface object provided by O
 
 #### Description
 
-Each dataclass in a datastore is available as a property of the [DataStore object](ORDA/dsMapping.md#datastore)data. The returned object <!-- REF DataStoreClass.dataclassName.Summary -->contains a description of the dataclass<!-- END REF -->.
+Each dataclass in a datastore is available as a property of the [DataStore object](ORDA/dsMapping.md#datastore) data. The returned object <!-- REF DataStoreClass.dataclassName.Summary -->contains a description of the dataclass<!-- END REF -->.
 
 #### Example
 
diff --git a/versioned_docs/version-21-R3/Concepts/classes.md b/versioned_docs/version-21-R3/Concepts/classes.md
index c3bf9f7d57d8cf..bbb05914bdf37c 100644
--- a/versioned_docs/version-21-R3/Concepts/classes.md
+++ b/versioned_docs/version-21-R3/Concepts/classes.md
@@ -52,8 +52,8 @@ You can also remove the .4dm class file from the "Classes" folder on your disk.
 
 Available classes are accessible from their class stores. Two class stores are available:
 
-- [`cs`](../commands/cs) for user class store
-- [`4D`](../commands/4d) for built-in class store
+- [`cs`](../commands/cs) for user classes and component class stores
+- [`4D`](../commands/4d) for built-in classes
 
 
 #### `cs`
@@ -67,7 +67,7 @@ Available classes are accessible from their class stores. Two class stores are a
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|User class store for the project or component|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|User class store for the project or component|
 </div>
 <!-- END REF -->
 
@@ -90,7 +90,7 @@ $instance:=cs.myClass.new()
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|4D class store|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|4D class store|
 </div>
 <!-- END REF -->
 
diff --git a/versioned_docs/version-21-R3/language-legacy/Language/4d.md b/versioned_docs/version-21-R3/language-legacy/Language/4d.md
index 64e32e0d273247..e94fc47a04f5e5 100644
--- a/versioned_docs/version-21-R3/language-legacy/Language/4d.md
+++ b/versioned_docs/version-21-R3/language-legacy/Language/4d.md
@@ -9,7 +9,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 | --- | --- | --- | --- |
-| classStore | Object | &#8592; | Class Store containing all built-in 4D classes |
+| classStore | [4D.ClassStore](../../API/ClassStoreClass.md)| &#8592; | Class Store containing all built-in 4D classes |
 
 
 <div class="no-index">
diff --git a/versioned_docs/version-21-R3/language-legacy/Language/cs.md b/versioned_docs/version-21-R3/language-legacy/Language/cs.md
index b68f1db2b0728e..1e5e855a79dfa8 100644
--- a/versioned_docs/version-21-R3/language-legacy/Language/cs.md
+++ b/versioned_docs/version-21-R3/language-legacy/Language/cs.md
@@ -7,7 +7,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 |---|---|---|---|
-| classStore | Object | &#8592; | User class store for the project or component |
+| classStore | [4D.ClassStore](../../API/ClassStoreClass.md)| &#8592; | User class store for the project or component |
 
 <div class="no-index">
 <details><summary>History</summary>
diff --git a/versioned_docs/version-21-R3/preprocessing.conf b/versioned_docs/version-21-R3/preprocessing.conf
index 84c2a0c7191049..17789410c6d96b 100644
--- a/versioned_docs/version-21-R3/preprocessing.conf
+++ b/versioned_docs/version-21-R3/preprocessing.conf
@@ -25,6 +25,7 @@
 <!-- REF #DataClassClass._alias_-->DataClass<!-- END REF -->
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 <!-- REF #HTTPAgentClass._alias_-->HTTPAgent<!-- END REF -->
 <!-- REF #HTTPRequestClass._alias_-->HTTPRequest<!-- END REF -->
diff --git a/versioned_docs/version-21/API/ClassStoreClass.md b/versioned_docs/version-21/API/ClassStoreClass.md
new file mode 100644
index 00000000000000..c24a14ca7b37a0
--- /dev/null
+++ b/versioned_docs/version-21/API/ClassStoreClass.md
@@ -0,0 +1,58 @@
+---
+id: ClassStoreClass
+title: ClassStore
+---
+
+
+`4D.ClassStore` properties are available classes and class stores. 
+
+4D exposes two [class stores](../Concepts/classes.md#class-stores):
+
+- [`cs`](../commands/cs) for user classes and component class stores
+- [`4D`](../commands/4d) for built-in classes
+
+
+### Summary
+
+
+||
+|---|
+|[<!-- INCLUDE #ClassStoreClass.classClassName.Syntax -->](#classclassname)<br/><!-- INCLUDE #ClassStoreClass.classclassName.Summary -->|
+|[<!-- INCLUDE #ClassStoreClass.classStoreName.Syntax -->](#classstorename)<br/><!-- INCLUDE #ClassStoreClass.classStoreName.Summary -->|
+
+
+## *.classClassName*
+
+
+<!-- REF ClassStoreClass.classClassName.Syntax -->***.classClassName*** : 4D.Class<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classClassName.Summary -->exposed [`4D.Class`](./ClassClass.md) class in the class store<!-- END REF --> is available as a property of the class store.
+
+#### Example
+
+```4d
+var $myclass:=cs.EmployeeEntity
+	//$myclass is a class from the cs class store
+
+```
+
+
+## *.classStoreName*
+
+
+<!-- REF ClassStoreClass.classStoreName.Syntax -->***.classStoreName*** : 4D.ClassStore<!-- END REF -->
+
+#### Description
+
+Each <!-- REF ClassStoreClass.classStoreName.Summary -->`4D.ClassStore` published by a component<!-- END REF --> is available as a property of the class store.
+
+The name of the class store published by a component is the component namespace as [declared in the component's Settings page](../Extensions/develop-components.md#declaring-the-component-namespace).
+
+#### Example
+
+```4d
+var $classtore:=cs.AiKit
+	//$classtore is the class store of the 4D AIKit component
+```
diff --git a/versioned_docs/version-21/Concepts/classes.md b/versioned_docs/version-21/Concepts/classes.md
index 438f4d1f479eb3..f73e8a703100e4 100644
--- a/versioned_docs/version-21/Concepts/classes.md
+++ b/versioned_docs/version-21/Concepts/classes.md
@@ -119,7 +119,7 @@ Available classes are accessible from their class stores. Two class stores are a
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|User class store for the project or component|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|User class store for the project or component|
 </div>
 <!-- END REF -->
 
@@ -142,7 +142,7 @@ $instance:=cs.myClass.new()
 
 |Parameter|Type||Description|
 |---|---|---|---|
-|classStore|Object|&#8592;|4D class store|
+|classStore|[4D.ClassStore](../API/ClassStoreClass.md)|&#8592;|4D class store|
 </div>
 <!-- END REF -->
 
diff --git a/versioned_docs/version-21/commands/4d.md b/versioned_docs/version-21/commands/4d.md
index eb744f619d8cdd..b8e51b316fda86 100644
--- a/versioned_docs/version-21/commands/4d.md
+++ b/versioned_docs/version-21/commands/4d.md
@@ -8,7 +8,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 | --- | --- | --- | --- |
-| classStore | Object | &#8592; | Class Store containing all built-in 4D classes |
+| classStore | [4D.ClassStore](../API/ClassStoreClass.md)| &#8592; | Class Store containing all built-in 4D classes |
 
 
 <div class="no-index">
diff --git a/versioned_docs/version-21/commands/cs.md b/versioned_docs/version-21/commands/cs.md
index 264ef54541a362..b5128fca195558 100644
--- a/versioned_docs/version-21/commands/cs.md
+++ b/versioned_docs/version-21/commands/cs.md
@@ -6,7 +6,7 @@ displayed_sidebar: docs
 
 | Parameter | Type |  | Description |
 |---|---|---|---|
-| classStore | Object | &#8592; | User class store for the project or component |
+| classStore | [4D.ClassStore](../API/ClassStoreClass.md)| &#8592; | User class store for the project or component |
 
 <div class="no-index">
 <details><summary>History</summary>
diff --git a/versioned_docs/version-21/preprocessing.conf b/versioned_docs/version-21/preprocessing.conf
index a794cd670a9b0d..922f85fc9d905f 100644
--- a/versioned_docs/version-21/preprocessing.conf
+++ b/versioned_docs/version-21/preprocessing.conf
@@ -22,6 +22,7 @@
 <!-- REF #DataClassClass._alias_-->DataClass<!-- END REF -->
 <!-- REF #DataStoreClass._alias_-->DataStore<!-- END REF -->
 <!-- REF #ClassClass._alias_-->Class<!-- END REF -->
+<!-- REF #ClassStoreClass._alias_-->ClassStore<!-- END REF -->
 <!-- REF #WebServerClass._alias_-->WebServer<!-- END REF -->
 <!-- REF #HTTPAgentClass._alias_-->HTTPAgent<!-- END REF -->
 <!-- REF #HTTPRequestClass._alias_-->HTTPRequest<!-- END REF -->
diff --git a/versioned_sidebars/version-21-R2-sidebars.json b/versioned_sidebars/version-21-R2-sidebars.json
index 754c5715e36397..be149386966987 100644
--- a/versioned_sidebars/version-21-R2-sidebars.json
+++ b/versioned_sidebars/version-21-R2-sidebars.json
@@ -2209,6 +2209,7 @@
           "items": [
             "API/BlobClass",
             "API/ClassClass",
+            "API/ClassStoreClass",
             "API/CollectionClass",
             "API/CryptoKeyClass",
             "API/DataClassClass",
diff --git a/versioned_sidebars/version-21-R3-sidebars.json b/versioned_sidebars/version-21-R3-sidebars.json
index e862b0ffe99e0c..5c6921fa9ffe65 100644
--- a/versioned_sidebars/version-21-R3-sidebars.json
+++ b/versioned_sidebars/version-21-R3-sidebars.json
@@ -227,6 +227,7 @@
           "items": [
             "API/BlobClass",
             "API/ClassClass",
+            "API/ClassStoreClass",
             "API/CollectionClass",
             "API/CryptoKeyClass",
             "API/DataClassClass",
diff --git a/versioned_sidebars/version-21-sidebars.json b/versioned_sidebars/version-21-sidebars.json
index bed9688480c912..cd2550c9b98e8e 100644
--- a/versioned_sidebars/version-21-sidebars.json
+++ b/versioned_sidebars/version-21-sidebars.json
@@ -2205,6 +2205,7 @@
           "items": [
             "API/BlobClass",
             "API/ClassClass",
+            "API/ClassStoreClass",
             "API/CollectionClass",
             "API/CryptoKeyClass",
             "API/DataClassClass",