diff --git a/config.py b/config.py
index a78fe5c..e208cb1 100644
--- a/config.py
+++ b/config.py
@@ -132,6 +132,12 @@ ALIASES = {
         "analytics": {
             "ElasticsearchService": "ES",
         },
+        "business": {
+            "AlexaForBusiness": "A4B"
+        },
+        "blockchain": {
+            "QuantumLedgerDatabaseQldb": "QLDB"
+        },
         "compute": {
             "ApplicationAutoScaling": "AutoScaling",
             "EC2ContainerRegistry": "ECR",
diff --git a/diagrams/aws/ar.py b/diagrams/aws/ar.py
new file mode 100644
index 0000000..d5a42b9
--- /dev/null
+++ b/diagrams/aws/ar.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Ar(_AWS):
+    _type = "ar"
+    _icon_dir = "resources/aws/ar"
+
+
+class Sumerian(_Ar):
+    _icon = "sumerian.png"
+
+
+# Aliases
diff --git a/diagrams/aws/blockchain.py b/diagrams/aws/blockchain.py
new file mode 100644
index 0000000..9088477
--- /dev/null
+++ b/diagrams/aws/blockchain.py
@@ -0,0 +1,21 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Blockchain(_AWS):
+    _type = "blockchain"
+    _icon_dir = "resources/aws/blockchain"
+
+
+class ManagedBlockchain(_Blockchain):
+    _icon = "managed-blockchain.png"
+
+
+class QuantumLedgerDatabaseQldb(_Blockchain):
+    _icon = "quantum-ledger-database-qldb.png"
+
+
+# Aliases
+
+QLDB = QuantumLedgerDatabaseQldb
diff --git a/diagrams/aws/business.py b/diagrams/aws/business.py
new file mode 100644
index 0000000..7063abc
--- /dev/null
+++ b/diagrams/aws/business.py
@@ -0,0 +1,25 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Business(_AWS):
+    _type = "business"
+    _icon_dir = "resources/aws/business"
+
+
+class AlexaForBusiness(_Business):
+    _icon = "alexa-for-business.png"
+
+
+class Chime(_Business):
+    _icon = "chime.png"
+
+
+class Workmail(_Business):
+    _icon = "workmail.png"
+
+
+# Aliases
+
+A4B = AlexaForBusiness
diff --git a/diagrams/aws/cost.py b/diagrams/aws/cost.py
new file mode 100644
index 0000000..ced6de0
--- /dev/null
+++ b/diagrams/aws/cost.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Cost(_AWS):
+    _type = "cost"
+    _icon_dir = "resources/aws/cost"
+
+
+class Budgets(_Cost):
+    _icon = "budgets.png"
+
+
+class CostAndUsageReport(_Cost):
+    _icon = "cost-and-usage-report.png"
+
+
+class CostExplorer(_Cost):
+    _icon = "cost-explorer.png"
+
+
+class ReservedInstanceReporting(_Cost):
+    _icon = "reserved-instance-reporting.png"
+
+
+class SavingsPlans(_Cost):
+    _icon = "savings-plans.png"
+
+
+# Aliases
diff --git a/diagrams/aws/enablement.py b/diagrams/aws/enablement.py
new file mode 100644
index 0000000..ace1f0d
--- /dev/null
+++ b/diagrams/aws/enablement.py
@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Enablement(_AWS):
+    _type = "enablement"
+    _icon_dir = "resources/aws/enablement"
+
+
+class Iq(_Enablement):
+    _icon = "iq.png"
+
+
+class ManagedServices(_Enablement):
+    _icon = "managed-services.png"
+
+
+class ProfessionalServices(_Enablement):
+    _icon = "professional-services.png"
+
+
+class Support(_Enablement):
+    _icon = "support.png"
+
+
+# Aliases
diff --git a/diagrams/aws/enduser.py b/diagrams/aws/enduser.py
new file mode 100644
index 0000000..c55364c
--- /dev/null
+++ b/diagrams/aws/enduser.py
@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Enduser(_AWS):
+    _type = "enduser"
+    _icon_dir = "resources/aws/enduser"
+
+
+class Appstream20(_Enduser):
+    _icon = "appstream-2-0.png"
+
+
+class Workdocs(_Enduser):
+    _icon = "workdocs.png"
+
+
+class Worklink(_Enduser):
+    _icon = "worklink.png"
+
+
+class Workspaces(_Enduser):
+    _icon = "workspaces.png"
+
+
+# Aliases
diff --git a/diagrams/aws/mobile.py b/diagrams/aws/mobile.py
new file mode 100644
index 0000000..315899e
--- /dev/null
+++ b/diagrams/aws/mobile.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Mobile(_AWS):
+    _type = "mobile"
+    _icon_dir = "resources/aws/mobile"
+
+
+class Amplify(_Mobile):
+    _icon = "amplify.png"
+
+
+class APIGatewayEndpoint(_Mobile):
+    _icon = "api-gateway-endpoint.png"
+
+
+class APIGateway(_Mobile):
+    _icon = "api-gateway.png"
+
+
+class Appsync(_Mobile):
+    _icon = "appsync.png"
+
+
+class DeviceFarm(_Mobile):
+    _icon = "device-farm.png"
+
+
+class Pinpoint(_Mobile):
+    _icon = "pinpoint.png"
+
+
+# Aliases
diff --git a/diagrams/aws/quantum.py b/diagrams/aws/quantum.py
new file mode 100644
index 0000000..7135bcb
--- /dev/null
+++ b/diagrams/aws/quantum.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Quantum(_AWS):
+    _type = "quantum"
+    _icon_dir = "resources/aws/quantum"
+
+
+class Braket(_Quantum):
+    _icon = "braket.png"
+
+
+# Aliases
diff --git a/diagrams/aws/satellite.py b/diagrams/aws/satellite.py
new file mode 100644
index 0000000..bf44411
--- /dev/null
+++ b/diagrams/aws/satellite.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Satellite(_AWS):
+    _type = "satellite"
+    _icon_dir = "resources/aws/satellite"
+
+
+class GroundStation(_Satellite):
+    _icon = "ground-station.png"
+
+
+# Aliases
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 57b6628..5b9b16e 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -31,6 +31,21 @@ Node classes list of aws provider.
 - **diagrams.aws.analytics.RedshiftDenseStorageNode**
 - **diagrams.aws.analytics.Redshift**
 
+## aws.ar
+
+- **diagrams.aws.ar.Sumerian**
+
+## aws.blockchain
+
+- **diagrams.aws.blockchain.ManagedBlockchain**
+- **diagrams.aws.blockchain.QuantumLedgerDatabaseQldb**, **QLDB** (alias)
+
+## aws.business
+
+- **diagrams.aws.business.AlexaForBusiness**, **A4B** (alias)
+- **diagrams.aws.business.Chime**
+- **diagrams.aws.business.Workmail**
+
 ## aws.compute
 
 - **diagrams.aws.compute.ApplicationAutoScaling**, **AutoScaling** (alias)
@@ -55,6 +70,14 @@ Node classes list of aws provider.
 - **diagrams.aws.compute.ThinkboxXmesh**
 - **diagrams.aws.compute.VmwareCloudOnAWS**
 
+## aws.cost
+
+- **diagrams.aws.cost.Budgets**
+- **diagrams.aws.cost.CostAndUsageReport**
+- **diagrams.aws.cost.CostExplorer**
+- **diagrams.aws.cost.ReservedInstanceReporting**
+- **diagrams.aws.cost.SavingsPlans**
+
 ## aws.database
 
 - **diagrams.aws.database.Aurora**
@@ -87,6 +110,20 @@ Node classes list of aws provider.
 - **diagrams.aws.devtools.ToolsAndSdks**
 - **diagrams.aws.devtools.XRay**
 
+## aws.enablement
+
+- **diagrams.aws.enablement.Iq**
+- **diagrams.aws.enablement.ManagedServices**
+- **diagrams.aws.enablement.ProfessionalServices**
+- **diagrams.aws.enablement.Support**
+
+## aws.enduser
+
+- **diagrams.aws.enduser.Appstream20**
+- **diagrams.aws.enduser.Workdocs**
+- **diagrams.aws.enduser.Worklink**
+- **diagrams.aws.enduser.Workspaces**
+
 ## aws.engagement
 
 - **diagrams.aws.engagement.Connect**
@@ -225,6 +262,15 @@ Node classes list of aws provider.
 - **diagrams.aws.ml.Transcribe**
 - **diagrams.aws.ml.Translate**
 
+## aws.mobile
+
+- **diagrams.aws.mobile.Amplify**
+- **diagrams.aws.mobile.APIGatewayEndpoint**
+- **diagrams.aws.mobile.APIGateway**
+- **diagrams.aws.mobile.Appsync**
+- **diagrams.aws.mobile.DeviceFarm**
+- **diagrams.aws.mobile.Pinpoint**
+
 ## aws.network
 
 - **diagrams.aws.network.APIGateway**
@@ -251,12 +297,20 @@ Node classes list of aws provider.
 - **diagrams.aws.network.VPCRouter**
 - **diagrams.aws.network.VPC**
 
+## aws.quantum
+
+- **diagrams.aws.quantum.Braket**
+
 ## aws.robotics
 
 - **diagrams.aws.robotics.RobomakerSimulator**
 - **diagrams.aws.robotics.Robomaker**
 - **diagrams.aws.robotics.Robotics**
 
+## aws.satellite
+
+- **diagrams.aws.satellite.GroundStation**
+
 ## aws.security
 
 - **diagrams.aws.security.Artifact**
diff --git a/resources/aws/ar/sumerian.png b/resources/aws/ar/sumerian.png
new file mode 100644
index 0000000..c46492b
Binary files /dev/null and b/resources/aws/ar/sumerian.png differ
diff --git a/resources/aws/blockchain/managed-blockchain.png b/resources/aws/blockchain/managed-blockchain.png
new file mode 100644
index 0000000..35f63d7
Binary files /dev/null and b/resources/aws/blockchain/managed-blockchain.png differ
diff --git a/resources/aws/blockchain/quantum-ledger-database-qldb.png b/resources/aws/blockchain/quantum-ledger-database-qldb.png
new file mode 100644
index 0000000..f2c6904
Binary files /dev/null and b/resources/aws/blockchain/quantum-ledger-database-qldb.png differ
diff --git a/resources/aws/business/alexa-for-business.png b/resources/aws/business/alexa-for-business.png
new file mode 100644
index 0000000..ae7377c
Binary files /dev/null and b/resources/aws/business/alexa-for-business.png differ
diff --git a/resources/aws/business/chime.png b/resources/aws/business/chime.png
new file mode 100644
index 0000000..fb3f92a
Binary files /dev/null and b/resources/aws/business/chime.png differ
diff --git a/resources/aws/business/workmail.png b/resources/aws/business/workmail.png
new file mode 100644
index 0000000..4808293
Binary files /dev/null and b/resources/aws/business/workmail.png differ
diff --git a/resources/aws/cost/budgets.png b/resources/aws/cost/budgets.png
new file mode 100644
index 0000000..0ccebea
Binary files /dev/null and b/resources/aws/cost/budgets.png differ
diff --git a/resources/aws/cost/cost-and-usage-report.png b/resources/aws/cost/cost-and-usage-report.png
new file mode 100644
index 0000000..651fef9
Binary files /dev/null and b/resources/aws/cost/cost-and-usage-report.png differ
diff --git a/resources/aws/cost/cost-explorer.png b/resources/aws/cost/cost-explorer.png
new file mode 100644
index 0000000..5bb28c4
Binary files /dev/null and b/resources/aws/cost/cost-explorer.png differ
diff --git a/resources/aws/cost/reserved-instance-reporting.png b/resources/aws/cost/reserved-instance-reporting.png
new file mode 100644
index 0000000..f0add1c
Binary files /dev/null and b/resources/aws/cost/reserved-instance-reporting.png differ
diff --git a/resources/aws/cost/savings-plans.png b/resources/aws/cost/savings-plans.png
new file mode 100755
index 0000000..28e9cf2
Binary files /dev/null and b/resources/aws/cost/savings-plans.png differ
diff --git a/resources/aws/enablement/iq.png b/resources/aws/enablement/iq.png
new file mode 100755
index 0000000..bc594ea
Binary files /dev/null and b/resources/aws/enablement/iq.png differ
diff --git a/resources/aws/enablement/managed-services.png b/resources/aws/enablement/managed-services.png
new file mode 100755
index 0000000..0024249
Binary files /dev/null and b/resources/aws/enablement/managed-services.png differ
diff --git a/resources/aws/enablement/professional-services.png b/resources/aws/enablement/professional-services.png
new file mode 100755
index 0000000..0ba4e09
Binary files /dev/null and b/resources/aws/enablement/professional-services.png differ
diff --git a/resources/aws/enablement/support.png b/resources/aws/enablement/support.png
new file mode 100755
index 0000000..aecefb5
Binary files /dev/null and b/resources/aws/enablement/support.png differ
diff --git a/resources/aws/enduser/appstream-2-0.png b/resources/aws/enduser/appstream-2-0.png
new file mode 100644
index 0000000..80f1e71
Binary files /dev/null and b/resources/aws/enduser/appstream-2-0.png differ
diff --git a/resources/aws/enduser/workdocs.png b/resources/aws/enduser/workdocs.png
new file mode 100644
index 0000000..7477546
Binary files /dev/null and b/resources/aws/enduser/workdocs.png differ
diff --git a/resources/aws/enduser/worklink.png b/resources/aws/enduser/worklink.png
new file mode 100644
index 0000000..d00ad81
Binary files /dev/null and b/resources/aws/enduser/worklink.png differ
diff --git a/resources/aws/enduser/workspaces.png b/resources/aws/enduser/workspaces.png
new file mode 100644
index 0000000..21865ac
Binary files /dev/null and b/resources/aws/enduser/workspaces.png differ
diff --git a/resources/aws/mobile/amplify.png b/resources/aws/mobile/amplify.png
new file mode 100644
index 0000000..8b22c32
Binary files /dev/null and b/resources/aws/mobile/amplify.png differ
diff --git a/resources/aws/mobile/api-gateway-endpoint.png b/resources/aws/mobile/api-gateway-endpoint.png
new file mode 100644
index 0000000..2c0d468
Binary files /dev/null and b/resources/aws/mobile/api-gateway-endpoint.png differ
diff --git a/resources/aws/mobile/api-gateway.png b/resources/aws/mobile/api-gateway.png
new file mode 100644
index 0000000..30be8c3
Binary files /dev/null and b/resources/aws/mobile/api-gateway.png differ
diff --git a/resources/aws/mobile/appsync.png b/resources/aws/mobile/appsync.png
new file mode 100644
index 0000000..74a9064
Binary files /dev/null and b/resources/aws/mobile/appsync.png differ
diff --git a/resources/aws/mobile/device-farm.png b/resources/aws/mobile/device-farm.png
new file mode 100644
index 0000000..3d72c41
Binary files /dev/null and b/resources/aws/mobile/device-farm.png differ
diff --git a/resources/aws/mobile/pinpoint.png b/resources/aws/mobile/pinpoint.png
new file mode 100644
index 0000000..73588da
Binary files /dev/null and b/resources/aws/mobile/pinpoint.png differ
diff --git a/resources/aws/quantum/braket.png b/resources/aws/quantum/braket.png
new file mode 100644
index 0000000..b216f9b
Binary files /dev/null and b/resources/aws/quantum/braket.png differ
diff --git a/resources/aws/satellite/ground-station.png b/resources/aws/satellite/ground-station.png
new file mode 100644
index 0000000..693565b
Binary files /dev/null and b/resources/aws/satellite/ground-station.png differ
diff --git a/scripts/resource.py b/scripts/resource.py
index 30b7f5e..9941f6e 100644
--- a/scripts/resource.py
+++ b/scripts/resource.py
@@ -24,6 +24,8 @@ def cleaner_onprem(f):
 def cleaner_aws(f):
     f = f.replace("_", "-")
     f = f.replace("@4x", "")
+    f = f.replace("@5x", "")
+    f = f.replace("2.0", "2-0")
     f = f.replace("-light-bg4x", "")
     f = f.replace("-light-bg", "")
     for p in cfg.FILE_PREFIXES["aws"]: