diff --git a/diagrams/elastic/elasticsearch.py b/diagrams/elastic/elasticsearch.py
index a903a42..dad072b 100644
--- a/diagrams/elastic/elasticsearch.py
+++ b/diagrams/elastic/elasticsearch.py
@@ -12,6 +12,10 @@ class Alerting(_Elasticsearch):
     _icon = "alerting.png"
 
 
+class Beats(_Elasticsearch):
+    _icon = "beats.png"
+
+
 class Elasticsearch(_Elasticsearch):
     _icon = "elasticsearch.png"
 
diff --git a/docs/nodes/alibabacloud.md b/docs/nodes/alibabacloud.md
index fc8ea0b..cc274c2 100644
--- a/docs/nodes/alibabacloud.md
+++ b/docs/nodes/alibabacloud.md
@@ -5,33 +5,13 @@ title: AlibabaCloud
 
 Node classes list of alibabacloud provider.
 
-## alibabacloud.security
-
-- **diagrams.alibabacloud.security.AntiBotService**, **ABS** (alias)
-- **diagrams.alibabacloud.security.AntiDdosBasic**
-- **diagrams.alibabacloud.security.AntiDdosPro**
-- **diagrams.alibabacloud.security.AntifraudService**, **AS** (alias)
-- **diagrams.alibabacloud.security.BastionHost**
-- **diagrams.alibabacloud.security.CloudFirewall**, **CFW** (alias)
-- **diagrams.alibabacloud.security.CloudSecurityScanner**
-- **diagrams.alibabacloud.security.ContentModeration**, **CM** (alias)
-- **diagrams.alibabacloud.security.CrowdsourcedSecurityTesting**
-- **diagrams.alibabacloud.security.DataEncryptionService**, **DES** (alias)
-- **diagrams.alibabacloud.security.DbAudit**
-- **diagrams.alibabacloud.security.GameShield**
-- **diagrams.alibabacloud.security.IdVerification**
-- **diagrams.alibabacloud.security.ManagedSecurityService**
-- **diagrams.alibabacloud.security.SecurityCenter**
-- **diagrams.alibabacloud.security.ServerGuard**
-- **diagrams.alibabacloud.security.SslCertificates**
-- **diagrams.alibabacloud.security.WebApplicationFirewall**, **WAF** (alias)
-
-## alibabacloud.iot
+## alibabacloud.analytics
 
-- **diagrams.alibabacloud.iot.IotInternetDeviceId**
-- **diagrams.alibabacloud.iot.IotLinkWan**
-- **diagrams.alibabacloud.iot.IotMobileConnectionPackage**
-- **diagrams.alibabacloud.iot.IotPlatform**
+- **diagrams.alibabacloud.analytics.AnalyticDb**
+- **diagrams.alibabacloud.analytics.ClickHouse**
+- **diagrams.alibabacloud.analytics.DataLakeAnalytics**
+- **diagrams.alibabacloud.analytics.ElaticMapReduce**
+- **diagrams.alibabacloud.analytics.OpenSearch**
 
 ## alibabacloud.application
 
@@ -50,36 +30,28 @@ Node classes list of alibabacloud provider.
 - **diagrams.alibabacloud.application.SmartConversationAnalysis**, **SCA** (alias)
 - **diagrams.alibabacloud.application.Yida**
 
-## alibabacloud.network
-
-- **diagrams.alibabacloud.network.Cdn**
-- **diagrams.alibabacloud.network.CloudEnterpriseNetwork**, **CEN** (alias)
-- **diagrams.alibabacloud.network.ElasticIpAddress**, **EIP** (alias)
-- **diagrams.alibabacloud.network.ExpressConnect**
-- **diagrams.alibabacloud.network.NatGateway**
-- **diagrams.alibabacloud.network.ServerLoadBalancer**, **SLB** (alias)
-- **diagrams.alibabacloud.network.SmartAccessGateway**
-- **diagrams.alibabacloud.network.VirtualPrivateCloud**, **VPC** (alias)
-- **diagrams.alibabacloud.network.VpnGateway**
-
-## alibabacloud.storage
+## alibabacloud.communication
 
-- **diagrams.alibabacloud.storage.CloudStorageGateway**
-- **diagrams.alibabacloud.storage.FileStorageHdfs**, **HDFS** (alias)
-- **diagrams.alibabacloud.storage.FileStorageNas**, **NAS** (alias)
-- **diagrams.alibabacloud.storage.HybridBackupRecovery**, **HBR** (alias)
-- **diagrams.alibabacloud.storage.HybridCloudDisasterRecovery**, **HDR** (alias)
-- **diagrams.alibabacloud.storage.Imm**
-- **diagrams.alibabacloud.storage.ObjectStorageService**, **OSS** (alias)
-- **diagrams.alibabacloud.storage.ObjectTableStore**, **OTS** (alias)
+- **diagrams.alibabacloud.communication.DirectMail**
+- **diagrams.alibabacloud.communication.MobilePush**
 
-## alibabacloud.analytics
+## alibabacloud.compute
 
-- **diagrams.alibabacloud.analytics.AnalyticDb**
-- **diagrams.alibabacloud.analytics.ClickHouse**
-- **diagrams.alibabacloud.analytics.DataLakeAnalytics**
-- **diagrams.alibabacloud.analytics.ElaticMapReduce**
-- **diagrams.alibabacloud.analytics.OpenSearch**
+- **diagrams.alibabacloud.compute.AutoScaling**, **ESS** (alias)
+- **diagrams.alibabacloud.compute.BatchCompute**
+- **diagrams.alibabacloud.compute.ContainerRegistry**
+- **diagrams.alibabacloud.compute.ContainerService**
+- **diagrams.alibabacloud.compute.ElasticComputeService**, **ECS** (alias)
+- **diagrams.alibabacloud.compute.ElasticContainerInstance**, **ECI** (alias)
+- **diagrams.alibabacloud.compute.ElasticHighPerformanceComputing**, **EHPC** (alias)
+- **diagrams.alibabacloud.compute.ElasticSearch**
+- **diagrams.alibabacloud.compute.FunctionCompute**, **FC** (alias)
+- **diagrams.alibabacloud.compute.OperationOrchestrationService**, **OOS** (alias)
+- **diagrams.alibabacloud.compute.ResourceOrchestrationService**, **ROS** (alias)
+- **diagrams.alibabacloud.compute.ServerLoadBalancer**, **SLB** (alias)
+- **diagrams.alibabacloud.compute.ServerlessAppEngine**, **SAE** (alias)
+- **diagrams.alibabacloud.compute.SimpleApplicationServer**, **SAS** (alias)
+- **diagrams.alibabacloud.compute.WebAppService**, **WAS** (alias)
 
 ## alibabacloud.database
 
@@ -101,28 +73,56 @@ Node classes list of alibabacloud provider.
 - **diagrams.alibabacloud.database.HybriddbForMysql**
 - **diagrams.alibabacloud.database.RelationalDatabaseService**, **RDS** (alias)
 
-## alibabacloud.compute
+## alibabacloud.iot
 
-- **diagrams.alibabacloud.compute.AutoScaling**, **ESS** (alias)
-- **diagrams.alibabacloud.compute.BatchCompute**
-- **diagrams.alibabacloud.compute.ContainerRegistry**
-- **diagrams.alibabacloud.compute.ContainerService**
-- **diagrams.alibabacloud.compute.ElasticComputeService**, **ECS** (alias)
-- **diagrams.alibabacloud.compute.ElasticContainerInstance**, **ECI** (alias)
-- **diagrams.alibabacloud.compute.ElasticHighPerformanceComputing**, **EHPC** (alias)
-- **diagrams.alibabacloud.compute.ElasticSearch**
-- **diagrams.alibabacloud.compute.FunctionCompute**, **FC** (alias)
-- **diagrams.alibabacloud.compute.OperationOrchestrationService**, **OOS** (alias)
-- **diagrams.alibabacloud.compute.ResourceOrchestrationService**, **ROS** (alias)
-- **diagrams.alibabacloud.compute.ServerLoadBalancer**, **SLB** (alias)
-- **diagrams.alibabacloud.compute.ServerlessAppEngine**, **SAE** (alias)
-- **diagrams.alibabacloud.compute.SimpleApplicationServer**, **SAS** (alias)
-- **diagrams.alibabacloud.compute.WebAppService**, **WAS** (alias)
+- **diagrams.alibabacloud.iot.IotInternetDeviceId**
+- **diagrams.alibabacloud.iot.IotLinkWan**
+- **diagrams.alibabacloud.iot.IotMobileConnectionPackage**
+- **diagrams.alibabacloud.iot.IotPlatform**
 
