diff --git a/metrics/IncidentManagement/Ownership/IncidentManagementOwnership.yaml b/metrics/IncidentManagement/Ownership/IncidentManagementOwnership.yaml
new file mode 100644
index 00000000..462c8854
--- /dev/null
+++ b/metrics/IncidentManagement/Ownership/IncidentManagementOwnership.yaml
@@ -0,0 +1,13 @@
+# ====== Metadata ======
+id: IncidentManagementOwnership
+description: TODO (Is this a security feature or just add it as resource?)
+implementationGuidelines:
+  AMOE: "Which team is in charge of handling security incidents? Keywords are ['Incident Management', 'CERT']"
+category: IncidentManagement
+version: "1.0"
+comments: "<Enter further description of the metric here.>"
+# ====== Configuration ======
+configuration:
+  p1:
+    operator: "isIn"
+    targetValue: "[CERT]"
diff --git a/metrics/IncidentManagement/Ownership/data.json b/metrics/IncidentManagement/Ownership/data.json
new file mode 100644
index 00000000..71b6d17c
--- /dev/null
+++ b/metrics/IncidentManagement/Ownership/data.json
@@ -0,0 +1,6 @@
+{
+    "operator": "isIn",
+    "target_value": [
+        "CERT"
+    ]
+}
\ No newline at end of file
diff --git a/metrics/IncidentManagement/Ownership/metric.rego b/metrics/IncidentManagement/Ownership/metric.rego
new file mode 100644
index 00000000..f87f5c14
--- /dev/null
+++ b/metrics/IncidentManagement/Ownership/metric.rego
@@ -0,0 +1 @@
+# TODO
\ No newline at end of file
diff --git a/ontology/1.0/ontology.proto b/ontology/1.0/ontology.proto
index 25e3e25c..99df355d 100644
--- a/ontology/1.0/ontology.proto
+++ b/ontology/1.0/ontology.proto
@@ -70,11 +70,11 @@ message Account {
 	string name = 18836 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 14088;
-	GeoLocation geo_location = 2374;
-	repeated Logging loggings  = 8494;
-	repeated Redundancy redundancies  = 15991;
-	optional string parent_id = 12102;
-	UsageStatistics usage_statistics = 11624;
+	GeoLocation geo_location = 402;
+	repeated Logging loggings  = 11094;
+	repeated Redundancy redundancies  = 2929;
+	optional string parent_id = 1286;
+	UsageStatistics usage_statistics = 4034;
 }
 
 // ActivityLogging is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -89,7 +89,7 @@ message ActivityLogging {
 	string name = 10561 [ (buf.validate.field).required = true ];
 	google.protobuf.Duration retention_period = 10788;
 	bool security_alerts_enabled = 17680;
-	repeated string logging_service_ids  = 589;
+	repeated string logging_service_ids  = 16760;
 }
 
 // Agnostic is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -107,10 +107,10 @@ message Agnostic {
 	string name = 5900 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10733;
-	repeated string code_module_ids  = 17881;
-	optional string code_repository_id = 16948;
-	repeated Functionality functionalities  = 4779;
-	optional string parent_id = 10692;
+	repeated string code_module_ids  = 16288;
+	optional string code_repository_id = 5545;
+	repeated Functionality functionalities  = 4188;
+	optional string parent_id = 746;
 }
 
 // Allocate is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -120,8 +120,8 @@ message Allocate {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 12954;
-	optional string memory_id = 8807;
+	CodeRegion code_region = 11008;
+	Memory linked_concept = 10376;
 }
 
 // AndRule is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -139,8 +139,8 @@ message AndRule {
 	string name = 2112 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 15790;
-	DataLocation data_location = 6588;
-	optional string parent_id = 8433;
+	DataLocation data_location = 12945;
+	optional string parent_id = 13799;
 }
 
 // AnomalyDetection is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -153,7 +153,7 @@ message AnomalyDetection {
 
 	bool enabled = 8852;
 	string scope = 8482;
-	ApplicationLogging application_logging = 11132;
+	ApplicationLogging application_logging = 16001;
 }
 
 // Application is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -174,13 +174,13 @@ message Application {
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 18684;
 	repeated string translation_units = 9449;
-	AutomaticUpdates automatic_updates = 1953;
-	repeated string code_module_ids  = 15130;
-	optional string code_repository_id = 12633;
-	optional string compute_id = 8224;
-	repeated Functionality functionalities  = 7253;
-	repeated string library_ids  = 14815;
-	optional string parent_id = 13276;
+	AutomaticUpdates automatic_updates = 1992;
+	repeated string code_module_ids  = 18101;
+	optional string code_repository_id = 3551;
+	optional string compute_id = 13326;
+	repeated Functionality functionalities  = 6572;
+	repeated string library_ids  = 11626;
+	optional string parent_id = 3984;
 }
 
 // ApplicationLogging is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -195,7 +195,7 @@ message ApplicationLogging {
 	string name = 4460 [ (buf.validate.field).required = true ];
 	google.protobuf.Duration retention_period = 6319;
 	bool security_alerts_enabled = 17870;
-	repeated string logging_service_ids  = 3793;
+	repeated string logging_service_ids  = 3884;
 }
 
 // AsymmetricCipher is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -210,7 +210,7 @@ message AsymmetricCipher {
 	string cipher_name = 10744;
 	// Key size refers to the length of a key used in an enryption.
 	int32 key_size = 8751;
-	Padding padding = 17545;
+	Padding padding = 15741;
 }
 
 // AtRestEncryption is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -255,9 +255,9 @@ message Authenticate {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	Authenticity authenticity = 17604;
-	CodeRegion code_region = 14922;
-	optional string credential_id = 16875;
+	Authenticity linked_concept = 3724;
+	CodeRegion code_region = 5745;
+	optional string credential_id = 6982;
 }
 
 // AuthenticationOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -305,8 +305,8 @@ message AuthorizeJwt {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	Authenticity authenticity = 8497;
-	CodeRegion code_region = 12233;
+	Authenticity linked_concept = 15960;
+	CodeRegion code_region = 2623;
 }
 
 // AutomaticUpdates is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -351,7 +351,7 @@ message AwarenessTraining {
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 8066;
 	bool successfully_completed_percentage = 3826;
-	optional string parent_id = 6137;
+	optional string parent_id = 8185;
 }
 
 // Backup is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -365,8 +365,8 @@ message Backup {
 	// The interval refers to the update interval in days.
 	google.protobuf.Duration interval = 7186;
 	google.protobuf.Duration retention_period = 6795;
-	optional string storage_id = 7061;
-	TransportEncryption transport_encryption = 1921;
+	optional string storage_id = 17051;
+	TransportEncryption transport_encryption = 2398;
 }
 
 // BlockStorage is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -384,16 +384,16 @@ message BlockStorage {
 	string name = 13869 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 11057;
-	ActivityLogging activity_logging = 4784;
-	AtRestEncryption at_rest_encryption = 4444;
-	repeated Backup backups  = 4533;
-	GeoLocation geo_location = 3522;
-	Immutability immutability = 9844;
-	repeated Logging loggings  = 13592;
-	repeated Redundancy redundancies  = 14466;
-	optional string parent_id = 8468;
-	ResourceLogging resource_logging = 12392;
-	UsageStatistics usage_statistics = 17806;
+	ActivityLogging activity_logging = 16146;
+	AtRestEncryption at_rest_encryption = 12598;
+	repeated Backup backups  = 2815;
+	GeoLocation geo_location = 3908;
+	Immutability immutability = 2967;
+	repeated Logging loggings  = 7973;
+	repeated Redundancy redundancies  = 16302;
+	optional string parent_id = 15420;
+	ResourceLogging resource_logging = 4514;
+	UsageStatistics usage_statistics = 9280;
 }
 
 // BlockStorageOperation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -402,8 +402,8 @@ message BlockStorageOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	optional string block_storage_id = 9129;
-	CodeRegion code_region = 7586;
+	BlockStorage linked_concept = 10648;
+	CodeRegion code_region = 2756;
 }
 
 // BootLogging is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -418,7 +418,7 @@ message BootLogging {
 	string name = 12593 [ (buf.validate.field).required = true ];
 	google.protobuf.Duration retention_period = 2338;
 	bool security_alerts_enabled = 3133;
-	repeated string logging_service_ids  = 15790;
+	repeated string logging_service_ids  = 17105;
 }
 
 // Boundary is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -457,12 +457,12 @@ message Certificate {
 	google.protobuf.Timestamp not_before_date = 11770;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 7199;
-	GeoLocation geo_location = 12402;
-	optional string infrastructure_id = 8357;
-	repeated Logging loggings  = 13577;
-	repeated Redundancy redundancies  = 7304;
-	optional string parent_id = 10685;
-	UsageStatistics usage_statistics = 11629;
+	GeoLocation geo_location = 4443;
+	Infrastructure used_by_multiple = 13381;
+	repeated Logging loggings  = 3178;
+	repeated Redundancy redundancies  = 15810;
+	optional string parent_id = 9548;
+	UsageStatistics usage_statistics = 3679;
 }
 
 // CertificateBasedAuthentication is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -487,8 +487,8 @@ message CheckAccess {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 6282;
-	ProtectedAsset protected_asset = 1244;
+	CodeRegion code_region = 9029;
+	ProtectedAsset linked_concept = 14637;
 }
 
 // Cipher is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -524,7 +524,7 @@ message CipherSuite {
 	string mac_algorithm = 2344;
 	// naming schema: AES-128-GCM
 	string session_cipher = 5742;
-	repeated Cipher ciphers  = 5474;
+	repeated Cipher ciphers  = 8372;
 }
 
 // Infrastructure is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -611,11 +611,11 @@ message CodeRepository {
 	string name = 12766 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 15664;
-	GeoLocation geo_location = 3636;
-	repeated Logging loggings  = 10882;
-	repeated Redundancy redundancies  = 2093;
-	optional string parent_id = 8043;
-	UsageStatistics usage_statistics = 14597;
+	GeoLocation geo_location = 111;
+	repeated Logging loggings  = 133;
+	repeated Redundancy redundancies  = 11273;
+	optional string parent_id = 5357;
+	UsageStatistics usage_statistics = 3480;
 }
 
 // Component is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -664,9 +664,9 @@ message Configuration {
 	string name = 6896 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 17099;
