diff --git a/src/lib/yang/ietf-alarms.yang b/src/lib/yang/ietf-alarms.yang
index d58ebff3f8..5217b28c39 100644
--- a/src/lib/yang/ietf-alarms.yang
+++ b/src/lib/yang/ietf-alarms.yang
@@ -152,11 +152,14 @@ module ietf-alarms {
 
     typedef resource {
         type union {
+            type string;
+            /*
+             * Comment use of instance-identifier as it's not currently supported.
             type instance-identifier {
                 require-instance false;
             }
+            */
             type yang:object-identifier;
-            type string;
         }
         description
             "This is an identification of the alarming resource, such as an
@@ -372,6 +375,9 @@ module ietf-alarms {
                 3GPP Distinguished names for example.";
         }
 
+
+        /*
+         * XXX: Temporarily replace leafref datatype for string as leafref is not supported.
         list related-alarm {
             key "resource alarm-type-id alarm-type-qualifier";
 
@@ -409,6 +415,31 @@ module ietf-alarms {
                     "The alarm qualifier for the related alarm.";
             }
         }
+        */
+        list related-alarm {
+            key "resource alarm-type-id alarm-type-qualifier";
+
+            description
+                "References to related alarms.  Note that the related alarm
+                might have been removed from the alarm list.";
+
+            leaf resource {
+                type string;
+                description
+                    "The alarming resource for the related alarm.";
+            }
+            leaf alarm-type-id {
+                type string;
+                description
+                    "The alarm type identifier for the related alarm.";
+            }
+            leaf alarm-type-qualifier {
+                type string;
+                description
+                    "The alarm qualifier for the related alarm.";
+            }
+        }
+
         leaf-list impacted-resource {
             type resource;
             description
@@ -959,6 +990,8 @@ module ietf-alarms {
             alarms.  Conditions in the input are logically ANDed.  If no
             input condition is given, all alarms are compressed.";
         input {
+            /*
+             * XXX: Temporarily replace leafref datatype for string as leafref is not supported.
             leaf resource {
                 type leafref {
                     path "/alarms/alarm-list/alarm/resource";
@@ -981,6 +1014,22 @@ module ietf-alarms {
                 description
                     "Compress the alarms with this alarm-type-qualifier.";
             }
+            */
+            leaf resource {
+                type string;
+                description
+                    "Compress the alarms with this resource.";
+            }
+            leaf alarm-type-id {
+                type string;
+                description
+                    "Compress alarms with this alarm-type-id.";
+            }
+            leaf alarm-type-qualifier {
+                type string;
+                description
+                    "Compress the alarms with this alarm-type-qualifier.";
+            }
         }
         output {
             leaf compressed-alarms {
@@ -1148,6 +1197,8 @@ module ietf-alarms {
             "This notification is used to report that an operator
             acted upon an alarm.";
 
+        /*
+         * XXX: Temporarily replace leafref datatype for string as leafref is not supported.
         leaf resource {
             type leafref {
                 path "/alarms/alarm-list/alarm/resource";
@@ -1177,6 +1228,22 @@ module ietf-alarms {
             description
                 "The alarm qualifier for the alarm.";
         }
+        */
+        leaf resource {
+            type string;
+            description
+                "The alarming resource.";
+        }
+        leaf alarm-type-id {
+            type string;
+            description
+                "The alarm type identifier for the alarm.";
+        }
+        leaf alarm-type-qualifier {
+            type string;
+            description
+                "The alarm qualifier for the alarm.";
+        }
         uses operator-parameters;
     }
 }