diff --git a/pep-0594.rst b/pep-0594.rst
index 0ae0d4a9ab0..339d2107b2a 100644
--- a/pep-0594.rst
+++ b/pep-0594.rst
@@ -140,35 +140,35 @@ PyPI, e.g. Pillow for image processing or NumPy-based projects to deal with
 audio processing.
 
 .. csv-table:: Table 1: Proposed modules deprecations
-   :header: "Module", "Deprecated in", "To be removed", "Replacement"
-   :widths: 1, 1, 1, 2
-
-    aifc,3.8,3.10,\-
-    asynchat,**3.6**,3.10,asyncio
-    asyncore,**3.6**,3.10,asyncio
-    audioop,3.8,3.10,\-
-    binhex,3.8,3.10,\-
-    cgi,3.8,3.10,\-
-    cgitb,3.8,3.10,\-
-    chunk,3.8,3.10,\-
-    crypt,3.8,3.10,"bcrypt, argon2cffi, hashlib, passlib"
-    formatter,3.4,3.10,\-
-    fpectl,**3.7**,**3.7**,\-
-    imghdr,3.8,3.10,"filetype, puremagic, python-magic"
-    imp,**3.4**,3.10,importlib
-    macpath,**3.7**,**3.8**,\-
-    msilib,3.8,3.10,\-
-    nntplib,3.8,3.10,\-
-    nis,3.8,3.10,\-
-    ossaudiodev,3.8,3.10,\-
-    parser,**2.5**,**3.9**,"ast, lib2to3.pgen2"
-    pipes,3.8,3.10,subprocess
-    smtpd,"**3.4.7**, **3.5.4**",3.10,aiosmtpd
-    sndhdr,3.8,3.10,"filetype, puremagic, python-magic"
-    spwd,3.8,3.10,"python-pam, simplepam"
-    sunau,3.8,3.10,\-
-    uu,3.8,3.10,\-
-    xdrlib,3.8,3.10,\-
+   :header: "Module", "Deprecated in", "To be removed", "Has expert?", "Replacement"
+   :widths: 1, 1, 1, 1, 2
+
+    aifc,3.8,3.10,**yes (inactive)**,\-
+    asynchat,**3.6**,3.10,**yes**,asyncio
+    asyncore,**3.6**,3.10,**yes**,asyncio
+    audioop,3.8,3.10,**yes**,\-
+    binhex,3.8,3.10,no,\-
+    cgi,3.8,3.10,no,\-
+    cgitb,3.8,3.10,no,\-
+    chunk,3.8,3.10,no,\-
+    crypt,3.8,3.10,**yes (inactive)**,"bcrypt, argon2cffi, hashlib, passlib"
+    formatter,3.4,3.10,no,\-
+    fpectl,**3.7**,**3.7**,n/a,\-
+    imghdr,3.8,3.10,no,"filetype, puremagic, python-magic"
+    imp,**3.4**,3.10,**yes**,importlib
+    macpath,**3.7**,**3.8**,n/a,\-
+    msilib,3.8,3.10,no,\-
+    nntplib,3.8,3.10,no,\-
+    nis,3.8,3.10,no,\-
+    ossaudiodev,3.8,3.10,no,\-
+    parser,**2.5**,**3.9**,**yes**,"ast, lib2to3.pgen2"
+    pipes,3.8,3.10,no,subprocess
+    smtpd,"**3.4.7**, **3.5.4**",3.10,**yes**,aiosmtpd
+    sndhdr,3.8,3.10,no,"filetype, puremagic, python-magic"
+    spwd,3.8,3.10,no,"python-pam, simplepam"
+    sunau,3.8,3.10,no,\-
+    uu,3.8,3.10,no,\-
+    xdrlib,3.8,3.10,no,\-
 
 
 Data encoding modules
@@ -188,6 +188,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -205,6 +207,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -222,6 +226,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -244,6 +250,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   yes, but expert is currently inactive.
 Substitute
   **none**
 
@@ -263,6 +271,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   yes
 Substitute
   **none**
 