-## alibabacloud.communication
+## alibabacloud.network
 
-- **diagrams.alibabacloud.communication.DirectMail**
-- **diagrams.alibabacloud.communication.MobilePush**
+- **diagrams.alibabacloud.network.Cdn**
+- **diagrams.alibabacloud.network.CloudEnterpriseNetwork**, **CEN** (alias)
+- **diagrams.alibabacloud.network.ElasticIpAddress**, **EIP** (alias)
+- **diagrams.alibabacloud.network.ExpressConnect**
+- **diagrams.alibabacloud.network.NatGateway**
+- **diagrams.alibabacloud.network.ServerLoadBalancer**, **SLB** (alias)
+- **diagrams.alibabacloud.network.SmartAccessGateway**
+- **diagrams.alibabacloud.network.VirtualPrivateCloud**, **VPC** (alias)
+- **diagrams.alibabacloud.network.VpnGateway**
+
+## alibabacloud.security
+
+- **diagrams.alibabacloud.security.AntiBotService**, **ABS** (alias)
+- **diagrams.alibabacloud.security.AntiDdosBasic**
+- **diagrams.alibabacloud.security.AntiDdosPro**
+- **diagrams.alibabacloud.security.AntifraudService**, **AS** (alias)
+- **diagrams.alibabacloud.security.BastionHost**
+- **diagrams.alibabacloud.security.CloudFirewall**, **CFW** (alias)
+- **diagrams.alibabacloud.security.CloudSecurityScanner**
+- **diagrams.alibabacloud.security.ContentModeration**, **CM** (alias)
+- **diagrams.alibabacloud.security.CrowdsourcedSecurityTesting**
+- **diagrams.alibabacloud.security.DataEncryptionService**, **DES** (alias)
+- **diagrams.alibabacloud.security.DbAudit**
+- **diagrams.alibabacloud.security.GameShield**
+- **diagrams.alibabacloud.security.IdVerification**
+- **diagrams.alibabacloud.security.ManagedSecurityService**
+- **diagrams.alibabacloud.security.SecurityCenter**
+- **diagrams.alibabacloud.security.ServerGuard**
+- **diagrams.alibabacloud.security.SslCertificates**
+- **diagrams.alibabacloud.security.WebApplicationFirewall**, **WAF** (alias)
+
+## alibabacloud.storage
+
+- **diagrams.alibabacloud.storage.CloudStorageGateway**
+- **diagrams.alibabacloud.storage.FileStorageHdfs**, **HDFS** (alias)
+- **diagrams.alibabacloud.storage.FileStorageNas**, **NAS** (alias)
+- **diagrams.alibabacloud.storage.HybridBackupRecovery**, **HBR** (alias)
+- **diagrams.alibabacloud.storage.HybridCloudDisasterRecovery**, **HDR** (alias)
+- **diagrams.alibabacloud.storage.Imm**
+- **diagrams.alibabacloud.storage.ObjectStorageService**, **OSS** (alias)
+- **diagrams.alibabacloud.storage.ObjectTableStore**, **OTS** (alias)
 
 ## alibabacloud.web
 
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 6107fad..57b6628 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -89,25 +89,9 @@ Node classes list of aws provider.
 
 ## aws.engagement
 
-- **diagrams.aws.ml.ApacheMxnetOnAWS**
-- **diagrams.aws.ml.Comprehend**
-- **diagrams.aws.ml.DeepLearningAmis**
-- **diagrams.aws.ml.DeepLearningContainers**, **DLC** (alias)
-- **diagrams.aws.ml.Deeplens**
-- **diagrams.aws.ml.Deepracer**
-- **diagrams.aws.ml.ElasticInference**
-- **diagrams.aws.ml.Forecast**
-- **diagrams.aws.ml.Lex**
-- **diagrams.aws.ml.MachineLearning**
-- **diagrams.aws.ml.Personalize**
-- **diagrams.aws.ml.Polly**
-- **diagrams.aws.ml.Rekognition**
-- **diagrams.aws.ml.SagemakerGroundTruth**
-- **diagrams.aws.ml.Sagemaker**
-- **diagrams.aws.ml.TensorflowOnAWS**
-- **diagrams.aws.ml.Textract**
-- **diagrams.aws.ml.Transcribe**
-- **diagrams.aws.ml.Translate**
+- **diagrams.aws.engagement.Connect**
+- **diagrams.aws.engagement.Pinpoint**
+- **diagrams.aws.engagement.SimpleEmailServiceSes**, **SES** (alias)
 
 ## aws.game
 
@@ -138,7 +122,7 @@ Node classes list of aws provider.
 - **diagrams.aws.integration.SimpleQueueServiceSqs**, **SQS** (alias)
 - **diagrams.aws.integration.StepFunctions**, **SF** (alias)
 
-## aws.media
+## aws.iot
 
 - **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias)
 - **diagrams.aws.iot.InternetOfThings**
@@ -191,20 +175,19 @@ Node classes list of aws provider.
 - **diagrams.aws.management.TrustedAdvisor**
 - **diagrams.aws.management.WellArchitectedTool**
 
-## aws.iot
+## aws.media
 
-- **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias)
-- **diagrams.aws.iot.InternetOfThings**
-- **diagrams.aws.iot.Iot1Click**
-- **diagrams.aws.iot.IotAnalytics**
-- **diagrams.aws.iot.IotButton**
-- **diagrams.aws.iot.IotCore**
-- **diagrams.aws.iot.IotDeviceDefender**
-- **diagrams.aws.iot.IotDeviceManagement**
-- **diagrams.aws.iot.IotEvents**
-- **diagrams.aws.iot.IotGreengrass**
-- **diagrams.aws.iot.IotSitewise**
-- **diagrams.aws.iot.IotThingsGraph**
+- **diagrams.aws.media.ElasticTranscoder**
+- **diagrams.aws.media.ElementalConductor**
+- **diagrams.aws.media.ElementalDelta**
+- **diagrams.aws.media.ElementalLive**
+- **diagrams.aws.media.ElementalMediaconnect**
+- **diagrams.aws.media.ElementalMediaconvert**
+- **diagrams.aws.media.ElementalMedialive**
+- **diagrams.aws.media.ElementalMediapackage**
+- **diagrams.aws.media.ElementalMediastore**
+- **diagrams.aws.media.ElementalMediatailor**
+- **diagrams.aws.media.ElementalServer**
 
 ## aws.migration
 
@@ -220,6 +203,28 @@ Node classes list of aws provider.
 - **diagrams.aws.migration.Snowmobile**
 - **diagrams.aws.migration.TransferForSftp**
 
+## aws.ml
+
+- **diagrams.aws.ml.ApacheMxnetOnAWS**
+- **diagrams.aws.ml.Comprehend**
+- **diagrams.aws.ml.DeepLearningAmis**
+- **diagrams.aws.ml.DeepLearningContainers**, **DLC** (alias)
+- **diagrams.aws.ml.Deeplens**
+- **diagrams.aws.ml.Deepracer**
+- **diagrams.aws.ml.ElasticInference**
+- **diagrams.aws.ml.Forecast**
+- **diagrams.aws.ml.Lex**
+- **diagrams.aws.ml.MachineLearning**
+- **diagrams.aws.ml.Personalize**
+- **diagrams.aws.ml.Polly**
+- **diagrams.aws.ml.Rekognition**
+- **diagrams.aws.ml.SagemakerGroundTruth**
+- **diagrams.aws.ml.Sagemaker**
+- **diagrams.aws.ml.TensorflowOnAWS**
+- **diagrams.aws.ml.Textract**
+- **diagrams.aws.ml.Transcribe**
+- **diagrams.aws.ml.Translate**
+
 ## aws.network
 
 - **diagrams.aws.network.APIGateway**