-	repeated string configuration_group_ids  = 4537;
-	DataLocation data_location = 18259;
-	optional string parent_id = 6916;
+	repeated string configuration_group_ids  = 7024;
+	DataLocation data_location = 5147;
+	optional string parent_id = 13616;
 }
 
 // ConfigurationDocument is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -684,12 +684,12 @@ message ConfigurationDocument {
 	string name = 1266 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 1506;
-	repeated CryptographicHash cryptographic_hashs  = 6259;
-	DataLocation data_location = 3882;
-	repeated DocumentSignature document_signatures  = 18021;
-	optional string parent_id = 15783;
-	SchemaValidation schema_validation = 2692;
-	repeated SecurityFeature security_features  = 6789;
+	repeated CryptographicHash cryptographic_hashs  = 11524;
+	DataLocation data_location = 1817;
+	repeated DocumentSignature document_signatures  = 14626;
+	optional string parent_id = 11413;
+	SchemaValidation validated_by = 1274;
+	repeated SecurityFeature security_features  = 11996;
 }
 
 // ConfigurationGroup is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -706,10 +706,10 @@ message ConfigurationGroup {
 	string name = 14875 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 15135;
-	optional string configuration_id = 2133;
-	repeated string configuration_option_ids  = 2785;
-	DataLocation data_location = 17869;
-	optional string parent_id = 7515;
+	optional string configuration_id = 3610;
+	repeated string configuration_option_ids  = 5873;
+	DataLocation data_location = 10960;
+	optional string parent_id = 16963;
 }
 
 // ConfigurationGroupSource is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -726,8 +726,8 @@ message ConfigurationGroupSource {
 	string name = 7188 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10682;
-	DataLocation data_location = 12198;
-	optional string parent_id = 11898;
+	DataLocation data_location = 9790;
+	optional string parent_id = 11712;
 }
 
 // ConfigurationOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -760,11 +760,11 @@ message ConfigurationOption {
 	string name = 17275 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 8644;
-	optional string configuration_group_id = 527;
-	DataLocation data_location = 15356;
-	optional string parent_id = 2843;
-	optional string selector_key_id = 5693;
-	optional string value_id = 14288;
+	optional string configuration_group_id = 6079;
+	DataLocation data_location = 17197;
+	optional string parent_id = 6223;
+	optional string selector_key_id = 13888;
+	optional string value_id = 2572;
 }
 
 // ConfigurationOptionSource is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -781,8 +781,8 @@ message ConfigurationOptionSource {
 	string name = 15744 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 9031;
-	DataLocation data_location = 16310;
-	optional string parent_id = 5779;
+	DataLocation data_location = 11870;
+	optional string parent_id = 312;
 }
 
 // ConfigurationSource is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -799,9 +799,9 @@ message ConfigurationSource {
 	string name = 8639 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16840;
-	repeated string configuration_group_source_ids  = 12585;
-	DataLocation data_location = 2532;
-	optional string parent_id = 9707;
+	repeated string configuration_group_source_ids  = 4705;
+	DataLocation data_location = 16924;
+	optional string parent_id = 12170;
 }
 
 // Container is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -819,16 +819,16 @@ message Container {
 	string name = 736 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 18367;
-	EncryptionInUse encryption_in_use = 14323;
-	GeoLocation geo_location = 1707;
-	optional string image_id = 9825;
-	repeated Logging loggings  = 10134;
-	repeated string network_interface_ids  = 250;
-	repeated Redundancy redundancies  = 15735;
-	RemoteAttestation remote_attestation = 15151;
-	optional string parent_id = 16383;
-	ResourceLogging resource_logging = 11967;
-	UsageStatistics usage_statistics = 14019;
+	EncryptionInUse encryption_in_use = 295;
+	GeoLocation geo_location = 5503;
+	optional string image_id = 11948;
+	repeated Logging loggings  = 4933;
+	repeated string network_interface_ids  = 5591;
+	repeated Redundancy redundancies  = 9300;
+	RemoteAttestation remote_attestation = 4110;
+	optional string parent_id = 14600;
+	ResourceLogging resource_logging = 13978;
+	UsageStatistics usage_statistics = 11440;
 }
 
 // ContainerImage is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -846,12 +846,12 @@ message ContainerImage {
 	string name = 2181 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10543;
-	optional string application_id = 9751;
-	GeoLocation geo_location = 13766;
-	repeated Logging loggings  = 5622;
-	repeated Redundancy redundancies  = 10648;
-	optional string parent_id = 14165;
-	UsageStatistics usage_statistics = 6924;
+	optional string application_id = 758;
+	GeoLocation geo_location = 117;
+	repeated Logging loggings  = 12269;
+	repeated Redundancy redundancies  = 16536;
+	optional string parent_id = 462;
+	UsageStatistics usage_statistics = 349;
 }
 
 // ContainerOrchestration is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -869,13 +869,13 @@ message ContainerOrchestration {
 	string name = 18187 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 17471;
-	repeated string container_ids  = 12733;
-	GeoLocation geo_location = 13354;
-	repeated Logging loggings  = 8875;
-	repeated Redundancy redundancies  = 2264;
-	optional string parent_id = 16309;
-	ResourceLogging resource_logging = 13646;
-	UsageStatistics usage_statistics = 6319;
+	repeated string container_ids  = 1059;
+	GeoLocation geo_location = 8832;
+	repeated Logging loggings  = 2512;
+	repeated Redundancy redundancies  = 5269;
+	optional string parent_id = 139;
+	ResourceLogging resource_logging = 1847;
+	UsageStatistics usage_statistics = 6800;
 }
 
 // ContainerRegistry is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -892,11 +892,11 @@ message ContainerRegistry {
 	string name = 1523 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 5030;
-	GeoLocation geo_location = 15152;
-	repeated Logging loggings  = 6570;
-	repeated Redundancy redundancies  = 18999;
-	optional string parent_id = 2537;
-	UsageStatistics usage_statistics = 17864;
+	GeoLocation geo_location = 5019;
+	repeated Logging loggings  = 685;
+	repeated Redundancy redundancies  = 12740;
+	optional string parent_id = 14247;
+	UsageStatistics usage_statistics = 13554;
 }
 
 // Context is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -913,8 +913,8 @@ message Context {
 	string name = 12248 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 4517;
-	DataLocation data_location = 5123;
-	optional string parent_id = 8416;
+	DataLocation data_location = 14574;
+	optional string parent_id = 5287;
 }
 
 // Core is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -936,8 +936,8 @@ message CreateEncryptedDisk {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 18358;
-	DiskEncryption disk_encryption = 14076;
+	CodeRegion code_region = 3010;
+	DiskEncryption linked_concept = 13187;
 }
 
 // CreateSecret is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -947,8 +947,8 @@ message CreateSecret {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 5924;
-	optional string secret_id = 14969;
+	CodeRegion code_region = 9369;
+	Secret linked_concept = 9021;
 }
 
 // Credential is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -968,7 +968,7 @@ message CryptographicHash {
 	option (resource_type_names) = "SecurityFeature";
 
 	string algorithm = 18383;
-	repeated Error errors  = 8192;
+	repeated Error errors  = 4094;
 }
 
 // CryptographicOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -991,8 +991,8 @@ message CustomerKeyEncryption {
 	string algorithm = 12685;
 	bool enabled = 14976;
 	string key_url = 13999;
-	Cipher cipher = 11750;
-	optional string secret_id = 15597;
+	Cipher based_on = 13151;
+	optional string secret_id = 4394;
 }
 
 // DDoSProtection is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1018,10 +1018,10 @@ message Darwin {
 	string name = 9393 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 12162;
-	repeated string code_module_ids  = 41;
-	optional string code_repository_id = 4523;
-	repeated Functionality functionalities  = 17232;
-	optional string parent_id = 1632;
+	repeated string code_module_ids  = 3304;
+	optional string code_repository_id = 3877;
+	repeated Functionality functionalities  = 12307;
+	optional string parent_id = 1392;
 }
 
 // Data is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1071,10 +1071,10 @@ message DatabaseConnect {
 	option (resource_type_names) = "Functionality";
 
 	repeated string calls = 12922;
-	CodeRegion code_region = 5983;
-	repeated string database_service_ids  = 5749;
-	optional string database_storage_id = 3674;
-	optional string database_storage_id = 3674;
+	CodeRegion code_region = 805;
+	repeated string database_service_ids  = 7502;
+	DatabaseStorage linked_concept = 18437;
+	optional string database_storage_id = 8596;
 }
 
 // DatabaseOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1095,10 +1095,10 @@ message DatabaseQuery {
 
 	repeated string calls = 7647;
 	bool modify = 7601;
-	CodeRegion code_region = 8496;
-	repeated string database_service_ids  = 14358;
-	optional string database_storage_id = 17880;
-	optional string database_storage_id = 17880;
+	CodeRegion code_region = 5643;
+	repeated string database_service_ids  = 10199;
+	DatabaseStorage linked_concept = 3228;
+	optional string database_storage_id = 726;
 }
 
 // DatabaseService is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1129,16 +1129,16 @@ message DatabaseStorage {
 	string name = 1264 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 11538;
-	ActivityLogging activity_logging = 5640;
-	AtRestEncryption at_rest_encryption = 14578;
-	repeated Backup backups  = 12872;
-	GeoLocation geo_location = 16892;
-	Immutability immutability = 13674;
-	repeated Logging loggings  = 440;
-	repeated Redundancy redundancies  = 15577;
-	optional string parent_id = 3160;
-	ResourceLogging resource_logging = 16054;
-	UsageStatistics usage_statistics = 283;
+	ActivityLogging activity_logging = 14738;
+	AtRestEncryption at_rest_encryption = 16710;
+	repeated Backup backups  = 6649;
+	GeoLocation geo_location = 17276;
+	Immutability immutability = 16030;
+	repeated Logging loggings  = 5231;
+	repeated Redundancy redundancies  = 5699;
+	optional string parent_id = 1057;
+	ResourceLogging resource_logging = 7886;
+	UsageStatistics usage_statistics = 10375;
 }
 
 // DeAllocate is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1149,8 +1149,8 @@ message DeAllocate {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 13944;