@@ -280,6 +290,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -297,6 +309,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   `puremagic <https://pypi.org/project/puremagic/>`_,
   `filetype <https://pypi.org/project/filetype/>`_,
@@ -318,6 +332,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -336,6 +352,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   `puremagic <https://pypi.org/project/puremagic/>`_,
   `filetype <https://pypi.org/project/filetype/>`_,
@@ -353,6 +371,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -372,6 +392,8 @@ Deprecated in
   3.6
 Removed in
   3.10
+Has a designated expert
+   yes
 Substitute
   asyncio
 
@@ -393,6 +415,8 @@ Deprecated in
   3.6
 Removed in
   3.10
+Has a designated expert
+   yes
 Substitute
   asyncio
 
@@ -420,6 +444,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -440,6 +466,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -454,9 +482,11 @@ deprecation message was added in releases 3.4.7, 3.5.4, and 3.6.1.
 Module type
   pure Python
 Deprecated in
-  **3.7**
+  **3.4.7**, **3.5.4**, **3.6.1**
 To be removed in
   3.10
+Has a designated expert
+   yes
 Substitute
   aiosmtpd
 
@@ -485,6 +515,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -521,6 +553,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   yes, but expert is currently inactive.
 Substitute
   `bcrypt <https://pypi.org/project/bcrypt/>`_,
   `passlib <https://pypi.org/project/passlib/>`_,
@@ -540,6 +574,8 @@ Deprecated in
   3.7
 Removed in
   3.8
+Has a designated expert
+   n/a
 Substitute
   **none**
 
@@ -559,6 +595,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -586,6 +624,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   `python-pam <https://pypi.org/project/python-pam/>`_,
   `simpleplam <https://pypi.org/project/simplepam/>`_
@@ -605,6 +645,8 @@ Deprecated in
   3.4
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   *n/a*
 
@@ -623,6 +665,8 @@ Deprecated in
   3.4
 To be removed in
   3.10
+Has a designated expert
+   yes, experts have deprecated the module
 Substitute
   importlib
 
@@ -645,6 +689,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   **none**
 
@@ -674,6 +720,8 @@ Deprecated in
   3.8, documented as deprecated since **2.5**
 To be removed in
   **3.9**
+Has a designated expert
+   yes, experts have deprecated the module.
 Substitute
   ast, lib2to3.pgen2
 
@@ -691,6 +739,8 @@ Deprecated in
   3.8
 To be removed in
   3.10
+Has a designated expert
+   no
 Substitute
   subprocess module
 
@@ -712,6 +762,8 @@ Deprecated in
   3.7
 Removed in
   3.7
+Has a designated expert
+   n/a
 Substitute
   **none**
 
@@ -750,6 +802,8 @@ between color systems.
 
 Module type
   pure Python
+Has a designated expert
+   no
 Substitute
   `colormath <https://pypi.org/project/colormath/>`_,
   `colour <https://pypi.org/project/colour/>`_
@@ -769,6 +823,8 @@ standard library, as it is handy for quick scripts.
 
 Module type
   pure Python
+Has a designated expert
+   no
 
 lib2to3
 -------
@@ -781,6 +837,8 @@ The package is useful for other tasks besides porting code from Python 2 to
 
 Module type
   pure Python
+Has a designated expert
+   no
 
 getopt
 ------
@@ -794,6 +852,8 @@ to write simple Python scripts.
 
 Module type
   pure Python
+Has a designated expert
+   no
 Substitute
   argparse
 
@@ -810,6 +870,8 @@ Module type
   pure Python
 Deprecated in
   3.2
+Has a designated expert
+   yes
 Substitute
   argparse
 
@@ -832,6 +894,8 @@ the ``array`` module could gain support for 24 bit (3 byte) arrays.
 
 Module type
   pure Python (depends on *byteswap* from `audioop`_ C extension)
+Has a designated expert
+   no
 
 
 Future maintenance of removed modules
@@ -908,6 +972,7 @@ Update 2
 --------
 
 * Keep ``colorsys`` module
+* Add experts
 
 
 References