@@ -297,88 +302,3 @@ Node classes list of aws provider.
 - **diagrams.aws.storage.Snowmobile**
 - **diagrams.aws.storage.StorageGateway**
 - **diagrams.aws.storage.Storage**
-
-## aws.analytics
-
-- **diagrams.aws.analytics.Analytics**
-- **diagrams.aws.analytics.Athena**
-- **diagrams.aws.analytics.CloudsearchSearchDocuments**
-- **diagrams.aws.analytics.Cloudsearch**
-- **diagrams.aws.analytics.DataPipeline**
-- **diagrams.aws.analytics.ElasticsearchService**, **ES** (alias)
-- **diagrams.aws.analytics.EMRCluster**
-- **diagrams.aws.analytics.EMRHdfsCluster**
-- **diagrams.aws.analytics.EMR**
-- **diagrams.aws.analytics.GlueCrawlers**
-- **diagrams.aws.analytics.GlueDataCatalog**
-- **diagrams.aws.analytics.Glue**
-- **diagrams.aws.analytics.KinesisDataAnalytics**
-- **diagrams.aws.analytics.KinesisDataFirehose**
-- **diagrams.aws.analytics.KinesisDataStreams**
-- **diagrams.aws.analytics.KinesisVideoStreams**
-- **diagrams.aws.analytics.Kinesis**
-- **diagrams.aws.analytics.LakeFormation**
-- **diagrams.aws.analytics.ManagedStreamingForKafka**
-- **diagrams.aws.analytics.Quicksight**
-- **diagrams.aws.analytics.RedshiftDenseComputeNode**
-- **diagrams.aws.analytics.RedshiftDenseStorageNode**
-- **diagrams.aws.analytics.Redshift**
-
-## aws.database
-
-- **diagrams.aws.database.Aurora**
-- **diagrams.aws.database.DatabaseMigrationService**, **DMS** (alias)
-- **diagrams.aws.database.Database**, **DB** (alias)
-- **diagrams.aws.database.DocumentdbMongodbCompatibility**, **DocumentDB** (alias)
-- **diagrams.aws.database.Dynamodb**, **DDB** (alias)
-- **diagrams.aws.database.Elasticache**, **ElastiCache** (alias)
-- **diagrams.aws.database.Neptune**
-- **diagrams.aws.database.QuantumLedgerDatabaseQldb**, **QLDB** (alias)
-- **diagrams.aws.database.RDSOnVmware**
-- **diagrams.aws.database.RDS**
-- **diagrams.aws.database.Redshift**
-- **diagrams.aws.database.Timestream**
-
-## aws.compute
-
-- **diagrams.aws.compute.ApplicationAutoScaling**, **AutoScaling** (alias)
-- **diagrams.aws.compute.Batch**
-- **diagrams.aws.compute.Compute**
-- **diagrams.aws.compute.EC2ContainerRegistry**, **ECR** (alias)
-- **diagrams.aws.compute.EC2**
-- **diagrams.aws.compute.ElasticBeanstalk**, **EB** (alias)
-- **diagrams.aws.compute.ElasticContainerService**, **ECS** (alias)
-- **diagrams.aws.compute.ElasticKubernetesService**, **EKS** (alias)
-- **diagrams.aws.compute.Fargate**
-- **diagrams.aws.compute.Lambda**
-- **diagrams.aws.compute.Lightsail**
-- **diagrams.aws.compute.Outposts**
-- **diagrams.aws.compute.ServerlessApplicationRepository**, **SAR** (alias)
-- **diagrams.aws.compute.ThinkboxDeadline**
-- **diagrams.aws.compute.ThinkboxDraft**
-- **diagrams.aws.compute.ThinkboxFrost**
-- **diagrams.aws.compute.ThinkboxKrakatoa**
-- **diagrams.aws.compute.ThinkboxSequoia**
-- **diagrams.aws.compute.ThinkboxStoke**
-- **diagrams.aws.compute.ThinkboxXmesh**
-- **diagrams.aws.compute.VmwareCloudOnAWS**
-
-## aws.engagement
-
-- **diagrams.aws.engagement.Connect**
-- **diagrams.aws.engagement.Pinpoint**
-- **diagrams.aws.engagement.SimpleEmailServiceSes**, **SES** (alias)
-
-## aws.devtools
-
-- **diagrams.aws.devtools.CloudDevelopmentKit**
-- **diagrams.aws.devtools.Cloud9**
-- **diagrams.aws.devtools.Codebuild**
-- **diagrams.aws.devtools.Codecommit**
-- **diagrams.aws.devtools.Codedeploy**
-- **diagrams.aws.devtools.Codepipeline**
-- **diagrams.aws.devtools.Codestar**
-- **diagrams.aws.devtools.CommandLineInterface**, **CLI** (alias)
-- **diagrams.aws.devtools.DeveloperTools**, **DevTools** (alias)
-- **diagrams.aws.devtools.ToolsAndSdks**
-- **diagrams.aws.devtools.XRay**
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index 41216a5..076b18d 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -5,42 +5,73 @@ title: Azure
 
 Node classes list of azure provider.
 
-## azure.ml
+## azure.analytics
 
-- **diagrams.azure.ml.BatchAI**
-- **diagrams.azure.ml.BotServices**
-- **diagrams.azure.ml.CognitiveServices**
-- **diagrams.azure.ml.GenomicsAccounts**
-- **diagrams.azure.ml.MachineLearningServiceWorkspaces**
-- **diagrams.azure.ml.MachineLearningStudioWebServicePlans**
-- **diagrams.azure.ml.MachineLearningStudioWebServices**
-- **diagrams.azure.ml.MachineLearningStudioWorkspaces**
+- **diagrams.azure.analytics.AnalysisServices**
+- **diagrams.azure.analytics.DataExplorerClusters**
+- **diagrams.azure.analytics.DataFactories**
+- **diagrams.azure.analytics.DataLakeAnalytics**
+- **diagrams.azure.analytics.DataLakeStoreGen1**
+- **diagrams.azure.analytics.Databricks**
+- **diagrams.azure.analytics.EventHubClusters**
+- **diagrams.azure.analytics.EventHubs**
+- **diagrams.azure.analytics.Hdinsightclusters**
+- **diagrams.azure.analytics.LogAnalyticsWorkspaces**
+- **diagrams.azure.analytics.StreamAnalyticsJobs**
 
-## azure.integration
+## azure.compute
 
-- **diagrams.azure.integration.APIForFhir**
-- **diagrams.azure.integration.APIManagement**
-- **diagrams.azure.integration.AppConfiguration**
-- **diagrams.azure.integration.DataCatalog**
-- **diagrams.azure.integration.EventGridDomains**
-- **diagrams.azure.integration.EventGridSubscriptions**
-- **diagrams.azure.integration.EventGridTopics**
-- **diagrams.azure.integration.IntegrationAccounts**
-- **diagrams.azure.integration.IntegrationServiceEnvironments**
-- **diagrams.azure.integration.LogicAppsCustomConnector**
-- **diagrams.azure.integration.LogicApps**
-- **diagrams.azure.integration.SendgridAccounts**
-- **diagrams.azure.integration.ServiceBusRelays**
-- **diagrams.azure.integration.ServiceBus**
-- **diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
-- **diagrams.azure.integration.SoftwareAsAService**
-- **diagrams.azure.integration.StorsimpleDeviceManagers**
+- **diagrams.azure.compute.AvailabilitySets**
+- **diagrams.azure.compute.BatchAccounts**
+- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
+- **diagrams.azure.compute.CloudServicesClassic**
+- **diagrams.azure.compute.CloudServices**
+- **diagrams.azure.compute.CloudsimpleVirtualMachines**
+- **diagrams.azure.compute.ContainerInstances**
+- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
+- **diagrams.azure.compute.DiskSnapshots**
+- **diagrams.azure.compute.Disks**
+- **diagrams.azure.compute.FunctionApps**
+- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
+- **diagrams.azure.compute.MeshApplications**
+- **diagrams.azure.compute.SAPHANAOnAzure**
+- **diagrams.azure.compute.ServiceFabricClusters**
+- **diagrams.azure.compute.VMClassic**
+- **diagrams.azure.compute.VMImages**
+- **diagrams.azure.compute.VMLinux**
+- **diagrams.azure.compute.VMWindows**
+- **diagrams.azure.compute.VM**
 
