diff --git a/config.py b/config.py
index 275baaab..4c1ed771 100644
--- a/config.py
+++ b/config.py
@@ -137,6 +137,8 @@ ALIASES = {
         "database": {
             "DatabaseMigrationService": "DMS",
             "DocumentdbMongodbCompatibility": "DocumentDB",
+            "DynamodbDax": "DAX",
+            "DynamodbGlobalSecondaryIndex": "DynamodbGSI",
             "Database": "DB",
             "Dynamodb": "DDB",
             "Elasticache": "ElastiCache",
@@ -185,6 +187,10 @@ ALIASES = {
             "Cloudhsm": "CloudHSM",
             "DirectoryService": "DS",
             "FirewallManager": "FMS",
+            "IdentityAndAccessManagementIamAccessAnalyzer": "IAMAccessAnalyzer",
+            "IdentityAndAccessManagementIamAWSSts": "IAMAWSSts",
+            "IdentityAndAccessManagementIamPermissions": "IAMPermissions",
+            "IdentityAndAccessManagementIamRole": "IAMRole",
             "IdentityAndAccessManagementIam": "IAM",
             "KeyManagementService": "KMS",
             "ResourceAccessManager": "RAM",
diff --git a/diagrams/aws/database.py b/diagrams/aws/database.py
index fa98cde2..145fcb5d 100644
--- a/diagrams/aws/database.py
+++ b/diagrams/aws/database.py
@@ -72,6 +72,8 @@ class Timestream(_Database):
 
 DMS = DatabaseMigrationService
 DocumentDB = DocumentdbMongodbCompatibility
+DAX = DynamodbDax
+DynamodbGSI = DynamodbGlobalSecondaryIndex
 DB = Database
 DDB = Dynamodb
 ElastiCache = Elasticache
diff --git a/diagrams/aws/security.py b/diagrams/aws/security.py
index bf408b0c..61da75a9 100644
--- a/diagrams/aws/security.py
+++ b/diagrams/aws/security.py
@@ -110,6 +110,10 @@ ACM = CertificateManager
 CloudHSM = Cloudhsm
 DS = DirectoryService
 FMS = FirewallManager
+IAMAccessAnalyzer = IdentityAndAccessManagementIamAccessAnalyzer
+IAMAWSSts = IdentityAndAccessManagementIamAWSSts
+IAMPermissions = IdentityAndAccessManagementIamPermissions
+IAMRole = IdentityAndAccessManagementIamRole
 IAM = IdentityAndAccessManagementIam
 KMS = KeyManagementService
 RAM = ResourceAccessManager
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 00fe090a..ef5bdec2 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -61,8 +61,8 @@ Node classes list of aws provider.
 - **diagrams.aws.database.DatabaseMigrationService**, **DMS** (alias)
 - **diagrams.aws.database.Database**, **DB** (alias)
 - **diagrams.aws.database.DocumentdbMongodbCompatibility**, **DocumentDB** (alias)
-- **diagrams.aws.database.DynamodbDax**
-- **diagrams.aws.database.DynamodbGlobalSecondaryIndex**
+- **diagrams.aws.database.DynamodbDax**, **DAX** (alias)
+- **diagrams.aws.database.DynamodbGlobalSecondaryIndex**, **DynamodbGSI** (alias)
 - **diagrams.aws.database.DynamodbTable**
 - **diagrams.aws.database.Dynamodb**, **DDB** (alias)
 - **diagrams.aws.database.Elasticache**, **ElastiCache** (alias)
@@ -261,10 +261,10 @@ Node classes list of aws provider.
 - **diagrams.aws.security.DirectoryService**, **DS** (alias)
 - **diagrams.aws.security.FirewallManager**, **FMS** (alias)
 - **diagrams.aws.security.Guardduty**
-- **diagrams.aws.security.IdentityAndAccessManagementIamAccessAnalyzer**
-- **diagrams.aws.security.IdentityAndAccessManagementIamAWSSts**
-- **diagrams.aws.security.IdentityAndAccessManagementIamPermissions**
-- **diagrams.aws.security.IdentityAndAccessManagementIamRole**
+- **diagrams.aws.security.IdentityAndAccessManagementIamAccessAnalyzer**, **IAMAccessAnalyzer** (alias)
+- **diagrams.aws.security.IdentityAndAccessManagementIamAWSSts**, **IAMAWSSts** (alias)
+- **diagrams.aws.security.IdentityAndAccessManagementIamPermissions**, **IAMPermissions** (alias)
+- **diagrams.aws.security.IdentityAndAccessManagementIamRole**, **IAMRole** (alias)
 - **diagrams.aws.security.IdentityAndAccessManagementIam**, **IAM** (alias)
 - **diagrams.aws.security.Inspector**
 - **diagrams.aws.security.KeyManagementService**, **KMS** (alias)
diff --git a/website/i18n/en.json b/website/i18n/en.json
index ac75a433..ed67d4d7 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -32,6 +32,9 @@
       "nodes/azure": {
         "title": "Azure"
       },
+      "nodes/firebase": {
+        "title": "Firebase"
+      },
       "nodes/gcp": {
         "title": "GCP"
       },
@@ -46,6 +49,9 @@
       },
       "nodes/programming": {
         "title": "Programming"
+      },
+      "nodes/saas": {
+        "title": "Saas"
       }
     },
     "links": {