-	optional string memory_id = 16449;
+	CodeRegion code_region = 10932;
+	Memory linked_concept = 12749;
 }
 
 // Decryption is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1161,9 +1161,9 @@ message Decryption {
 	option (resource_type_names) = "Functionality";
 
 	string algorithm = 7747;
-	Cipher cipher = 8737;
-	CodeRegion code_region = 7700;
-	optional string secret_id = 13919;
+	Cipher linked_concept = 18279;
+	CodeRegion code_region = 7584;
+	optional string secret_id = 2937;
 }
 
 // DeviceProvisioningService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1181,11 +1181,11 @@ message DeviceProvisioningService {
 	string name = 9731 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 14841;
-	GeoLocation geo_location = 9853;
-	repeated Logging loggings  = 12189;
-	repeated Redundancy redundancies  = 12751;
-	optional string parent_id = 4221;
-	UsageStatistics usage_statistics = 8367;
+	GeoLocation geo_location = 3548;
+	repeated Logging loggings  = 3832;
+	repeated Redundancy redundancies  = 4325;
+	optional string parent_id = 7483;
+	UsageStatistics usage_statistics = 15375;
 }
 
 // DiskEncryption is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1199,9 +1199,9 @@ message DiskEncryption {
 	string algorithm = 2867;
 	bool enabled = 9285;
 	string key_url = 6086;
-	optional string block_storage_id = 4264;
-	Cipher cipher = 916;
-	optional string secret_id = 17840;
+	BlockStorage target = 17123;
+	Cipher based_on = 6881;
+	optional string secret_id = 10114;
 }
 
 // DiskEncryptionOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1247,20 +1247,20 @@ message DocumentDatabaseService {
 	repeated uint32 ports = 10225;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 7317;
-	ActivityLogging activity_logging = 8;
-	repeated AnomalyDetection anomaly_detections  = 1003;
-	Authenticity authenticity = 6961;
-	repeated string compute_ids  = 6197;
-	GeoLocation geo_location = 9480;
-	HttpEndpoint http_endpoint = 7406;
-	repeated Logging loggings  = 4410;
-	MalwareProtection malware_protection = 15064;
-	repeated Redundancy redundancies  = 953;
-	optional string parent_id = 17568;
-	optional string service_metadata_document_id = 1112;
-	repeated string storage_ids  = 7020;
-	TransportEncryption transport_encryption = 10295;
-	UsageStatistics usage_statistics = 10074;
+	ActivityLogging activity_logging = 6357;
+	repeated AnomalyDetection anomaly_detections  = 3091;
+	Authenticity authenticity = 1700;
+	repeated string compute_ids  = 15914;
+	GeoLocation geo_location = 8772;
+	HttpEndpoint http_endpoint = 8315;
+	repeated Logging loggings  = 2720;
+	MalwareProtection malware_protection = 4601;
+	repeated Redundancy redundancies  = 6171;
+	optional string parent_id = 17529;
+	optional string service_metadata_document_id = 9461;
+	repeated string storage_ids  = 3838;
+	TransportEncryption transport_encryption = 2253;
+	UsageStatistics usage_statistics = 4752;
 }
 
 // DynamicLoading is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1309,9 +1309,9 @@ message EncryptionOperation {
 	option (resource_type_names) = "Functionality";
 
 	string algorithm = 15092;
-	CodeRegion code_region = 1317;
-	Encryption encryption = 13053;
-	optional string secret_id = 14153;
+	CodeRegion code_region = 14814;
+	Encryption linked_concept = 18249;
+	optional string secret_id = 7662;
 }
 
 // EntryPoint is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1333,10 +1333,10 @@ message EqualityCheck {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 9770;
-	optional string policy_id = 8438;
-	Principal principal = 9160;
-	Principal principal = 9160;
+	CodeRegion code_region = 8863;
+	Policy linked_concept = 12938;
+	Principal left_principal = 15267;
+	Principal right_principal = 9410;
 }
 
 // Error is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1354,8 +1354,8 @@ message ExitBoundaryOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	Boundary boundary = 5328;
-	CodeRegion code_region = 17056;
+	Boundary linked_concept = 3216;
+	CodeRegion code_region = 3532;
 }
 
 // ExplainableResults is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1380,8 +1380,8 @@ message File {
 	string name = 16988 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 17122;
-	DataLocation data_location = 15567;
-	optional string parent_id = 5237;
+	DataLocation data_location = 9097;
+	optional string parent_id = 8615;
 }
 
 // FileHandle is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1399,8 +1399,8 @@ message FileHandle {
 	string name = 1128 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 13657;
-	DataLocation data_location = 2490;
-	optional string parent_id = 3664;
+	DataLocation data_location = 7246;
+	optional string parent_id = 8541;
 }
 
 // FileLikeObject is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1419,8 +1419,8 @@ message FileOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 12263;
-	optional string file_id = 18573;
+	CodeRegion code_region = 18400;
+	File linked_concept = 7556;
 }
 
 // FileStorage is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1439,16 +1439,16 @@ message FileStorage {
 	bool public_access = 10539;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 4379;
-	ActivityLogging activity_logging = 17409;
-	AtRestEncryption at_rest_encryption = 1429;
-	repeated Backup backups  = 17584;
-	GeoLocation geo_location = 5391;
-	Immutability immutability = 7897;
-	repeated Logging loggings  = 884;
-	repeated Redundancy redundancies  = 1278;
-	optional string parent_id = 4433;
-	ResourceLogging resource_logging = 18223;
-	UsageStatistics usage_statistics = 8987;
+	ActivityLogging activity_logging = 108;
+	AtRestEncryption at_rest_encryption = 12115;
+	repeated Backup backups  = 4043;
+	GeoLocation geo_location = 10014;
+	Immutability immutability = 1506;
+	repeated Logging loggings  = 9165;
+	repeated Redundancy redundancies  = 1252;
+	optional string parent_id = 13904;
+	ResourceLogging resource_logging = 12122;
+	UsageStatistics usage_statistics = 3902;
 }
 
 // FileStorageService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1471,18 +1471,18 @@ message FileStorageService {
 	repeated uint32 ports = 12509;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 13948;
-	ActivityLogging activity_logging = 12272;
-	Authenticity authenticity = 16174;
-	repeated string compute_ids  = 15440;
-	GeoLocation geo_location = 16763;
-	HttpEndpoint http_endpoint = 12282;
-	repeated Logging loggings  = 18653;
-	repeated Redundancy redundancies  = 4497;
-	optional string parent_id = 3568;
-	optional string service_metadata_document_id = 10599;
-	repeated string storage_ids  = 5495;
-	TransportEncryption transport_encryption = 18341;
-	UsageStatistics usage_statistics = 1779;
+	ActivityLogging activity_logging = 16844;
+	Authenticity authenticity = 515;
+	repeated string compute_ids  = 11010;
+	GeoLocation geo_location = 14794;
+	HttpEndpoint http_endpoint = 16772;
+	repeated Logging loggings  = 6801;
+	repeated Redundancy redundancies  = 14092;
+	optional string parent_id = 8578;
+	optional string service_metadata_document_id = 5580;
+	repeated string storage_ids  = 9777;
+	TransportEncryption transport_encryption = 10948;
+	UsageStatistics usage_statistics = 4605;
 }
 
 // Firewall is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1522,15 +1522,15 @@ message Function {
 	string raw = 1531;
 	string runtime_language = 7048;
 	string runtime_version = 16017;
-	EncryptionInUse encryption_in_use = 16630;
-	GeoLocation geo_location = 8822;
-	repeated Logging loggings  = 5609;
-	repeated string network_interface_ids  = 3840;
-	repeated Redundancy redundancies  = 18216;
-	RemoteAttestation remote_attestation = 13435;
-	optional string parent_id = 11924;
-	ResourceLogging resource_logging = 5288;
-	UsageStatistics usage_statistics = 9808;
+	EncryptionInUse encryption_in_use = 9821;
+	GeoLocation geo_location = 5466;
+	repeated Logging loggings  = 2200;
+	repeated string network_interface_ids  = 8092;
+	repeated Redundancy redundancies  = 13881;
+	RemoteAttestation remote_attestation = 153;
+	optional string parent_id = 9026;
+	ResourceLogging resource_logging = 7634;
+	UsageStatistics usage_statistics = 12153;
 }
 
 // FunctionService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1551,16 +1551,16 @@ message FunctionService {
 	repeated uint32 ports = 17713;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 4925;
-	Authenticity authenticity = 17652;
-	repeated string compute_ids  = 5429;
-	repeated string function_ids  = 2362;
-	GeoLocation geo_location = 8116;
-	repeated Logging loggings  = 15412;
-	repeated Redundancy redundancies  = 17787;
-	optional string parent_id = 11473;
-	optional string service_metadata_document_id = 5508;
-	TransportEncryption transport_encryption = 8143;
-	UsageStatistics usage_statistics = 7485;
+	Authenticity authenticity = 11275;
+	repeated string compute_ids  = 10103;
+	repeated string function_ids  = 2977;
+	GeoLocation geo_location = 17812;
+	repeated Logging loggings  = 10958;
+	repeated Redundancy redundancies  = 1327;
+	optional string parent_id = 2810;
+	optional string service_metadata_document_id = 1408;
+	TransportEncryption transport_encryption = 12735;
+	UsageStatistics usage_statistics = 16800;
 }
 
 // Functionality is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1669,15 +1669,15 @@ message GenericNetworkService {
 	repeated uint32 ports = 532;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10844;
-	Authenticity authenticity = 16001;
-	repeated string compute_ids  = 6238;
-	GeoLocation geo_location = 10055;
-	repeated Logging loggings  = 15073;
-	repeated Redundancy redundancies  = 16059;
-	optional string parent_id = 12959;
-	optional string service_metadata_document_id = 11825;
-	TransportEncryption transport_encryption = 13959;
-	UsageStatistics usage_statistics = 16789;
+	Authenticity authenticity = 18424;
+	repeated string compute_ids  = 17384;
+	GeoLocation geo_location = 1874;
+	repeated Logging loggings  = 1801;
+	repeated Redundancy redundancies  = 13999;
+	optional string parent_id = 14004;
+	optional string service_metadata_document_id = 9192;
+	TransportEncryption transport_encryption = 10346;
+	UsageStatistics usage_statistics = 9415;
 }
 
 // GeoLocation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1696,7 +1696,7 @@ message GeoRedundancy {
 	option (resource_type_names) = "Availability";
 	option (resource_type_names) = "SecurityFeature";
 
-	repeated GeoLocation geo_locations  = 13910;
+	repeated GeoLocation geo_locations  = 10472;
 }
 
 // GetCurrentTimeOperation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1705,8 +1705,8 @@ message GetCurrentTimeOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 9108;
-	Time time = 14351;
+	CodeRegion code_region = 5045;
+	Time linked_concept = 14060;
 }
 
 // GetSecret is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1717,8 +1717,8 @@ message GetSecret {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 6105;
-	optional string secret_id = 7949;
+	CodeRegion code_region = 15770;
+	Secret linked_concept = 11250;
 }
 
 // Hardware is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1738,8 +1738,8 @@ message CryptographicHash {
 
 	string algorithm = 9887;
 	bool uses_salt = 8538;
-	CodeRegion code_region = 6454;
-	Confidentiality confidentiality = 12937;
+	CodeRegion code_region = 15881;
+	Confidentiality linked_concept = 11087;
 }
 
 // Http is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1761,7 +1761,7 @@ message HttpClient {
 	option (resource_type_names) = "Functionality";
 
 	bool is_tls = 2674;
-	Authenticity authenticity = 17258;
+	Authenticity authenticity = 14857;
 }
 
 // HttpClientLibrary is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1794,10 +1794,10 @@ message HttpEndpoint {
 	string method = 1347;
 	string path = 11504;
 	string url = 16076;
-	Authenticity authenticity = 18265;
-	Authorization authorization = 11170;
-	HttpRequestContext http_request_context = 3206;
-	TransportEncryption transport_encryption = 12830;
+	Authenticity authenticity = 3805;
+	Authorization authorization = 2327;
+	HttpRequestContext http_request_context = 4988;
+	TransportEncryption transport_encryption = 13575;
 }
 
 // HttpEndpointOperation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1807,8 +1807,8 @@ message HttpEndpointOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 4298;
-	Http http = 12984;
+	CodeRegion code_region = 8403;
+	Http linked_concept = 18618;
 }
 
 // HttpRequest is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1820,9 +1820,9 @@ message HttpRequest {
 
 	string call = 16831;
 	string req_body = 5634;
-	CodeRegion code_region = 7401;
-	HttpClient http_client = 16379;
-	repeated HttpEndpoint http_endpoints  = 8773;
+	CodeRegion code_region = 681;
+	HttpClient linked_concept = 15097;
+	repeated HttpEndpoint http_endpoints  = 1360;
 }
 
 // HttpRequestContext is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1841,8 +1841,8 @@ message HttpRequestHandler {
 	option (resource_type_names) = "Functionality";
 
 	string path = 6440;
-	optional string application_id = 18513;
-	repeated HttpEndpoint http_endpoints  = 16073;
+	optional string application_id = 18018;
+	repeated HttpEndpoint http_endpoints  = 8156;
 }
 
 // HttpRequestHandlerOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1859,7 +1859,7 @@ message HttpServer {
 	option (resource_type_names) = "Framework";
 	option (resource_type_names) = "Core";
 
-	HttpRequestHandler http_request_handler = 7885;
+	HttpRequestHandler http_request_handler = 16943;
 }
 
 // HumanResources is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1883,11 +1883,11 @@ message HybridCipher {
 	string cipher_name = 4930;
 	// Key size refers to the length of a key used in an enryption.
 	int32 key_size = 5462;
-	AsymmetricCipher asymmetric_cipher = 4505;
-	KeyDerivationFunction key_derivation_function = 12920;
-	MessageAuthenticationCode message_authentication_code = 13152;
-	Padding padding = 14710;
-	SymmetricCipher symmetric_cipher = 17047;
+	AsymmetricCipher key_exchange = 10476;
+	KeyDerivationFunction key_derivation_function = 16735;
+	MessageAuthenticationCode message_authentication_code = 14986;
+	Padding padding = 18342;
+	SymmetricCipher symmetric_cipher = 5013;
 }
 
 // Identifiable is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1920,13 +1920,13 @@ message Identity {
 	bool privileged = 2301;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16151;
-	Authenticity authenticity = 6720;
-	Authorization authorization = 14925;
-	GeoLocation geo_location = 9161;
-	repeated Logging loggings  = 2534;
-	repeated Redundancy redundancies  = 15828;
-	optional string parent_id = 5028;
-	UsageStatistics usage_statistics = 4966;
+	Authenticity authenticity = 11686;
+	Authorization authorization = 16314;
+	GeoLocation geo_location = 8606;
+	repeated Logging loggings  = 11698;
+	repeated Redundancy redundancies  = 16086;
+	optional string parent_id = 13088;
+	UsageStatistics usage_statistics = 7855;
 }
 
 // Image is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -1969,10 +1969,10 @@ message InputValidationOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 13110;
-	Input input = 8005;
-	Input input = 8005;
-	Output output = 15115;
+	CodeRegion code_region = 12844;
+	Input linked_concept = 10363;
+	Input input = 18958;
+	Output output = 15204;
 }
 
 // InstallUpdateOperation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -1981,9 +1981,9 @@ message InstallUpdateOperation {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	AutomaticUpdates automatic_updates = 3264;
-	AutomaticUpdates automatic_updates = 3264;
-	CodeRegion code_region = 13615;
+	AutomaticUpdates linked_concept = 8561;
+	AutomaticUpdates automatic_updates = 12530;
+	CodeRegion code_region = 13679;
 }
 
 // Integrity is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2016,8 +2016,8 @@ message IssueJwt {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	Authenticity authenticity = 4754;
-	CodeRegion code_region = 9735;
+	Authenticity linked_concept = 1120;
+	CodeRegion code_region = 9610;
 }
 
 // Job is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2035,11 +2035,11 @@ message Job {
 	string name = 18498 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 5776;
-	GeoLocation geo_location = 2037;
-	repeated Logging loggings  = 7884;
-	repeated Redundancy redundancies  = 12361;
-	optional string parent_id = 15338;
-	UsageStatistics usage_statistics = 11249;
+	GeoLocation geo_location = 9162;
+	repeated Logging loggings  = 13308;
+	repeated Redundancy redundancies  = 10691;
+	optional string parent_id = 161;
+	UsageStatistics usage_statistics = 6673;
 }
 
 // JwtAuthentication is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2057,7 +2057,7 @@ message JwtAuthentication {
 	int32 length = 9933;
 	// rotationInterval is given in days
 	int32 rotation_interval = 3257;
-	optional string token_id = 5623;
+	optional string token_id = 17648;
 }
 
 // TokenBasedAuthentication is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2087,8 +2087,8 @@ message SelectorKey {
 	string name = 14505 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 15639;
-	DataLocation data_location = 14109;
-	optional string parent_id = 14507;
+	DataLocation data_location = 2145;
+	optional string parent_id = 4081;
 }
 
 // KeyDerivationFunction is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2097,7 +2097,7 @@ message KeyDerivationFunction {
 	option (resource_type_names) = "Functionality";
 
 	string type = 3552;
-	Input input = 12916;
+	Input input = 6321;
 }
 
 // KeyValueDatabaseService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2120,20 +2120,20 @@ message KeyValueDatabaseService {
 	repeated uint32 ports = 6710;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 14509;
-	ActivityLogging activity_logging = 1125;
-	repeated AnomalyDetection anomaly_detections  = 18959;
-	Authenticity authenticity = 11723;
-	repeated string compute_ids  = 11235;
-	GeoLocation geo_location = 6514;
-	HttpEndpoint http_endpoint = 15867;
-	repeated Logging loggings  = 5263;
-	MalwareProtection malware_protection = 10213;
-	repeated Redundancy redundancies  = 281;
-	optional string parent_id = 18945;
-	optional string service_metadata_document_id = 3747;
-	repeated string storage_ids  = 14846;
-	TransportEncryption transport_encryption = 5751;
-	UsageStatistics usage_statistics = 4417;
+	ActivityLogging activity_logging = 4083;
+	repeated AnomalyDetection anomaly_detections  = 121;
+	Authenticity authenticity = 4800;
+	repeated string compute_ids  = 13039;
+	GeoLocation geo_location = 13241;
+	HttpEndpoint http_endpoint = 11793;
+	repeated Logging loggings  = 9475;
+	MalwareProtection malware_protection = 16811;
+	repeated Redundancy redundancies  = 6228;
+	optional string parent_id = 10462;
+	optional string service_metadata_document_id = 15280;
+	repeated string storage_ids  = 9275;
+	TransportEncryption transport_encryption = 11007;
+	UsageStatistics usage_statistics = 846;
 }
 
 // KeyVault is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2150,12 +2150,12 @@ message KeyVault {
 	string name = 5705 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16199;
-	repeated string credential_ids  = 17792;
-	GeoLocation geo_location = 413;
-	repeated Logging loggings  = 3020;
-	repeated Redundancy redundancies  = 2540;
-	optional string parent_id = 18361;
-	UsageStatistics usage_statistics = 5303;
+	repeated string credential_ids  = 16714;
+	GeoLocation geo_location = 7862;
+	repeated Logging loggings  = 1262;
+	repeated Redundancy redundancies  = 11552;
+	optional string parent_id = 7075;
+	UsageStatistics usage_statistics = 13634;
 }
 
 // L3Firewall is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2185,12 +2185,12 @@ message Library {
 	string name = 18601 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 9988;
-	repeated string code_module_ids  = 9719;
-	optional string code_repository_id = 295;
-	repeated Functionality functionalities  = 10589;
-	repeated string library_ids  = 9020;
-	optional string parent_id = 2928;
-	repeated Vulnerability vulnerabilities  = 3131;
+	repeated string code_module_ids  = 7635;
+	optional string code_repository_id = 17722;
+	repeated Functionality functionalities  = 16350;
+	repeated string library_ids  = 7387;
+	optional string parent_id = 18076;
+	repeated Vulnerability vulnerabilities  = 17577;
 }
 
 // LibraryEntryPoint is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2201,7 +2201,7 @@ message LibraryEntryPoint {
 	option (resource_type_names) = "EntryPoint";
 	option (resource_type_names) = "Functionality";
 
-	optional string operating_system_architecture_id = 12713;
+	OperatingSystemArchitecture target = 16870;
 }
 
 // LoadBalancer is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2224,18 +2224,18 @@ message LoadBalancer {
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16379;
 	string url = 2355;
-	AccessRestriction access_restriction = 6911;
+	AccessRestriction access_restriction = 11292;
 	Authenticity authenticity = 4102;
-	repeated string compute_ids  = 4301;
-	GeoLocation geo_location = 17490;
-	repeated HttpEndpoint http_endpoints  = 10792;
-	repeated Logging loggings  = 6664;
-	repeated string network_service_ids  = 14537;
-	repeated Redundancy redundancies  = 10689;
-	optional string parent_id = 3822;
-	optional string service_metadata_document_id = 8705;
-	TransportEncryption transport_encryption = 9485;
-	UsageStatistics usage_statistics = 16809;
+	repeated string compute_ids  = 16161;
+	GeoLocation geo_location = 10722;
+	repeated HttpEndpoint http_endpoints  = 10771;
+	repeated Logging loggings  = 2461;
+	repeated string network_service_ids  = 1926;
+	repeated Redundancy redundancies  = 14687;
+	optional string parent_id = 9758;
+	optional string service_metadata_document_id = 13642;
+	TransportEncryption transport_encryption = 14729;
+	UsageStatistics usage_statistics = 4391;
 }
 
 // LoadConfiguration is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2246,8 +2246,8 @@ message LoadConfiguration {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 11941;
-	optional string configuration_id = 6058;
+	CodeRegion code_region = 11396;
+	Configuration linked_concept = 7398;
 }
 
 // LoadLibrary is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2259,10 +2259,10 @@ message LoadLibrary {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 17323;
-	repeated EntryPoint entry_points  = 18798;
-	optional string memory_id = 9217;
-	optional string operating_system_architecture_id = 1681;
+	CodeRegion code_region = 15903;
+	repeated EntryPoint entry_points  = 1641;
+	Memory linked_concept = 18932;
+	optional string operating_system_architecture_id = 4592;
 }
 
 // LoadSymbol is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2274,9 +2274,9 @@ message LoadSymbol {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 11479;
-	optional string memory_id = 10718;
-	optional string operating_system_architecture_id = 7830;
+	CodeRegion code_region = 11982;
+	Memory linked_concept = 2750;
+	optional string operating_system_architecture_id = 13808;
 }
 
 // LocalAttestation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2296,8 +2296,8 @@ message LocalDataLocation {
 	option (resource_type_names) = "Functionality";
 
 	string path = 16659;
-	AtRestEncryption at_rest_encryption = 15797;
-	optional string storage_id = 8744;
+	AtRestEncryption at_rest_encryption = 6913;
+	optional string storage_id = 231;
 }
 
 // LocalEntryPoint is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2317,7 +2317,7 @@ message LocalRedundancy {
 	option (resource_type_names) = "Availability";
 	option (resource_type_names) = "SecurityFeature";
 
-	repeated GeoLocation geo_locations  = 5006;
+	repeated GeoLocation geo_locations  = 11232;
 }
 
 // LogDocument is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2335,12 +2335,12 @@ message LogDocument {
 	string name = 11879 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 546;
-	repeated CryptographicHash cryptographic_hashs  = 10222;
-	DataLocation data_location = 1917;
-	repeated DocumentSignature document_signatures  = 11368;
-	optional string parent_id = 2000;
-	SchemaValidation schema_validation = 11439;
-	repeated SecurityFeature security_features  = 10003;
+	repeated CryptographicHash cryptographic_hashs  = 9077;
+	DataLocation data_location = 12350;
+	repeated DocumentSignature document_signatures  = 8195;
+	optional string parent_id = 4022;
+	SchemaValidation validated_by = 1781;
+	repeated SecurityFeature security_features  = 6558;
 }
 
 // LogGet is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2351,8 +2351,8 @@ message LogGet {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 7848;
-	Logging logging = 4067;
+	CodeRegion code_region = 945;
+	Logging linked_concept = 12274;
 }
 
 // LogOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2373,9 +2373,9 @@ message LogOutput {
 
 	string call = 6341;
 	string value = 16550;
-	CodeRegion code_region = 17073;
-	Logging logging = 6409;
-	Logging logging = 6409;
+	CodeRegion code_region = 3291;
+	Logging linked_concept = 223;
+	Logging logging = 11229;
 }
 
 // LogWrite is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2388,8 +2388,8 @@ message LogWrite {
 
 	// enum:logLevel=FATAL,CRITICAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN
 	string log_level = 11587;
-	CodeRegion code_region = 18065;
-	Logging logging = 16616;
+	CodeRegion code_region = 3510;
+	Logging linked_concept = 10830;
 }
 
 // Logger is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2431,16 +2431,16 @@ message LoggingService {
 	repeated uint32 ports = 2549;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 3703;
-	Authenticity authenticity = 15306;
-	repeated string compute_ids  = 10285;
-	GeoLocation geo_location = 4238;
-	repeated Logging loggings  = 5453;
-	repeated Redundancy redundancies  = 1550;
-	optional string parent_id = 258;
-	optional string service_metadata_document_id = 16013;
-	repeated string storage_ids  = 7044;
-	TransportEncryption transport_encryption = 17323;
-	UsageStatistics usage_statistics = 1203;
+	Authenticity authenticity = 17309;
+	repeated string compute_ids  = 18796;
+	GeoLocation geo_location = 4817;
+	repeated Logging loggings  = 2206;
+	repeated Redundancy redundancies  = 4732;
+	optional string parent_id = 5257;
+	optional string service_metadata_document_id = 10739;
+	repeated string storage_ids  = 11805;
+	TransportEncryption transport_encryption = 10876;
+	UsageStatistics usage_statistics = 12394;
 }
 
 // MachineLearning is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2468,8 +2468,8 @@ message MachineLearningDataset {
 	string raw = 6307;
 	int32 size = 7901;
 	string type = 5204;
-	DataLocation data_location = 3137;
-	optional string parent_id = 6542;
+	DataLocation data_location = 14136;
+	optional string parent_id = 11544;
 }
 
 // MachineLearningModel is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2492,9 +2492,9 @@ message MachineLearningModel {
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 12454;
 	float robustness = 13582;
-	DataLocation data_location = 2998;
-	optional string parent_id = 15494;
-	repeated Vulnerability vulnerabilities  = 10821;
+	DataLocation data_location = 1022;
+	optional string parent_id = 17150;
+	repeated Vulnerability vulnerabilities  = 9542;
 }
 
 // MachineLearningService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2515,17 +2515,17 @@ message MachineLearningService {
 	repeated uint32 ports = 6816;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 5983;
-	Authenticity authenticity = 7702;
-	repeated string compute_ids  = 10831;
-	GeoLocation geo_location = 3308;
-	repeated Logging loggings  = 6059;
-	repeated string machine_learning_ids  = 6901;
-	repeated Redundancy redundancies  = 16726;
-	optional string parent_id = 2223;
-	optional string service_metadata_document_id = 10709;
-	repeated string storage_ids  = 161;
-	TransportEncryption transport_encryption = 17009;
-	UsageStatistics usage_statistics = 5491;
+	Authenticity authenticity = 8549;
+	repeated string compute_ids  = 16877;
+	GeoLocation geo_location = 4584;
+	repeated Logging loggings  = 12431;
+	repeated string machine_learning_ids  = 3782;
+	repeated Redundancy redundancies  = 15904;
+	optional string parent_id = 14660;
+	optional string service_metadata_document_id = 11927;
+	repeated string storage_ids  = 7868;
+	TransportEncryption transport_encryption = 13332;
+	UsageStatistics usage_statistics = 6309;
 }
 
 // Main is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2536,7 +2536,7 @@ message Main {
 	option (resource_type_names) = "EntryPoint";
 	option (resource_type_names) = "Functionality";
 
-	optional string operating_system_architecture_id = 9621;
+	OperatingSystemArchitecture target = 7220;
 }
 
 // MalwareProtection is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2551,7 +2551,7 @@ message MalwareProtection {
 	int32 number_of_threats_found = 11973;
 	// The scan interval refers to the frequency of scans in days, e.g. antimalware scans
 	int32 scan_interval = 3356;
-	ApplicationLogging application_logging = 8181;
+	ApplicationLogging application_logging = 12380;
 }
 
 // ManagedKeyEncryption is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2565,8 +2565,8 @@ message ManagedKeyEncryption {
 	string algorithm = 4822;
 	bool enabled = 13201;
 	string key_url = 16982;
-	Cipher cipher = 8904;
-	optional string secret_id = 8250;
+	Cipher based_on = 9630;
+	optional string secret_id = 13805;
 }
 
 // Memory is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2584,7 +2584,7 @@ message Memory {
 	string name = 13793 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 13754;
-	optional string parent_id = 14419;
+	optional string parent_id = 2283;
 }
 
 // MemoryOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2605,8 +2605,8 @@ message MessageAuthenticationCode {
 	option (resource_type_names) = "Functionality";
 
 	string type = 16668;
-	Input input = 5283;
-	optional string selector_key_id = 14650;
+	Input input = 14423;
+	optional string selector_key_id = 15532;
 }
 
 // MessagingHub is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2624,11 +2624,11 @@ message MessagingHub {
 	string name = 4131 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 6465;
-	GeoLocation geo_location = 10702;
-	repeated Logging loggings  = 868;
-	repeated Redundancy redundancies  = 18734;
-	optional string parent_id = 2352;
-	UsageStatistics usage_statistics = 13729;
+	GeoLocation geo_location = 392;
+	repeated Logging loggings  = 13600;
+	repeated Redundancy redundancies  = 771;
+	optional string parent_id = 5514;
+	UsageStatistics usage_statistics = 8646;
 }
 
 // CodeModule is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2651,7 +2651,7 @@ message MultiFactorAuthentiation {
 	int32 length = 2084;
 	// rotationInterval is given in days
 	int32 rotation_interval = 11722;
-	repeated Authenticity authenticities  = 14915;
+	repeated Authenticity authenticities  = 14430;
 }
 
 // MultiModalDatabaseService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2675,20 +2675,20 @@ message MultiModalDatabaseService {
 	repeated uint32 ports = 5;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 17449;
-	ActivityLogging activity_logging = 6692;
-	repeated AnomalyDetection anomaly_detections  = 7208;
-	Authenticity authenticity = 12713;
-	repeated string compute_ids  = 18111;
-	GeoLocation geo_location = 4221;
-	HttpEndpoint http_endpoint = 8906;
-	repeated Logging loggings  = 15824;
-	MalwareProtection malware_protection = 13719;
-	repeated Redundancy redundancies  = 9020;
-	optional string parent_id = 4408;
-	optional string service_metadata_document_id = 13625;
-	repeated string storage_ids  = 7826;
-	TransportEncryption transport_encryption = 3867;
-	UsageStatistics usage_statistics = 10570;
+	ActivityLogging activity_logging = 9310;
+	repeated AnomalyDetection anomaly_detections  = 9066;
+	Authenticity authenticity = 16292;
+	repeated string compute_ids  = 913;
+	GeoLocation geo_location = 17721;
+	HttpEndpoint http_endpoint = 6447;
+	repeated Logging loggings  = 1820;
+	MalwareProtection malware_protection = 13913;
+	repeated Redundancy redundancies  = 3250;
+	optional string parent_id = 1553;
+	optional string service_metadata_document_id = 134;
+	repeated string storage_ids  = 10582;
+	TransportEncryption transport_encryption = 7542;
+	UsageStatistics usage_statistics = 1641;
 }
 
 // NetworkInterface is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2706,13 +2706,13 @@ message NetworkInterface {
 	string name = 12404 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 5176;
-	AccessRestriction access_restriction = 15102;
-	GeoLocation geo_location = 8368;
-	repeated Logging loggings  = 4440;
-	optional string network_service_id = 16990;
-	repeated Redundancy redundancies  = 13764;
-	optional string parent_id = 11276;
-	UsageStatistics usage_statistics = 3807;
+	AccessRestriction access_restriction = 17872;
+	GeoLocation geo_location = 10038;
+	repeated Logging loggings  = 8003;
+	optional string network_service_id = 14403;
+	repeated Redundancy redundancies  = 3740;
+	optional string parent_id = 8306;
+	UsageStatistics usage_statistics = 11090;
 }
 
 // NetworkSecurityGroup is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2730,11 +2730,11 @@ message NetworkSecurityGroup {
 	string name = 11440 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 11170;
-	GeoLocation geo_location = 6795;
-	repeated Logging loggings  = 7800;
-	repeated Redundancy redundancies  = 13648;
-	optional string parent_id = 14499;
-	UsageStatistics usage_statistics = 6140;
+	GeoLocation geo_location = 11423;
+	repeated Logging loggings  = 393;
+	repeated Redundancy redundancies  = 14376;
+	optional string parent_id = 15293;
+	UsageStatistics usage_statistics = 9388;
 }
 
 // NetworkService is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2806,7 +2806,7 @@ message OSLogging {
 	string name = 1176 [ (buf.validate.field).required = true ];
 	google.protobuf.Duration retention_period = 11358;
 	bool security_alerts_enabled = 7453;
-	repeated string logging_service_ids  = 10850;
+	repeated string logging_service_ids  = 14966;
 }
 
 // OTPBasedAuthentication is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2839,16 +2839,16 @@ message ObjectStorage {
 	bool public_access = 4621;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 6632;
-	ActivityLogging activity_logging = 9147;
-	AtRestEncryption at_rest_encryption = 2034;
-	repeated Backup backups  = 10118;
-	GeoLocation geo_location = 8835;
-	Immutability immutability = 13608;
-	repeated Logging loggings  = 4403;
-	repeated Redundancy redundancies  = 3309;
-	optional string parent_id = 1663;
-	ResourceLogging resource_logging = 3619;
-	UsageStatistics usage_statistics = 8818;
+	ActivityLogging activity_logging = 11889;
+	AtRestEncryption at_rest_encryption = 6489;
+	repeated Backup backups  = 4514;
+	GeoLocation geo_location = 8943;
+	Immutability immutability = 4592;
+	repeated Logging loggings  = 11121;
+	repeated Redundancy redundancies  = 13679;
+	optional string parent_id = 16072;
+	ResourceLogging resource_logging = 5368;
+	UsageStatistics usage_statistics = 14545;
 }
 
 // ObjectStorageRequest is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2858,9 +2858,9 @@ message ObjectStorageRequest {
 	option (resource_type_names) = "Functionality";
 
 	string source = 178;
-	CodeRegion code_region = 18257;
-	repeated string object_storage_ids  = 2364;
-	optional string storage_id = 17087;
+	CodeRegion code_region = 11189;
+	repeated string object_storage_ids  = 17017;
+	Storage linked_concept = 6333;
 }
 
 // ObjectStorageService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -2883,18 +2883,18 @@ message ObjectStorageService {
 	repeated uint32 ports = 8166;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16651;
-	ActivityLogging activity_logging = 6581;
-	Authenticity authenticity = 6852;
-	repeated string compute_ids  = 4562;
-	GeoLocation geo_location = 18831;
-	HttpEndpoint http_endpoint = 6388;
-	repeated Logging loggings  = 18299;
-	repeated Redundancy redundancies  = 11741;
-	optional string parent_id = 1174;
-	optional string service_metadata_document_id = 9311;
-	repeated string storage_ids  = 8237;
-	TransportEncryption transport_encryption = 7390;
-	UsageStatistics usage_statistics = 14005;
+	ActivityLogging activity_logging = 16914;
+	Authenticity authenticity = 8513;
+	repeated string compute_ids  = 15695;
+	GeoLocation geo_location = 9923;
+	HttpEndpoint http_endpoint = 11411;
+	repeated Logging loggings  = 12719;
+	repeated Redundancy redundancies  = 18648;
+	optional string parent_id = 11624;
+	optional string service_metadata_document_id = 1823;
+	repeated string storage_ids  = 11503;
+	TransportEncryption transport_encryption = 1565;
+	UsageStatistics usage_statistics = 8426;
 }
 
 // OperatingSystemArchitecture is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -2980,10 +2980,10 @@ message POSIX {
 	string name = 18076 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 6560;
-	repeated string code_module_ids  = 1571;
-	optional string code_repository_id = 11937;
-	repeated Functionality functionalities  = 13007;
-	optional string parent_id = 15779;
+	repeated string code_module_ids  = 5732;
+	optional string code_repository_id = 13099;
+	repeated Functionality functionalities  = 2402;
+	optional string parent_id = 15543;
 }
 
 // Package is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3001,10 +3001,10 @@ message Package {
 	string name = 11479 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 603;
-	repeated string code_module_ids  = 6367;
-	optional string code_repository_id = 18580;
-	repeated Functionality functionalities  = 5551;
-	optional string parent_id = 5664;
+	repeated string code_module_ids  = 16160;
+	optional string code_repository_id = 17202;
+	repeated Functionality functionalities  = 8054;
+	optional string parent_id = 18906;
 }
 
 // Padding is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3045,11 +3045,11 @@ message PasswordPolicy {
 	string name = 8966 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10264;
-	GeoLocation geo_location = 4406;
-	repeated Logging loggings  = 8348;
-	repeated Redundancy redundancies  = 3325;
-	optional string parent_id = 2509;
-	UsageStatistics usage_statistics = 14852;
+	GeoLocation geo_location = 8344;
+	repeated Logging loggings  = 6081;
+	repeated Redundancy redundancies  = 4959;
+	optional string parent_id = 12653;
+	UsageStatistics usage_statistics = 863;
 }
 
 // Policy is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3066,10 +3066,10 @@ message Policy {
 	string name = 16222 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16476;
-	optional string context_id = 17891;
-	DataLocation data_location = 2568;
-	repeated string policy_rule_ids  = 17106;
-	optional string parent_id = 14277;
+	optional string context_id = 13815;
+	DataLocation data_location = 2625;
+	repeated string policy_rule_ids  = 6893;
+	optional string parent_id = 18610;
 }
 
 // PolicyDocument is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3087,12 +3087,12 @@ message PolicyDocument {
 	string name = 2052 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 5038;
-	repeated CryptographicHash cryptographic_hashs  = 16546;
-	DataLocation data_location = 8404;
-	repeated DocumentSignature document_signatures  = 11914;
-	optional string parent_id = 9358;
-	SchemaValidation schema_validation = 15790;
-	repeated SecurityFeature security_features  = 15024;
+	repeated CryptographicHash cryptographic_hashs  = 12896;
+	DataLocation data_location = 11474;
+	repeated DocumentSignature document_signatures  = 7191;
+	optional string parent_id = 18208;
+	SchemaValidation validated_by = 5620;
+	repeated SecurityFeature security_features  = 13896;
 }
 
 // PolicyOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3127,8 +3127,8 @@ message ProtectedAsset {
 	option (resource_type_names) = "ProtectedAsset";
 	option (resource_type_names) = "Functionality";
 
-	repeated string policy_ids  = 2613;
-	Resource resource = 2677;
+	repeated string policy_ids  = 13769;
+	Resource protects = 16075;
 }
 
 // ProtectedAssetOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3148,10 +3148,10 @@ message ProvideConfiguration {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 799;
-	optional string configuration_id = 10524;
-	optional string configuration_id = 10524;
-	optional string configuration_source_id = 16567;
+	CodeRegion code_region = 6654;
+	optional string configuration_id = 18326;
+	Configuration linked_concept = 17205;
+	optional string configuration_source_id = 11294;
 }
 
 // ProvideConfigurationGroup is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3161,10 +3161,10 @@ message ProvideConfigurationGroup {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 9873;
-	optional string configuration_id = 7861;
-	optional string configuration_group_id = 4068;
-	optional string configuration_group_source_id = 6770;
+	CodeRegion code_region = 1380;
+	Configuration linked_concept = 7577;
+	optional string configuration_group_id = 14075;
+	optional string configuration_group_source_id = 11513;
 }
 
 // ProvideConfigurationOption is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3175,10 +3175,10 @@ message ProvideConfigurationOption {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 796;
-	optional string configuration_id = 10462;
-	optional string configuration_option_id = 7684;
-	optional string configuration_option_source_id = 3385;
+	CodeRegion code_region = 7186;
+	Configuration linked_concept = 357;
+	optional string configuration_option_id = 10671;
+	optional string configuration_option_source_id = 15601;
 }
 
 // QPU is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3200,15 +3200,15 @@ message QPU {
 	string name = 1538 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 8462;
-	EncryptionInUse encryption_in_use = 17838;
-	GeoLocation geo_location = 16558;
-	repeated Logging loggings  = 972;
-	repeated string network_interface_ids  = 4162;
-	repeated Redundancy redundancies  = 10637;
-	RemoteAttestation remote_attestation = 18317;
-	optional string parent_id = 11595;
-	ResourceLogging resource_logging = 14960;
-	UsageStatistics usage_statistics = 11987;
+	EncryptionInUse encryption_in_use = 7289;
+	GeoLocation geo_location = 16264;
+	repeated Logging loggings  = 14768;
+	repeated string network_interface_ids  = 2623;
+	repeated Redundancy redundancies  = 12185;
+	RemoteAttestation remote_attestation = 1044;
+	optional string parent_id = 3322;
+	ResourceLogging resource_logging = 5756;
+	UsageStatistics usage_statistics = 9392;
 }
 
 // RBAC is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3240,9 +3240,9 @@ message ReadConfigurationGroup {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 1119;
-	optional string configuration_id = 4413;
-	optional string configuration_group_id = 4865;
+	CodeRegion code_region = 14967;
+	Configuration linked_concept = 16433;
+	optional string configuration_group_id = 9364;
 }
 
 // ReadConfigurationOption is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3253,9 +3253,9 @@ message ReadConfigurationOption {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 15925;
-	optional string configuration_id = 14881;
-	optional string configuration_option_id = 17624;
+	CodeRegion code_region = 15892;
+	Configuration linked_concept = 7666;
+	optional string configuration_option_id = 17432;
 }
 
 // Redundancy is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3276,9 +3276,9 @@ message RegisterConfigurationGroup {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 427;
-	optional string configuration_id = 16293;
-	optional string configuration_group_id = 14205;
+	CodeRegion code_region = 15411;
+	Configuration linked_concept = 17451;
+	optional string configuration_group_id = 15672;
 }
 
 // RegisterConfigurationOption is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3289,9 +3289,9 @@ message RegisterConfigurationOption {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 14831;
-	optional string configuration_id = 4379;
-	optional string configuration_option_id = 12713;
+	CodeRegion code_region = 11406;
+	Configuration linked_concept = 7876;
+	optional string configuration_option_id = 12873;
 }
 
 // RegisterHttpEndpoint is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3301,9 +3301,9 @@ message RegisterHttpEndpoint {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 7911;
-	HttpEndpoint http_endpoint = 4100;
-	HttpRequestHandler http_request_handler = 17072;
+	CodeRegion code_region = 18646;
+	HttpEndpoint http_endpoint = 14831;
+	HttpRequestHandler linked_concept = 4007;
 }
 
 // RelationalDatabaseService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3326,20 +3326,20 @@ message RelationalDatabaseService {
 	repeated uint32 ports = 285;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 308;
-	ActivityLogging activity_logging = 7809;
-	repeated AnomalyDetection anomaly_detections  = 13020;
-	Authenticity authenticity = 6;
-	repeated string compute_ids  = 18729;
-	GeoLocation geo_location = 2744;
-	HttpEndpoint http_endpoint = 5892;
-	repeated Logging loggings  = 8431;
-	MalwareProtection malware_protection = 12233;
-	repeated Redundancy redundancies  = 15094;
-	optional string parent_id = 4594;
-	optional string service_metadata_document_id = 8061;
-	repeated string storage_ids  = 4243;
-	TransportEncryption transport_encryption = 11409;
-	UsageStatistics usage_statistics = 9703;
+	ActivityLogging activity_logging = 17935;
+	repeated AnomalyDetection anomaly_detections  = 18542;
+	Authenticity authenticity = 8756;
+	repeated string compute_ids  = 5357;
+	GeoLocation geo_location = 13809;
+	HttpEndpoint http_endpoint = 3492;
+	repeated Logging loggings  = 14640;
+	MalwareProtection malware_protection = 15407;
+	repeated Redundancy redundancies  = 18313;
+	optional string parent_id = 1800;
+	optional string service_metadata_document_id = 8269;
+	repeated string storage_ids  = 14683;
+	TransportEncryption transport_encryption = 6793;
+	UsageStatistics usage_statistics = 7216;
 }
 
 // Reliability is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3370,9 +3370,9 @@ message RemoteDataLocation {
 	option (resource_type_names) = "Functionality";
 
 	string path = 5099;
-	Authenticity authenticity = 2095;
-	optional string storage_id = 15169;
-	TransportEncryption transport_encryption = 3553;
+	Authenticity authenticity = 1719;
+	optional string storage_id = 9156;
+	TransportEncryption transport_encryption = 1008;
 }
 
 // RemoteEntryPoint is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3400,12 +3400,12 @@ message ReportDocument {
 	string name = 14944 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 2605;
-	repeated CryptographicHash cryptographic_hashs  = 15079;
-	DataLocation data_location = 9894;
-	repeated DocumentSignature document_signatures  = 13518;
-	optional string parent_id = 13110;
-	SchemaValidation schema_validation = 4176;
-	repeated SecurityFeature security_features  = 16731;
+	repeated CryptographicHash cryptographic_hashs  = 17448;
+	DataLocation data_location = 18583;
+	repeated DocumentSignature document_signatures  = 367;
+	optional string parent_id = 16048;
+	SchemaValidation validated_by = 9750;
+	repeated SecurityFeature security_features  = 10419;
 }
 
 // Resource is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3504,11 +3504,11 @@ message ResourceGroup {
 	string name = 18950 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16903;
-	GeoLocation geo_location = 773;
-	repeated Logging loggings  = 16181;
-	repeated Redundancy redundancies  = 1522;
-	optional string parent_id = 14157;
-	UsageStatistics usage_statistics = 2564;
+	GeoLocation geo_location = 10139;
+	repeated Logging loggings  = 17486;
+	repeated Redundancy redundancies  = 11277;
+	optional string parent_id = 9625;
+	UsageStatistics usage_statistics = 16846;
 }
 
 // ResourceLogging is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3523,7 +3523,7 @@ message ResourceLogging {
 	string name = 2313 [ (buf.validate.field).required = true ];
 	google.protobuf.Duration retention_period = 6776;
 	bool security_alerts_enabled = 6099;
-	repeated string logging_service_ids  = 15310;
+	repeated string logging_service_ids  = 3295;
 }
 
 // ResourceType is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3557,13 +3557,13 @@ message RoleAssignment {
 	string name = 2963 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10862;
-	Authenticity authenticity = 11180;
-	Authorization authorization = 13796;
-	GeoLocation geo_location = 12302;
-	repeated Logging loggings  = 17437;
-	repeated Redundancy redundancies  = 13392;
-	optional string parent_id = 2313;
-	UsageStatistics usage_statistics = 2808;
+	Authenticity authenticity = 13687;
+	Authorization authorization = 18501;
+	GeoLocation geo_location = 10092;
+	repeated Logging loggings  = 18727;
+	repeated Redundancy redundancies  = 18916;
+	optional string parent_id = 8394;
+	UsageStatistics usage_statistics = 18400;
 }
 
 // SchemaValidation is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3573,7 +3573,7 @@ message SchemaValidation {
 
 	string format = 1670;
 	string schema_url = 13358;
-	repeated Error errors  = 8879;
+	repeated Error errors  = 16452;
 }
 
 // Secret is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3597,13 +3597,13 @@ message Secret {
 	google.protobuf.Timestamp not_before_date = 13335;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 5998;
-	Cipher cipher = 10203;
-	GeoLocation geo_location = 2663;
-	optional string infrastructure_id = 962;
-	repeated Logging loggings  = 12955;
-	repeated Redundancy redundancies  = 14309;
-	optional string parent_id = 13447;
-	UsageStatistics usage_statistics = 10517;
+	Cipher based_on = 7866;
+	GeoLocation geo_location = 4152;
+	Infrastructure used_by_multiple = 3559;
+	repeated Logging loggings  = 16085;
+	repeated Redundancy redundancies  = 14119;
+	optional string parent_id = 13608;
+	UsageStatistics usage_statistics = 5354;
 }
 
 // SecretOperation is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3630,13 +3630,13 @@ message SecurityAdvisoryDocument {
 	string name = 15161 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 3544;
-	repeated CryptographicHash cryptographic_hashs  = 1381;
-	DataLocation data_location = 11892;
-	repeated DocumentSignature document_signatures  = 16307;
-	optional string parent_id = 263;
-	SchemaValidation schema_validation = 18581;
-	repeated SecurityFeature security_features  = 2423;
-	repeated Vulnerability vulnerabilities  = 4395;
+	repeated CryptographicHash cryptographic_hashs  = 4824;
+	DataLocation data_location = 12507;
+	repeated DocumentSignature document_signatures  = 16888;
+	optional string parent_id = 4792;
+	SchemaValidation validated_by = 10910;
+	repeated SecurityFeature security_features  = 1557;
+	repeated Vulnerability vulnerabilities  = 16368;
 }
 
 // SecurityAdvisoryFeed is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3644,7 +3644,7 @@ message SecurityAdvisoryFeed {
 	option (resource_type_names) = "SecurityAdvisoryFeed";
 	option (resource_type_names) = "Functionality";
 
-	repeated string security_advisory_document_ids  = 1213;
+	repeated string security_advisory_document_ids  = 16571;
 }
 
 // SecurityAdvisoryService is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3666,17 +3666,17 @@ message SecurityAdvisoryService {
 	repeated uint32 ports = 4555;
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 10467;
-	Authenticity authenticity = 13452;
-	repeated string compute_ids  = 7662;
-	GeoLocation geo_location = 16008;
-	repeated Logging loggings  = 2782;
-	repeated Redundancy redundancies  = 18001;
-	optional string parent_id = 592;
-	repeated SecurityAdvisoryFeed security_advisory_feeds  = 12072;
-	repeated string selector_key_ids  = 11418;
-	optional string service_metadata_document_id = 9438;
-	TransportEncryption transport_encryption = 11117;
-	UsageStatistics usage_statistics = 3613;
+	Authenticity authenticity = 16717;
+	repeated string compute_ids  = 18065;
+	GeoLocation geo_location = 11088;
+	repeated Logging loggings  = 28;
+	repeated Redundancy redundancies  = 14683;
+	optional string parent_id = 11251;
+	repeated SecurityAdvisoryFeed security_advisory_feeds  = 4972;
+	repeated string selector_key_ids  = 5451;
+	optional string service_metadata_document_id = 3851;
+	TransportEncryption transport_encryption = 17775;
+	UsageStatistics usage_statistics = 14285;
 }
 
 // SecurityFeature is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3740,7 +3740,7 @@ message SecurityTraining {
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 8671;
 	bool successfully_completed_percentage = 12251;
-	optional string parent_id = 13946;
+	optional string parent_id = 10370;
 }
 
 // ServiceMetadataDocument is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3758,12 +3758,12 @@ message ServiceMetadataDocument {
 	string name = 10912 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 8064;
-	repeated CryptographicHash cryptographic_hashs  = 7970;
-	DataLocation data_location = 16095;
-	repeated DocumentSignature document_signatures  = 14892;
-	optional string parent_id = 13735;
-	SchemaValidation schema_validation = 9192;
-	repeated SecurityFeature security_features  = 17461;
+	repeated CryptographicHash cryptographic_hashs  = 12184;
+	DataLocation data_location = 14106;
+	repeated DocumentSignature document_signatures  = 4448;
+	optional string parent_id = 8317;
+	SchemaValidation validated_by = 5832;
+	repeated SecurityFeature security_features  = 9489;
 }
 
 // DocumentSignature is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3773,7 +3773,7 @@ message DocumentSignature {
 	option (resource_type_names) = "SecurityFeature";
 
 	string algorithm = 4031;
-	repeated Error errors  = 12856;
+	repeated Error errors  = 14433;
 }
 
 // SingleSignOn is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3819,10 +3819,10 @@ message SourceCodeFile {
 	string name = 14615 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16625;
-	repeated string code_module_ids  = 1921;
-	optional string code_repository_id = 4795;
-	repeated Functionality functionalities  = 6180;
-	optional string parent_id = 7227;
+	repeated string code_module_ids  = 14101;
+	optional string code_repository_id = 8294;
+	repeated Functionality functionalities  = 3267;
+	optional string parent_id = 12296;
 }
 
 // Storage is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3867,8 +3867,8 @@ message SymmetricCipher {
 	int32 key_size = 488;
 	// Describes a modus of something being executed. (e.g. used by an Encryption)
 	string modus = 10292;
-	InitializationVector initialization_vector = 562;
-	Padding padding = 6575;
+	InitializationVector initialization_vector = 11325;
+	Padding padding = 2670;
 }
 
 // Time is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3892,8 +3892,8 @@ message Token {
 	string name = 15808 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 16748;
-	DataLocation data_location = 5616;
-	optional string parent_id = 1950;
+	DataLocation data_location = 13703;
+	optional string parent_id = 10701;
 }
 
 // Training is an abstract class in our ontology, it cannot be instantiated but acts as an "interface".
@@ -3917,9 +3917,9 @@ message TransportEncryption {
 	bool enforced = 9699;
 	string protocol = 6987;
 	float protocol_version = 11009;
-	Cipher cipher = 7770;
-	repeated CipherSuite cipher_suites  = 3447;
-	optional string secret_id = 11526;
+	Cipher based_on = 17349;
+	repeated CipherSuite cipher_suites  = 5672;
+	optional string secret_id = 9451;
 }
 
 // UnlockEncryptedDisk is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3929,8 +3929,8 @@ message UnlockEncryptedDisk {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	CodeRegion code_region = 7655;
-	DiskEncryption disk_encryption = 2628;
+	CodeRegion code_region = 13452;
+	DiskEncryption linked_concept = 5833;
 }
 
 // UsageStatistics is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3957,12 +3957,12 @@ message VMImage {
 	string name = 6244 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 3459;
-	optional string application_id = 15711;
-	GeoLocation geo_location = 4609;
-	repeated Logging loggings  = 5411;
-	repeated Redundancy redundancies  = 18349;
-	optional string parent_id = 13735;
-	UsageStatistics usage_statistics = 2369;
+	optional string application_id = 5181;
+	GeoLocation geo_location = 18401;
+	repeated Logging loggings  = 14669;
+	repeated Redundancy redundancies  = 1511;
+	optional string parent_id = 6454;
+	UsageStatistics usage_statistics = 3468;
 }
 
 // ValidateJwt is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3973,8 +3973,8 @@ message ValidateJwt {
 	option (resource_type_names) = "Operation";
 	option (resource_type_names) = "Functionality";
 
-	Authenticity authenticity = 1528;
-	CodeRegion code_region = 16635;
+	Authenticity linked_concept = 1721;
+	CodeRegion code_region = 15087;
 }
 
 // Value is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -3991,8 +3991,8 @@ message Value {
 	string name = 3876 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 7659;
-	DataLocation data_location = 3934;
-	optional string parent_id = 7761;
+	DataLocation data_location = 18490;
+	optional string parent_id = 18063;
 }
 
 // VirtualMachine is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -4010,21 +4010,21 @@ message VirtualMachine {
 	string name = 11617 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 14073;
-	ActivityLogging activity_logging = 8134;
-	AutomaticUpdates automatic_updates = 7114;
-	repeated string block_storage_ids  = 2182;
-	BootLogging boot_logging = 15845;
-	EncryptionInUse encryption_in_use = 10596;
-	GeoLocation geo_location = 7308;
-	repeated Logging loggings  = 15031;
-	MalwareProtection malware_protection = 16535;
-	repeated string network_interface_ids  = 741;
-	OSLogging os_logging = 8084;
-	repeated Redundancy redundancies  = 14823;
-	RemoteAttestation remote_attestation = 17180;
-	optional string parent_id = 10949;
-	ResourceLogging resource_logging = 15452;
-	UsageStatistics usage_statistics = 14541;
+	ActivityLogging activity_logging = 9858;
+	AutomaticUpdates automatic_updates = 14565;
+	repeated string block_storage_ids  = 17882;
+	BootLogging boot_logging = 10025;
+	EncryptionInUse encryption_in_use = 1520;
+	GeoLocation geo_location = 14863;
+	repeated Logging loggings  = 1737;
+	MalwareProtection malware_protection = 14626;
+	repeated string network_interface_ids  = 7192;
+	OSLogging os_logging = 14542;
+	repeated Redundancy redundancies  = 3591;
+	RemoteAttestation remote_attestation = 8401;
+	optional string parent_id = 86;
+	ResourceLogging resource_logging = 15838;
+	UsageStatistics usage_statistics = 3827;
 }
 
 // VirtualNetwork is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -4042,11 +4042,11 @@ message VirtualNetwork {
 	string name = 818 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 14216;
-	GeoLocation geo_location = 7268;
-	repeated Logging loggings  = 9870;
-	repeated Redundancy redundancies  = 3591;
-	optional string parent_id = 2814;
-	UsageStatistics usage_statistics = 7205;
+	GeoLocation geo_location = 3004;
+	repeated Logging loggings  = 18851;
+	repeated Redundancy redundancies  = 9275;
+	optional string parent_id = 7611;
+	UsageStatistics usage_statistics = 2221;
 }
 
 // VirtualSubNetwork is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -4064,11 +4064,11 @@ message VirtualSubNetwork {
 	string name = 1563 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 15165;
-	GeoLocation geo_location = 18482;
-	repeated Logging loggings  = 5093;
-	repeated Redundancy redundancies  = 14386;
-	optional string parent_id = 12551;
-	UsageStatistics usage_statistics = 6155;
+	GeoLocation geo_location = 518;
+	repeated Logging loggings  = 9326;
+	repeated Redundancy redundancies  = 16897;
+	optional string parent_id = 15829;
+	UsageStatistics usage_statistics = 13627;
 }
 
 // Vulnerability is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -4114,10 +4114,10 @@ message Win32 {
 	string name = 8220 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 17302;
-	repeated string code_module_ids  = 3880;
-	optional string code_repository_id = 11175;
-	repeated Functionality functionalities  = 13561;
-	optional string parent_id = 10856;
+	repeated string code_module_ids  = 822;
+	optional string code_repository_id = 16090;
+	repeated Functionality functionalities  = 18689;
+	optional string parent_id = 10020;
 }
 
 // Workflow is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -4135,11 +4135,11 @@ message Workflow {
 	string name = 12414 [ (buf.validate.field).required = true ];
 	// The raw field contains the raw information that is used to fill in the fields of the ontology.
 	string raw = 9416;
-	GeoLocation geo_location = 14478;
-	repeated Logging loggings  = 15895;
-	repeated Redundancy redundancies  = 15255;
-	optional string parent_id = 3002;
-	UsageStatistics usage_statistics = 15450;
+	GeoLocation geo_location = 18272;
+	repeated Logging loggings  = 4437;
+	repeated Redundancy redundancies  = 7788;
+	optional string parent_id = 14352;
+	UsageStatistics usage_statistics = 6102;
 }
 
 // ZoneRedundancy is an entity class in our ontology. It can be instantiated and contains all of its properties as well of its implemented interfaces.
@@ -4149,5 +4149,5 @@ message ZoneRedundancy {
 	option (resource_type_names) = "Availability";
 	option (resource_type_names) = "SecurityFeature";
 
-	repeated GeoLocation geo_locations  = 11767;
+	repeated GeoLocation geo_locations  = 955;
 }