-## azure.security
+## azure.database
 
-- **diagrams.azure.security.KeyVaults**
-- **diagrams.azure.security.SecurityCenter**
-- **diagrams.azure.security.Sentinel**
+- **diagrams.azure.database.BlobStorage**
+- **diagrams.azure.database.CacheForRedis**
+- **diagrams.azure.database.CosmosDb**
+- **diagrams.azure.database.DataLake**
+- **diagrams.azure.database.DatabaseForMariadbServers**
+- **diagrams.azure.database.DatabaseForMysqlServers**
+- **diagrams.azure.database.DatabaseForPostgresqlServers**
+- **diagrams.azure.database.ElasticDatabasePools**
+- **diagrams.azure.database.ElasticJobAgents**
+- **diagrams.azure.database.ManagedDatabases**
+- **diagrams.azure.database.SQLDatabases**
+- **diagrams.azure.database.SQLDatawarehouse**
+- **diagrams.azure.database.SQLManagedInstances**
+- **diagrams.azure.database.SQLServerStretchDatabases**
+- **diagrams.azure.database.SQLServers**
+- **diagrams.azure.database.VirtualClusters**
+- **diagrams.azure.database.VirtualDatacenter**
+
+## azure.devops
+
+- **diagrams.azure.devops.ApplicationInsights**
+- **diagrams.azure.devops.Artifacts**
+- **diagrams.azure.devops.Boards**
+- **diagrams.azure.devops.Devops**
+- **diagrams.azure.devops.DevtestLabs**
+- **diagrams.azure.devops.Pipelines**
+- **diagrams.azure.devops.Repos**
+- **diagrams.azure.devops.TestPlans**
 
 ## azure.general
 
@@ -73,9 +104,19 @@ Node classes list of azure provider.
 
 ## azure.identity
 
-- **diagrams.azure.mobile.AppServiceMobile**
-- **diagrams.azure.mobile.MobileEngagement**
-- **diagrams.azure.mobile.NotificationHubs**
+- **diagrams.azure.identity.AccessReview**
+- **diagrams.azure.identity.ActiveDirectoryConnectHealth**
+- **diagrams.azure.identity.ActiveDirectory**
+- **diagrams.azure.identity.ADB2C**
+- **diagrams.azure.identity.ADDomainServices**
+- **diagrams.azure.identity.ADIdentityProtection**
+- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
+- **diagrams.azure.identity.AppRegistrations**
+- **diagrams.azure.identity.ConditionalAccess**
+- **diagrams.azure.identity.EnterpriseApplications**
+- **diagrams.azure.identity.IdentityGovernance**
+- **diagrams.azure.identity.InformationProtection**
+- **diagrams.azure.identity.ManagedIdentities**
 
 ## azure.integration
 
@@ -116,6 +157,23 @@ Node classes list of azure provider.
 - **diagrams.azure.migration.MigrationProjects**
 - **diagrams.azure.migration.RecoveryServicesVaults**
 
+## azure.ml
+
+- **diagrams.azure.ml.BatchAI**
+- **diagrams.azure.ml.BotServices**
+- **diagrams.azure.ml.CognitiveServices**
+- **diagrams.azure.ml.GenomicsAccounts**
+- **diagrams.azure.ml.MachineLearningServiceWorkspaces**
+- **diagrams.azure.ml.MachineLearningStudioWebServicePlans**
+- **diagrams.azure.ml.MachineLearningStudioWebServices**
+- **diagrams.azure.ml.MachineLearningStudioWorkspaces**
+
+## azure.mobile
+
+- **diagrams.azure.mobile.AppServiceMobile**
+- **diagrams.azure.mobile.MobileEngagement**
+- **diagrams.azure.mobile.NotificationHubs**
+
 ## azure.network
 
 - **diagrams.azure.network.ApplicationGateway**
@@ -145,21 +203,11 @@ Node classes list of azure provider.
 - **diagrams.azure.network.VirtualNetworks**
 - **diagrams.azure.network.VirtualWans**
 
-## azure.identity
+## azure.security
 
-- **diagrams.azure.identity.AccessReview**
-- **diagrams.azure.identity.ActiveDirectoryConnectHealth**
-- **diagrams.azure.identity.ActiveDirectory**
-- **diagrams.azure.identity.ADB2C**
-- **diagrams.azure.identity.ADDomainServices**
-- **diagrams.azure.identity.ADIdentityProtection**
-- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
-- **diagrams.azure.identity.AppRegistrations**
-- **diagrams.azure.identity.ConditionalAccess**
-- **diagrams.azure.identity.EnterpriseApplications**
-- **diagrams.azure.identity.IdentityGovernance**
-- **diagrams.azure.identity.InformationProtection**
-- **diagrams.azure.identity.ManagedIdentities**
+- **diagrams.azure.security.KeyVaults**
+- **diagrams.azure.security.SecurityCenter**
+- **diagrams.azure.security.Sentinel**
 
 ## azure.storage
 
@@ -180,63 +228,6 @@ Node classes list of azure provider.
 - **diagrams.azure.storage.StorsimpleDeviceManagers**
 - **diagrams.azure.storage.TableStorage**
 
-## azure.analytics
-
-- **diagrams.azure.analytics.AnalysisServices**
-- **diagrams.azure.analytics.DataExplorerClusters**
-- **diagrams.azure.analytics.DataFactories**
-- **diagrams.azure.analytics.DataLakeAnalytics**
-- **diagrams.azure.analytics.DataLakeStoreGen1**
-- **diagrams.azure.analytics.Databricks**
-- **diagrams.azure.analytics.EventHubClusters**
-- **diagrams.azure.analytics.EventHubs**
-- **diagrams.azure.analytics.Hdinsightclusters**
-- **diagrams.azure.analytics.LogAnalyticsWorkspaces**
-- **diagrams.azure.analytics.StreamAnalyticsJobs**
-
-## azure.database
-
-- **diagrams.azure.database.BlobStorage**
-- **diagrams.azure.database.CacheForRedis**
-- **diagrams.azure.database.CosmosDb**
-- **diagrams.azure.database.DataLake**
-- **diagrams.azure.database.DatabaseForMariadbServers**
-- **diagrams.azure.database.DatabaseForMysqlServers**
-- **diagrams.azure.database.DatabaseForPostgresqlServers**
-- **diagrams.azure.database.ElasticDatabasePools**
-- **diagrams.azure.database.ElasticJobAgents**
-- **diagrams.azure.database.ManagedDatabases**
-- **diagrams.azure.database.SQLDatabases**
-- **diagrams.azure.database.SQLDatawarehouse**
-- **diagrams.azure.database.SQLManagedInstances**
-- **diagrams.azure.database.SQLServerStretchDatabases**
-- **diagrams.azure.database.SQLServers**
-- **diagrams.azure.database.VirtualClusters**
-- **diagrams.azure.database.VirtualDatacenter**
-
-## azure.compute
-
-- **diagrams.azure.compute.AvailabilitySets**
-- **diagrams.azure.compute.BatchAccounts**
-- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
-- **diagrams.azure.compute.CloudServicesClassic**
-- **diagrams.azure.compute.CloudServices**
-- **diagrams.azure.compute.CloudsimpleVirtualMachines**
-- **diagrams.azure.compute.ContainerInstances**
-- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
-- **diagrams.azure.compute.DiskSnapshots**
-- **diagrams.azure.compute.Disks**
-- **diagrams.azure.compute.FunctionApps**
-- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
-- **diagrams.azure.compute.MeshApplications**
-- **diagrams.azure.compute.SAPHANAOnAzure**
-- **diagrams.azure.compute.ServiceFabricClusters**
-- **diagrams.azure.compute.VMClassic**
-- **diagrams.azure.compute.VMImages**
-- **diagrams.azure.compute.VMLinux**
-- **diagrams.azure.compute.VMWindows**
-- **diagrams.azure.compute.VM**
-
 ## azure.web
 
 - **diagrams.azure.web.APIConnections**
