diff --git a/ql/lib/codeql/bicep/frameworks/Microsoft/AKS.qll b/ql/lib/codeql/bicep/frameworks/Microsoft/AKS.qll
index 9c66fdf..0473ccd 100644
--- a/ql/lib/codeql/bicep/frameworks/Microsoft/AKS.qll
+++ b/ql/lib/codeql/bicep/frameworks/Microsoft/AKS.qll
@@ -34,11 +34,6 @@ module AKS {
      */
     Expr getExtendedLocation() { result = this.getProperty("extendedLocation") }
 
-    /**
-     * Returns the kind property.
-     */
-    StringLiteral getKind() { result = this.getProperty("kind") }
-
     /**
      * Returns the kubernetesVersion property.
      */
diff --git a/ql/lib/codeql/bicep/frameworks/Microsoft/Containers.qll b/ql/lib/codeql/bicep/frameworks/Microsoft/Containers.qll
index 8fea5b4..20a275d 100644
--- a/ql/lib/codeql/bicep/frameworks/Microsoft/Containers.qll
+++ b/ql/lib/codeql/bicep/frameworks/Microsoft/Containers.qll
@@ -21,11 +21,6 @@ module Containers {
      */
     Expr getIdentity() { result = this.getProperty("identity") }
 
-    /**
-     * Returns the kind property.
-     */
-    StringLiteral getKind() { result = this.getProperty("kind") }
-
     /**
      * Returns the managedBy property.
      */
diff --git a/ql/lib/codeql/bicep/frameworks/Microsoft/General.qll b/ql/lib/codeql/bicep/frameworks/Microsoft/General.qll
index 1bbc080..6a84e32 100644
--- a/ql/lib/codeql/bicep/frameworks/Microsoft/General.qll
+++ b/ql/lib/codeql/bicep/frameworks/Microsoft/General.qll
@@ -22,6 +22,16 @@ abstract class AzureResource extends Resource {
    */
   string resourceLocation() { result = this.getProperty("location").(StringLiteral).getValue() }
 
+  /**
+   * Get the kind of the resource as a StringLiteral.
+   */
+  StringLiteral getKind() { result = this.getProperty("kind") }
+
+  /**
+   * Gets the kind of the resource as a string value.
+   */
+  string kind() { result = this.getKind().getValue() }
+
   /**
    * Gets the SKU object for the resource.
    * @return The SKU object representing the resource's SKU.
diff --git a/ql/lib/codeql/bicep/frameworks/Microsoft/Storage.qll b/ql/lib/codeql/bicep/frameworks/Microsoft/Storage.qll
index 783b35e..d7e13ad 100644
--- a/ql/lib/codeql/bicep/frameworks/Microsoft/Storage.qll
+++ b/ql/lib/codeql/bicep/frameworks/Microsoft/Storage.qll
@@ -19,11 +19,6 @@ module Storage {
      */
     StorageAccountProperies::Properties getProperties() { result = this.getProperty("properties") }
 
-    /**
-     * Gets the kind of the storage account (e.g., StorageV2, BlobStorage).
-     */
-    StringLiteral getKind() { result = this.getProperty("kind") }
-
     DiskEncryption::EncryptionSettings getEncryptionSettings() {
       result = this.getProperties().getProperty("encryption")
     }