diff --git a/diagrams/saas/__init__.py b/diagrams/saas/__init__.py
index ecae1d80..84ef7493 100644
--- a/diagrams/saas/__init__.py
+++ b/diagrams/saas/__init__.py
@@ -1,5 +1,5 @@
 """
-Saas provides a set of general saas services.
+Saas provides a set of general SaaS services.
 """
 
 from diagrams import Node
diff --git a/diagrams/saas/analytics.py b/diagrams/saas/analytics.py
index 20659b3e..e5cae980 100644
--- a/diagrams/saas/analytics.py
+++ b/diagrams/saas/analytics.py
@@ -8,6 +8,14 @@ class _Analytics(_Saas):
     _icon_dir = "resources/saas/analytics"
 
 
+class Hotjar(_Analytics):
+    _icon = "hotjar.png"
+
+
+class Mixpanel(_Analytics):
+    _icon = "mixpanel.png"
+
+
 class Snowflake(_Analytics):
     _icon = "snowflake.png"
 
diff --git a/diagrams/saas/cdp.py b/diagrams/saas/cdp.py
new file mode 100644
index 00000000..4118ec1d
--- /dev/null
+++ b/diagrams/saas/cdp.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Saas
+
+
+class _CustomerDataPlatform(_Saas):
+    _type = "cdm"
+    _icon_dir = "resources/saas/cdp"
+
+
+class Segment(_CustomerDataPlatform):
+    _icon = "segment.png"
+
+
+class RudderStack(_CustomerDataPlatform):
+    _icon = "rudderstack.png"
+
+
+# Aliases
diff --git a/diagrams/saas/crm.py b/diagrams/saas/crm.py
new file mode 100644
index 00000000..fa100f20
--- /dev/null
+++ b/diagrams/saas/crm.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Saas
+
+
+class _CustomerRelationshipManagement(_Saas):
+    _type = "crm"
+    _icon_dir = "resources/saas/crm"
+
+
+class Pipedrive(_CustomerRelationshipManagement):
+    _icon = "pipedrive.png"
+
+
+# Aliases
diff --git a/diagrams/saas/issues.py b/diagrams/saas/issues.py
new file mode 100644
index 00000000..134d2261
--- /dev/null
+++ b/diagrams/saas/issues.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Saas
+
+
+class _Issues(_Saas):
+    _type = "issues"
+    _icon_dir = "resources/saas/issues"
+
+
+class ZenHub(_Issues):
+    _icon = "zenhub.png"
+
+
+# Aliases
diff --git a/docs/nodes/saas.md b/docs/nodes/saas.md
index 7197cbf3..cfc2be9d 100644
--- a/docs/nodes/saas.md
+++ b/docs/nodes/saas.md
@@ -14,6 +14,8 @@ Node classes list of saas provider.
 
 ## saas.analytics
 
+- **diagrams.saas.analytics.Hotjar**
+- **diagrams.saas.analytics.Mixpanel**
 - **diagrams.saas.analytics.Snowflake**
 - **diagrams.saas.analytics.Stitch**
 
@@ -23,6 +25,15 @@ Node classes list of saas provider.
 - **diagrams.saas.cdn.Cloudflare**
 - **diagrams.saas.cdn.Fastly**
 
+## saas.cdp
+
+- **diagrams.saas.cdp.RudderStack**
+- **diagrams.saas.cdp.Segment**
+
+## saas.crm
+
+- **diagrams.saas.crm.Pipedrive**
+
 ## saas.chat
 
 - **diagrams.saas.chat.Discord**
@@ -47,6 +58,10 @@ Node classes list of saas provider.
 - **diagrams.saas.identity.Auth0**
 - **diagrams.saas.identity.Okta**
 
+## saas.issues
+
+- **diagrams.saas.issues.ZenHub**
+
 ## saas.logging
 
 - **diagrams.saas.logging.Datadog**, **DataDog** (alias)
@@ -57,6 +72,10 @@ Node classes list of saas provider.
 
 - **diagrams.saas.media.Cloudinary**
 
+## saas.product
+
+- **diagrams.saas.product.Productboard**
+
 ## saas.recommendation
 
 - **diagrams.saas.recommendation.Recombee**
diff --git a/resources/saas/analytics/hotjar.png b/resources/saas/analytics/hotjar.png
new file mode 100644
index 00000000..eadc59fd
Binary files /dev/null and b/resources/saas/analytics/hotjar.png differ
diff --git a/resources/saas/analytics/mixpanel.png b/resources/saas/analytics/mixpanel.png
new file mode 100644
index 00000000..5b3c7514
Binary files /dev/null and b/resources/saas/analytics/mixpanel.png differ
diff --git a/resources/saas/cdp/rudderstack.png b/resources/saas/cdp/rudderstack.png
new file mode 100644
index 00000000..dbf01751
Binary files /dev/null and b/resources/saas/cdp/rudderstack.png differ
diff --git a/resources/saas/cdp/segment.png b/resources/saas/cdp/segment.png
new file mode 100644
index 00000000..72efe85b
Binary files /dev/null and b/resources/saas/cdp/segment.png differ
diff --git a/resources/saas/crm/pipedrive.png b/resources/saas/crm/pipedrive.png
new file mode 100644
index 00000000..cb0500ea
Binary files /dev/null and b/resources/saas/crm/pipedrive.png differ
diff --git a/resources/saas/issues/zenhub.png b/resources/saas/issues/zenhub.png
new file mode 100644
index 00000000..932955b4
Binary files /dev/null and b/resources/saas/issues/zenhub.png differ
diff --git a/resources/saas/product/productboard.png b/resources/saas/product/productboard.png
new file mode 100644
index 00000000..cc27e5ae
Binary files /dev/null and b/resources/saas/product/productboard.png differ