diff --git a/docs/nodes/elastic.md b/docs/nodes/elastic.md
index ce5d3c7..cbe6593 100644
--- a/docs/nodes/elastic.md
+++ b/docs/nodes/elastic.md
@@ -8,6 +8,7 @@ Node classes list of elastic provider.
 ## elastic.elasticsearch
 
 - **diagrams.elastic.elasticsearch.Alerting**
+- **diagrams.elastic.elasticsearch.Beats**
 - **diagrams.elastic.elasticsearch.Elasticsearch**
 - **diagrams.elastic.elasticsearch.Kibana**
 - **diagrams.elastic.elasticsearch.Logstash**, **LogStash** (alias)
diff --git a/docs/nodes/gcp.md b/docs/nodes/gcp.md
index 35c4353..91032ce 100644
--- a/docs/nodes/gcp.md
+++ b/docs/nodes/gcp.md
@@ -5,6 +5,65 @@ title: GCP
 
 Node classes list of gcp provider.
 
+## gcp.analytics
+
+- **diagrams.gcp.analytics.Bigquery**, **BigQuery** (alias)
+- **diagrams.gcp.analytics.Composer**
+- **diagrams.gcp.analytics.DataCatalog**
+- **diagrams.gcp.analytics.DataFusion**
+- **diagrams.gcp.analytics.Dataflow**
+- **diagrams.gcp.analytics.Datalab**
+- **diagrams.gcp.analytics.Dataprep**
+- **diagrams.gcp.analytics.Dataproc**
+- **diagrams.gcp.analytics.Genomics**
+- **diagrams.gcp.analytics.Pubsub**, **PubSub** (alias)
+
+## gcp.compute
+
+- **diagrams.gcp.compute.AppEngine**, **GAE** (alias)
+- **diagrams.gcp.compute.ComputeEngine**, **GCE** (alias)
+- **diagrams.gcp.compute.ContainerOptimizedOS**
+- **diagrams.gcp.compute.Functions**, **GCF** (alias)
+- **diagrams.gcp.compute.GKEOnPrem**
+- **diagrams.gcp.compute.GPU**
+- **diagrams.gcp.compute.KubernetesEngine**, **GKE** (alias)
+- **diagrams.gcp.compute.Run**
+
+## gcp.database
+
+- **diagrams.gcp.database.Bigtable**, **BigTable** (alias)
+- **diagrams.gcp.database.Datastore**
+- **diagrams.gcp.database.Firestore**
+- **diagrams.gcp.database.Memorystore**
+- **diagrams.gcp.database.Spanner**
+- **diagrams.gcp.database.SQL**
+
+## gcp.devtools
+
+- **diagrams.gcp.devtools.Build**
+- **diagrams.gcp.devtools.CodeForIntellij**
+- **diagrams.gcp.devtools.Code**
+- **diagrams.gcp.devtools.ContainerRegistry**, **GCR** (alias)
+- **diagrams.gcp.devtools.GradleAppEnginePlugin**
+- **diagrams.gcp.devtools.IdePlugins**
+- **diagrams.gcp.devtools.MavenAppEnginePlugin**
+- **diagrams.gcp.devtools.Scheduler**
+- **diagrams.gcp.devtools.SDK**
+- **diagrams.gcp.devtools.SourceRepositories**
+- **diagrams.gcp.devtools.Tasks**
+- **diagrams.gcp.devtools.TestLab**
+- **diagrams.gcp.devtools.ToolsForEclipse**
+- **diagrams.gcp.devtools.ToolsForPowershell**
+- **diagrams.gcp.devtools.ToolsForVisualStudio**
+
+## gcp.iot
+
+- **diagrams.gcp.iot.IotCore**
+
+## gcp.migration
+
+- **diagrams.gcp.migration.TransferAppliance**
+
 ## gcp.ml
 
 - **diagrams.gcp.ml.AdvancedSolutionsLab**
@@ -29,23 +88,6 @@ Node classes list of gcp provider.
 - **diagrams.gcp.ml.VideoIntelligenceAPI**
 - **diagrams.gcp.ml.VisionAPI**
 
-## gcp.security
-
-- **diagrams.gcp.security.Iam**
-- **diagrams.gcp.security.IAP**
-- **diagrams.gcp.security.KeyManagementService**, **KMS** (alias)
-- **diagrams.gcp.security.ResourceManager**
-- **diagrams.gcp.security.SecurityCommandCenter**, **SCC** (alias)
-- **diagrams.gcp.security.SecurityScanner**
-
-## gcp.iot
-
-- **diagrams.gcp.iot.IotCore**
-
-## gcp.migration
-
-- **diagrams.gcp.migration.TransferAppliance**
-
 ## gcp.network
 
 - **diagrams.gcp.network.Armor**
@@ -66,59 +108,17 @@ Node classes list of gcp provider.
 - **diagrams.gcp.network.VirtualPrivateCloud**, **VPC** (alias)
 - **diagrams.gcp.network.VPN**
 
+## gcp.security
+
+- **diagrams.gcp.security.Iam**
+- **diagrams.gcp.security.IAP**
+- **diagrams.gcp.security.KeyManagementService**, **KMS** (alias)
+- **diagrams.gcp.security.ResourceManager**
+- **diagrams.gcp.security.SecurityCommandCenter**, **SCC** (alias)
+- **diagrams.gcp.security.SecurityScanner**
+
 ## gcp.storage
 
 - **diagrams.gcp.storage.Filestore**
 - **diagrams.gcp.storage.PersistentDisk**
 - **diagrams.gcp.storage.Storage**, **GCS** (alias)
-
-## gcp.analytics
-
-- **diagrams.gcp.analytics.Bigquery**, **BigQuery** (alias)
-- **diagrams.gcp.analytics.Composer**
-- **diagrams.gcp.analytics.DataCatalog**
-- **diagrams.gcp.analytics.DataFusion**
-- **diagrams.gcp.analytics.Dataflow**
-- **diagrams.gcp.analytics.Datalab**
-- **diagrams.gcp.analytics.Dataprep**
-- **diagrams.gcp.analytics.Dataproc**
-- **diagrams.gcp.analytics.Genomics**
-- **diagrams.gcp.analytics.Pubsub**, **PubSub** (alias)
-
-## gcp.database
-
-- **diagrams.gcp.database.Bigtable**, **BigTable** (alias)
-- **diagrams.gcp.database.Datastore**
-- **diagrams.gcp.database.Firestore**
-- **diagrams.gcp.database.Memorystore**
-- **diagrams.gcp.database.Spanner**
-- **diagrams.gcp.database.SQL**
-
-## gcp.compute
-
-- **diagrams.gcp.compute.AppEngine**, **GAE** (alias)
-- **diagrams.gcp.compute.ComputeEngine**, **GCE** (alias)
-- **diagrams.gcp.compute.ContainerOptimizedOS**
-- **diagrams.gcp.compute.Functions**, **GCF** (alias)
-- **diagrams.gcp.compute.GKEOnPrem**
-- **diagrams.gcp.compute.GPU**
-- **diagrams.gcp.compute.KubernetesEngine**, **GKE** (alias)
-- **diagrams.gcp.compute.Run**
-
-## gcp.devtools
-
-- **diagrams.gcp.devtools.Build**
-- **diagrams.gcp.devtools.CodeForIntellij**
-- **diagrams.gcp.devtools.Code**
-- **diagrams.gcp.devtools.ContainerRegistry**, **GCR** (alias)
-- **diagrams.gcp.devtools.GradleAppEnginePlugin**
-- **diagrams.gcp.devtools.IdePlugins**
-- **diagrams.gcp.devtools.MavenAppEnginePlugin**
-- **diagrams.gcp.devtools.Scheduler**
-- **diagrams.gcp.devtools.SDK**
-- **diagrams.gcp.devtools.SourceRepositories**
-- **diagrams.gcp.devtools.Tasks**
-- **diagrams.gcp.devtools.TestLab**
-- **diagrams.gcp.devtools.ToolsForEclipse**
-- **diagrams.gcp.devtools.ToolsForPowershell**
-- **diagrams.gcp.devtools.ToolsForVisualStudio**
diff --git a/docs/nodes/k8s.md b/docs/nodes/k8s.md
index 6c9daa7..d52584d 100644
--- a/docs/nodes/k8s.md
+++ b/docs/nodes/k8s.md
@@ -5,27 +5,41 @@ title: K8S
 
 Node classes list of k8s provider.
 
-## k8s.infra
-
-- **diagrams.k8s.infra.ETCD**
-- **diagrams.k8s.infra.Master**
-- **diagrams.k8s.infra.Node**
-
-## k8s.others
-
-- **diagrams.k8s.others.CRD**
-- **diagrams.k8s.others.PSP**
-
 ## k8s.clusterconfig
 
 - **diagrams.k8s.clusterconfig.HPA**, **HorizontalPodAutoscaler** (alias)
 - **diagrams.k8s.clusterconfig.Limits**, **LimitRange** (alias)
 - **diagrams.k8s.clusterconfig.Quota**
 
+## k8s.compute
+
+- **diagrams.k8s.compute.Cronjob**
+- **diagrams.k8s.compute.Deploy**, **Deployment** (alias)
+- **diagrams.k8s.compute.DS**, **DaemonSet** (alias)
+- **diagrams.k8s.compute.Job**
+- **diagrams.k8s.compute.Pod**
+- **diagrams.k8s.compute.RS**, **ReplicaSet** (alias)
+- **diagrams.k8s.compute.STS**, **StatefulSet** (alias)
+
+## k8s.controlplane
+
+- **diagrams.k8s.controlplane.API**, **APIServer** (alias)
+- **diagrams.k8s.controlplane.CCM**
+- **diagrams.k8s.controlplane.CM**, **ControllerManager** (alias)
+- **diagrams.k8s.controlplane.KProxy**, **KubeProxy** (alias)
+- **diagrams.k8s.controlplane.Kubelet**
+- **diagrams.k8s.controlplane.Sched**, **Scheduler** (alias)
+
 ## k8s.group
 
 - **diagrams.k8s.group.NS**, **Namespace** (alias)
 
+## k8s.infra
+
+- **diagrams.k8s.infra.ETCD**
+- **diagrams.k8s.infra.Master**
+- **diagrams.k8s.infra.Node**
+
 ## k8s.network
 
 - **diagrams.k8s.network.Ep**, **Endpoint** (alias)
@@ -33,22 +47,10 @@ Node classes list of k8s provider.
 - **diagrams.k8s.network.Netpol**, **NetworkPolicy** (alias)
 - **diagrams.k8s.network.SVC**, **Service** (alias)
 
-## k8s.storage
-
-- **diagrams.k8s.storage.PV**, **PersistnetVolume** (alias)
-- **diagrams.k8s.storage.PVC**, **PersistentVolumeClaim** (alias)
-- **diagrams.k8s.storage.SC**, **StorageClass** (alias)
-- **diagrams.k8s.storage.Vol**, **Volume** (alias)
-
-## k8s.compute
+## k8s.others
 
-- **diagrams.k8s.compute.Cronjob**
-- **diagrams.k8s.compute.Deploy**, **Deployment** (alias)
-- **diagrams.k8s.compute.DS**, **DaemonSet** (alias)
-- **diagrams.k8s.compute.Job**
-- **diagrams.k8s.compute.Pod**
-- **diagrams.k8s.compute.RS**, **ReplicaSet** (alias)
-- **diagrams.k8s.compute.STS**, **StatefulSet** (alias)
+- **diagrams.k8s.others.CRD**
+- **diagrams.k8s.others.PSP**
 
 ## k8s.podconfig
 
@@ -65,11 +67,9 @@ Node classes list of k8s provider.
 - **diagrams.k8s.rbac.SA**, **ServiceAccount** (alias)
 - **diagrams.k8s.rbac.User**
 
-## k8s.controlplane
+## k8s.storage
 
-- **diagrams.k8s.controlplane.API**, **APIServer** (alias)
-- **diagrams.k8s.controlplane.CCM**
-- **diagrams.k8s.controlplane.CM**, **ControllerManager** (alias)
-- **diagrams.k8s.controlplane.KProxy**, **KubeProxy** (alias)
-- **diagrams.k8s.controlplane.Kubelet**
-- **diagrams.k8s.controlplane.Sched**, **Scheduler** (alias)
+- **diagrams.k8s.storage.PV**, **PersistnetVolume** (alias)
+- **diagrams.k8s.storage.PVC**, **PersistentVolumeClaim** (alias)
+- **diagrams.k8s.storage.SC**, **StorageClass** (alias)
+- **diagrams.k8s.storage.Vol**, **Volume** (alias)
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index 8cda206..568fe9a 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -5,6 +5,15 @@ title: OCI
 
 Node classes list of oci provider.
 
+## oci.compute
+
+- **diagrams.oci.compute.BmGrey**, **BareMetalGrey** (alias)
+- **diagrams.oci.compute.Bm**, **BareMetal** (alias)
+- **diagrams.oci.compute.ContainerGrey**
+- **diagrams.oci.compute.Container**
+- **diagrams.oci.compute.VmGrey**, **VirtualMachineGrey** (alias)
+- **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
+
 ## oci.connectivity
 
 - **diagrams.oci.connectivity.BackboneGrey**
@@ -18,28 +27,17 @@ Node classes list of oci provider.
 - **diagrams.oci.connectivity.VpnGrey**
 - **diagrams.oci.connectivity.Vpn**
 
-## oci.security
+## oci.database
 
-- **diagrams.oci.security.AuditGrey**
-- **diagrams.oci.security.Audit**
-- **diagrams.oci.security.CompartmentsGrey**
-- **diagrams.oci.security.Compartments**
-- **diagrams.oci.security.DdosGrey**
-- **diagrams.oci.security.Ddos**
-- **diagrams.oci.security.EncryptionGrey**
-- **diagrams.oci.security.Encryption**
-- **diagrams.oci.security.GroupsGrey**
-- **diagrams.oci.security.Groups**
-- **diagrams.oci.security.IdAccessGrey**
-- **diagrams.oci.security.IdAccess**
-- **diagrams.oci.security.KeymgmtGrey**
-- **diagrams.oci.security.Keymgmt**
-- **diagrams.oci.security.OcidGrey**
-- **diagrams.oci.security.Ocid**
-- **diagrams.oci.security.PoliciesGrey**
-- **diagrams.oci.security.Policies**
-- **diagrams.oci.security.TaggingGrey**
-- **diagrams.oci.security.Tagging**
+- **diagrams.oci.database.DatabaseserviceGrey**, **DBServiceGrey** (alias)
+- **diagrams.oci.database.Databaseservice**, **DBService** (alias)
+
+## oci.devops
+
+- **diagrams.oci.devops.ApiserviceGrey**
+- **diagrams.oci.devops.Apiservice**
+- **diagrams.oci.devops.ResourcemgmtGrey**
+- **diagrams.oci.devops.Resourcemgmt**
 
 ## oci.edge
 
@@ -52,6 +50,29 @@ Node classes list of oci provider.
 - **diagrams.oci.edge.WafGrey**
 - **diagrams.oci.edge.Waf**
 
+## oci.monitoring
+
+- **diagrams.oci.monitoring.AlarmGrey**
+- **diagrams.oci.monitoring.Alarm**
+- **diagrams.oci.monitoring.EventGrey**
+- **diagrams.oci.monitoring.Event**
+- **diagrams.oci.monitoring.HealthcheckGrey**
+- **diagrams.oci.monitoring.Healthcheck**
+- **diagrams.oci.monitoring.LoggingGrey**
+- **diagrams.oci.monitoring.Logging**
+- **diagrams.oci.monitoring.NotificationsGrey**
+- **diagrams.oci.monitoring.Notifications**
+- **diagrams.oci.monitoring.QueuingGrey**
+- **diagrams.oci.monitoring.Queuing**
+- **diagrams.oci.monitoring.SearchGrey**
+- **diagrams.oci.monitoring.Search**
+- **diagrams.oci.monitoring.StreamingGrey**
+- **diagrams.oci.monitoring.Streaming**
+- **diagrams.oci.monitoring.TelemetryGrey**
+- **diagrams.oci.monitoring.Telemetry**
+- **diagrams.oci.monitoring.WorkflowGrey**
+- **diagrams.oci.monitoring.Workflow**
+
 ## oci.network
 
 - **diagrams.oci.network.DrgGrey**
@@ -71,6 +92,29 @@ Node classes list of oci provider.
 - **diagrams.oci.network.VcloudnetworkGrey**
 - **diagrams.oci.network.Vcloudnetwork**
 
+## oci.security
+
+- **diagrams.oci.security.AuditGrey**
+- **diagrams.oci.security.Audit**
+- **diagrams.oci.security.CompartmentsGrey**
+- **diagrams.oci.security.Compartments**
+- **diagrams.oci.security.DdosGrey**
+- **diagrams.oci.security.Ddos**
+- **diagrams.oci.security.EncryptionGrey**
+- **diagrams.oci.security.Encryption**
+- **diagrams.oci.security.GroupsGrey**
+- **diagrams.oci.security.Groups**
+- **diagrams.oci.security.IdAccessGrey**
+- **diagrams.oci.security.IdAccess**
+- **diagrams.oci.security.KeymgmtGrey**
+- **diagrams.oci.security.Keymgmt**
+- **diagrams.oci.security.OcidGrey**
+- **diagrams.oci.security.Ocid**
+- **diagrams.oci.security.PoliciesGrey**
+- **diagrams.oci.security.Policies**
+- **diagrams.oci.security.TaggingGrey**
+- **diagrams.oci.security.Tagging**
+
 ## oci.storage
 
 - **diagrams.oci.storage.BackuprestoreGrey**
@@ -87,47 +131,3 @@ Node classes list of oci provider.
 - **diagrams.oci.storage.Objectstorage**
 - **diagrams.oci.storage.StoragegatewayGrey**
 - **diagrams.oci.storage.Storagegateway**
-
-## oci.database
-
-- **diagrams.oci.database.DatabaseserviceGrey**, **DBServiceGrey** (alias)
-- **diagrams.oci.database.Databaseservice**, **DBService** (alias)
-
-## oci.compute
-
-- **diagrams.oci.compute.BmGrey**, **BareMetalGrey** (alias)
-- **diagrams.oci.compute.Bm**, **BareMetal** (alias)
-- **diagrams.oci.compute.ContainerGrey**
-- **diagrams.oci.compute.Container**
-- **diagrams.oci.compute.VmGrey**, **VirtualMachineGrey** (alias)
-- **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
-
-## oci.monitoring
-
-- **diagrams.oci.monitoring.AlarmGrey**
-- **diagrams.oci.monitoring.Alarm**
-- **diagrams.oci.monitoring.EventGrey**
-- **diagrams.oci.monitoring.Event**
-- **diagrams.oci.monitoring.HealthcheckGrey**
-- **diagrams.oci.monitoring.Healthcheck**
-- **diagrams.oci.monitoring.LoggingGrey**
-- **diagrams.oci.monitoring.Logging**
-- **diagrams.oci.monitoring.NotificationsGrey**
-- **diagrams.oci.monitoring.Notifications**
-- **diagrams.oci.monitoring.QueuingGrey**
-- **diagrams.oci.monitoring.Queuing**
-- **diagrams.oci.monitoring.SearchGrey**
-- **diagrams.oci.monitoring.Search**
-- **diagrams.oci.monitoring.StreamingGrey**
-- **diagrams.oci.monitoring.Streaming**
-- **diagrams.oci.monitoring.TelemetryGrey**
-- **diagrams.oci.monitoring.Telemetry**
-- **diagrams.oci.monitoring.WorkflowGrey**
-- **diagrams.oci.monitoring.Workflow**
-
-## oci.devops
-
-- **diagrams.oci.devops.ApiserviceGrey**
-- **diagrams.oci.devops.Apiservice**
-- **diagrams.oci.devops.ResourcemgmtGrey**
-- **diagrams.oci.devops.Resourcemgmt**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 0c97957..d072384 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -5,10 +5,22 @@ title: OnPrem
 
 Node classes list of onprem provider.
 
-## onprem.security
+## onprem.analytics
 
-- **diagrams.onprem.security.Trivy**
-- **diagrams.onprem.security.Vault**
+- **diagrams.onprem.analytics.Beam**
+- **diagrams.onprem.analytics.Flink**
+- **diagrams.onprem.analytics.Hadoop**
+- **diagrams.onprem.analytics.Hive**
+- **diagrams.onprem.analytics.Metabase**
+- **diagrams.onprem.analytics.Norikra**
+- **diagrams.onprem.analytics.Spark**
+- **diagrams.onprem.analytics.Storm**
+- **diagrams.onprem.analytics.Tableau**
+
+## onprem.cd
+
+- **diagrams.onprem.cd.Spinnaker**
+- **diagrams.onprem.cd.Tekton**
 
 ## onprem.ci
 
@@ -19,75 +31,22 @@ Node classes list of onprem provider.
 - **diagrams.onprem.ci.Travisci**, **TravisCI** (alias)
 - **diagrams.onprem.ci.Zuulci**, **ZuulCI** (alias)
 
-## onprem.cd
+## onprem.client
 
-- **diagrams.onprem.cd.Spinnaker**
-- **diagrams.onprem.cd.Tekton**
+- **diagrams.onprem.client.Client**
+- **diagrams.onprem.client.User**
+- **diagrams.onprem.client.Users**
 
-## onprem.mlops
+## onprem.compute
 
-- **diagrams.onprem.mlops.Polyaxon**
+- **diagrams.onprem.compute.Nomad**
+- **diagrams.onprem.compute.Server**
 
 ## onprem.container
 
 - **diagrams.onprem.container.Docker**
 - **diagrams.onprem.container.Rkt**, **RKT** (alias)
 
-## onprem.etl
-
-- **diagrams.onprem.etl.Embulk**
-
-## onprem.vcs
-
-- **diagrams.onprem.vcs.Git**
-- **diagrams.onprem.vcs.Github**
-- **diagrams.onprem.vcs.Gitlab**
-
-## onprem.network
-
-- **diagrams.onprem.network.Apache**
-- **diagrams.onprem.network.Caddy**
-- **diagrams.onprem.network.Consul**
-- **diagrams.onprem.network.Envoy**
-- **diagrams.onprem.network.Etcd**, **ETCD** (alias)
-- **diagrams.onprem.network.Haproxy**, **HAProxy** (alias)
-- **diagrams.onprem.network.Internet**
-- **diagrams.onprem.network.Istio**
-- **diagrams.onprem.network.Kong**
-- **diagrams.onprem.network.Linkerd**
-- **diagrams.onprem.network.Nginx**
-- **diagrams.onprem.network.Pfsense**, **PFSense** (alias)
-- **diagrams.onprem.network.Pomerium**
-- **diagrams.onprem.network.Tomcat**
-- **diagrams.onprem.network.Traefik**
-- **diagrams.onprem.network.Vyos**, **VyOS** (alias)
-- **diagrams.onprem.network.Zookeeper**
-
-## onprem.iac
-
-- **diagrams.onprem.iac.Ansible**
-- **diagrams.onprem.iac.Awx**
-- **diagrams.onprem.iac.Terraform**
-
-## onprem.logging
-
-- **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias)
-- **diagrams.onprem.logging.Fluentd**
-- **diagrams.onprem.logging.Logstash**, **LogStash** (alias)
-- **diagrams.onprem.logging.Loki**
-
-## onprem.analytics
-
-- **diagrams.onprem.analytics.Beam**
-- **diagrams.onprem.analytics.Flink**
-- **diagrams.onprem.analytics.Hadoop**
-- **diagrams.onprem.analytics.Hive**
-- **diagrams.onprem.analytics.Metabase**
-- **diagrams.onprem.analytics.Norikra**
-- **diagrams.onprem.analytics.Spark**
-- **diagrams.onprem.analytics.Storm**
-- **diagrams.onprem.analytics.Tableau**
-
 ## onprem.database
 
 - **diagrams.onprem.database.Cassandra**
@@ -108,28 +67,9 @@ Node classes list of onprem provider.
 - **diagrams.onprem.database.Postgresql**, **PostgreSQL** (alias)
 - **diagrams.onprem.database.Scylla**
 
-## onprem.client
-
-- **diagrams.onprem.client.Client**
-- **diagrams.onprem.client.User**
-- **diagrams.onprem.client.Users**
-
-## onprem.compute
-
-- **diagrams.onprem.compute.Nomad**
-- **diagrams.onprem.compute.Server**
-
-## onprem.search
-
-- **diagrams.onprem.search.Elasticsearch**
-- **diagrams.onprem.search.Solr**
-
-## onprem.workflow
+## onprem.etl
 
-- **diagrams.onprem.workflow.Airflow**
-- **diagrams.onprem.workflow.Digdag**
-- **diagrams.onprem.workflow.Kubeflow**, **KubeFlow** (alias)
-- **diagrams.onprem.workflow.Nifi**, **NiFi** (alias)
+- **diagrams.onprem.etl.Embulk**
 
 ## onprem.gitops
 
@@ -137,13 +77,11 @@ Node classes list of onprem provider.
 - **diagrams.onprem.gitops.Flagger**
 - **diagrams.onprem.gitops.Flux**
 
-## onprem.queue
+## onprem.iac
 
-- **diagrams.onprem.queue.Activemq**, **ActiveMQ** (alias)
-- **diagrams.onprem.queue.Celery**
-- **diagrams.onprem.queue.Kafka**
-- **diagrams.onprem.queue.Rabbitmq**, **RabbitMQ** (alias)
-- **diagrams.onprem.queue.Zeromq**, **ZeroMQ** (alias)
+- **diagrams.onprem.iac.Ansible**
+- **diagrams.onprem.iac.Awx**
+- **diagrams.onprem.iac.Terraform**
 
 ## onprem.inmemory
 
@@ -152,6 +90,17 @@ Node classes list of onprem provider.
 - **diagrams.onprem.inmemory.Memcached**
 - **diagrams.onprem.inmemory.Redis**
 
+## onprem.logging
+
+- **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias)
+- **diagrams.onprem.logging.Fluentd**
+- **diagrams.onprem.logging.Logstash**, **LogStash** (alias)
+- **diagrams.onprem.logging.Loki**
+
+## onprem.mlops
+
+- **diagrams.onprem.mlops.Polyaxon**
+
 ## onprem.monitoring
 
 - **diagrams.onprem.monitoring.Datadog**
@@ -161,3 +110,54 @@ Node classes list of onprem provider.
 - **diagrams.onprem.monitoring.Sentry**
 - **diagrams.onprem.monitoring.Splunk**
 - **diagrams.onprem.monitoring.Thanos**
+
+## onprem.network
+
+- **diagrams.onprem.network.Apache**
+- **diagrams.onprem.network.Caddy**
+- **diagrams.onprem.network.Consul**
+- **diagrams.onprem.network.Envoy**
+- **diagrams.onprem.network.Etcd**, **ETCD** (alias)
+- **diagrams.onprem.network.Haproxy**, **HAProxy** (alias)
+- **diagrams.onprem.network.Internet**
+- **diagrams.onprem.network.Istio**
+- **diagrams.onprem.network.Kong**
+- **diagrams.onprem.network.Linkerd**
+- **diagrams.onprem.network.Nginx**
+- **diagrams.onprem.network.Pfsense**, **PFSense** (alias)
+- **diagrams.onprem.network.Pomerium**
+- **diagrams.onprem.network.Tomcat**
+- **diagrams.onprem.network.Traefik**
+- **diagrams.onprem.network.Vyos**, **VyOS** (alias)
+- **diagrams.onprem.network.Zookeeper**
+
+## onprem.queue
+
+- **diagrams.onprem.queue.Activemq**, **ActiveMQ** (alias)
+- **diagrams.onprem.queue.Celery**
+- **diagrams.onprem.queue.Kafka**
+- **diagrams.onprem.queue.Rabbitmq**, **RabbitMQ** (alias)
+- **diagrams.onprem.queue.Zeromq**, **ZeroMQ** (alias)
+
+## onprem.search
+
+- **diagrams.onprem.search.Elasticsearch**
+- **diagrams.onprem.search.Solr**
+
+## onprem.security
+
+- **diagrams.onprem.security.Trivy**
+- **diagrams.onprem.security.Vault**
+
+## onprem.vcs
+
+- **diagrams.onprem.vcs.Git**
+- **diagrams.onprem.vcs.Github**
+- **diagrams.onprem.vcs.Gitlab**
+
+## onprem.workflow
+
+- **diagrams.onprem.workflow.Airflow**
+- **diagrams.onprem.workflow.Digdag**
+- **diagrams.onprem.workflow.Kubeflow**, **KubeFlow** (alias)
+- **diagrams.onprem.workflow.Nifi**, **NiFi** (alias)
diff --git a/docs/nodes/programming.md b/docs/nodes/programming.md
index 9753161..60c8a0e 100644
--- a/docs/nodes/programming.md
+++ b/docs/nodes/programming.md
@@ -5,6 +5,20 @@ title: Programming
 
 Node classes list of programming provider.
 
+## programming.framework
+
+- **diagrams.programming.framework.Angular**
+- **diagrams.programming.framework.Backbone**
+- **diagrams.programming.framework.Django**
+- **diagrams.programming.framework.Ember**
+- **diagrams.programming.framework.Flask**
+- **diagrams.programming.framework.Flutter**
+- **diagrams.programming.framework.Laravel**
+- **diagrams.programming.framework.Rails**
+- **diagrams.programming.framework.React**
+- **diagrams.programming.framework.Spring**
+- **diagrams.programming.framework.Vue**
+
 ## programming.language
 
 - **diagrams.programming.language.Bash**
@@ -25,17 +39,3 @@ Node classes list of programming provider.
 - **diagrams.programming.language.Rust**
 - **diagrams.programming.language.Swift**
 - **diagrams.programming.language.Typescript**, **TypeScript** (alias)
-
-## programming.framework
-
-- **diagrams.programming.framework.Angular**
-- **diagrams.programming.framework.Backbone**
-- **diagrams.programming.framework.Django**
-- **diagrams.programming.framework.Ember**
-- **diagrams.programming.framework.Flask**
-- **diagrams.programming.framework.Flutter**
-- **diagrams.programming.framework.Laravel**
-- **diagrams.programming.framework.Rails**
-- **diagrams.programming.framework.React**
-- **diagrams.programming.framework.Spring**
-- **diagrams.programming.framework.Vue**
diff --git a/resources/elastic/elasticsearch/beats.png b/resources/elastic/elasticsearch/beats.png
new file mode 100644
index 0000000..e4c08bf
Binary files /dev/null and b/resources/elastic/elasticsearch/beats.png differ