diff --git a/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DcsBasedTapiConnectivityRpc.java b/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DcsBasedTapiConnectivityRpc.java
index a55c16b..a5bed1f 100644
--- a/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DcsBasedTapiConnectivityRpc.java
+++ b/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DcsBasedTapiConnectivityRpc.java
@@ -237,4 +237,16 @@
         return new RpcOutput(RpcOutput.Status.RPC_FAILURE, null);
     }
 
+    /**
+     * Service interface of getConnectionEndPointDetails.
+     *
+     * @param inputVar input of service interface getConnectionEndPointDetails
+     * @return output of service interface getConnectionEndPointDetails
+     */
+    @Override
+    public RpcOutput getConnectionEndPointDetails(RpcInput inputVar) {
+        log.error("Not implemented");
+        return new RpcOutput(RpcOutput.Status.RPC_FAILURE, null);
+
+    }
 }
diff --git a/models/tapi/src/main/yang/tapi-common@2018-10-16.yang b/models/tapi/src/main/yang/tapi-common@2018-10-16.yang
index 0d68ca6..958febf 100644
--- a/models/tapi/src/main/yang/tapi-common@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-common@2018-10-16.yang
@@ -609,6 +609,7 @@
         }
         grouping time-interval {
             list period {
+                key 'unit';
                 min-elements 1;
                 max-elements 5;
                 uses time-period;
@@ -654,6 +655,7 @@
             description "none";
             output {
                 list sip {
+                	key 'uuid';
                     uses service-interface-point;
                     description "none";
                 }
diff --git a/models/tapi/src/main/yang/tapi-connectivity@2018-10-16.yang b/models/tapi/src/main/yang/tapi-connectivity@2018-10-16.yang
index f4c0606..7f01298 100644
--- a/models/tapi/src/main/yang/tapi-connectivity@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-connectivity@2018-10-16.yang
@@ -605,10 +605,6 @@
         rpc get-connection-details {
             description "none";
             input {
-                leaf service-id-or-name {
-                    type string;
-                    description "none";
-                }
                 leaf connection-id-or-name {
                     type string;
                     description "none";
@@ -625,6 +621,7 @@
             description "none";
             output {
                 list service {
+                	key 'uuid';
                     uses connectivity-service;
                     description "none";
                 }
@@ -666,7 +663,7 @@
                     uses tapi-path-computation:topology-constraint;
                     description "none";
                 }
-                list resilience-constraint {
+                container resilience-constraint {
                     uses resilience-constraint;
                     description "none";
                 }
@@ -689,7 +686,8 @@
                     type string;
                     description "none";
                 }
-                container end-point {
+                list end-point {
+                	key 'local-id';
                     uses connectivity-service-end-point;
                     description "none";
                 }
@@ -705,7 +703,7 @@
                     uses tapi-path-computation:topology-constraint;
                     description "none";
                 }
-                list resilience-constraint {
+                container resilience-constraint {
                     uses resilience-constraint;
                     description "none";
                 }
@@ -730,5 +728,32 @@
                 }
             }
         }
+        rpc get-connection-end-point-details {
+            description "none";
+            input {
+                leaf topology-id-or-name {
+                    type string;
+                    description "none";
+                }
+                leaf node-id-or-name {
+                    type string;
+                    description "none";
+                }
+                leaf nep-id-or-name {
+                    type string;
+                    description "none";
+                }
+                leaf cep-id-or-name {
+                    type string;
+                    description "none";
+                }
+            }
+            output {
+                container connection-end-point {
+                    uses connection-end-point;
+                    description "none";
+                }
+            }
+        }
 
 }
diff --git a/models/tapi/src/main/yang/tapi-eth@2018-10-16.yang b/models/tapi/src/main/yang/tapi-eth@2018-10-16.yang
index e4cd3f3..7e5e407 100644
--- a/models/tapi/src/main/yang/tapi-eth@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-eth@2018-10-16.yang
@@ -507,11 +507,13 @@
         }
         grouping traffic-conditioning-pac {
             list prio-config-list {
+                key 'queue-id';
                 config false;
                 uses priority-configuration;
                 description "This attribute indicates the Priority Splitter function for the mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue.";
             }
             list cond-config-list {
+                key 'queue-id';
                 config false;
                 uses traffic-conditioning-configuration;
                 description "This attribute indicates for the conditioner process the conditioning parameters:
@@ -533,11 +535,13 @@
         }
         grouping traffic-shaping-pac {
             list prio-config-list {
+                key 'queue-id';
                 config false;
                 uses priority-configuration;
                 description "This attribute configures the Priority Splitter function for the mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue.";
             }
             list queue-config-list {
+                key 'queue-id';
                 config false;
                 uses queue-configuration;
                 description "This attribute configures the Queue depth and Dropping threshold parameters of the Queue process. The Queue depth sets the maximum size of the queue in bytes. An incoming ETH_CI traffic unit is dropped if there is insufficient space in the queue to hold the whole unit. The Dropping threshold sets the threshold of the queue. If the queue is filled beyond this threshold, incoming ETH_CI traffic units accompanied by the ETH_CI_DE signal set are dropped.";
@@ -1134,6 +1138,7 @@
         }
         grouping eth-link-trace-result-data {
             list result-list {
+                key 'source-address';
                 config false;
                 uses link-trace-result;
                 description "G.8052: This parameter returns the results of the LT process. It contains a list of the result received from the individual LTR frames.
diff --git a/models/tapi/src/main/yang/tapi-notification@2018-10-16.yang b/models/tapi/src/main/yang/tapi-notification@2018-10-16.yang
index b4a5bc7..f79a376 100644
--- a/models/tapi/src/main/yang/tapi-notification@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-notification@2018-10-16.yang
@@ -566,6 +566,7 @@
             description "none";
             output {
                 list subscription-service {
+                	key 'uuid';
                     uses notification-subscription-service;
                     description "none";
                 }
@@ -585,6 +586,7 @@
             }
             output {
                 list notification {
+                	key 'uuid';
                     uses notification;
                     description "none";
                 }
diff --git a/models/tapi/src/main/yang/tapi-oam@2018-10-16.yang b/models/tapi/src/main/yang/tapi-oam@2018-10-16.yang
index baadabf..467779e 100644
--- a/models/tapi/src/main/yang/tapi-oam@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-oam@2018-10-16.yang
@@ -546,6 +546,7 @@
             description "none";
             input {
                 list end-point {
+                	key 'local-id';
                     min-elements 2;
                     uses oam-service-end-point;
                     description "none";
@@ -598,6 +599,7 @@
                     description "none";
                 }
                 list oam-service-end-point {
+                	key 'local-id';
                     min-elements 2;
                     uses oam-service-end-point;
                     description "none";
@@ -641,6 +643,7 @@
             description "none";
             output {
                 list service {
+                	key 'uuid';
                     uses oam-service;
                     description "none";
                 }
@@ -669,6 +672,7 @@
                     description "none";
                 }
                 list end-point {
+                	key 'local-id';
                     uses oam-service-end-point;
                     description "none";
                 }
diff --git a/models/tapi/src/main/yang/tapi-path-computation@2018-10-16.yang b/models/tapi/src/main/yang/tapi-path-computation@2018-10-16.yang
index d85aff5..56982df 100644
--- a/models/tapi/src/main/yang/tapi-path-computation@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-path-computation@2018-10-16.yang
@@ -378,6 +378,7 @@
             description "none";
             input {
                 list sep {
+                	key 'local-id';
                     min-elements 2;
                     max-elements 2;
                     uses path-service-end-point;
diff --git a/models/tapi/src/main/yang/tapi-photonic-media@2018-10-16.yang b/models/tapi/src/main/yang/tapi-photonic-media@2018-10-16.yang
index 3ac2932..9a53635 100644
--- a/models/tapi/src/main/yang/tapi-photonic-media@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-photonic-media@2018-10-16.yang
@@ -129,6 +129,146 @@
         }
         description "none";
     }
+    augment "/tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip" {
+        container otsi-service-interface-point-spec {
+            uses otsi-service-interface-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip" {
+        container otsi-service-interface-point-spec {
+            uses otsi-service-interface-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-topology:get-node-edge-point-details/tapi-topology:output/tapi-topology:node-edge-point" {
+        container media-channel-node-edge-point-spec {
+            uses media-channel-node-edge-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container otsi-connectivity-service-end-point-spec {
+            uses otsi-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container otsi-connectivity-service-end-point-spec {
+            uses otsi-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container media-channel-connectivity-service-end-point-spec {
+            uses media-channel-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container media-channel-connectivity-service-end-point-spec {
+            uses media-channel-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container media-channel-connectivity-service-end-point-spec {
+            uses media-channel-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container media-channel-connectivity-service-end-point-spec {
+            uses media-channel-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+        container otsi-connectivity-service-end-point-spec {
+            uses otsi-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+        container otsi-connectivity-service-end-point-spec {
+            uses otsi-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+        container media-channel-connectivity-service-end-point-spec {
+            uses media-channel-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container otsi-connectivity-service-end-point-spec {
+            uses otsi-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+        container media-channel-connectivity-service-end-point-spec {
+            uses media-channel-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        container otsi-connectivity-service-end-point-spec {
+            uses otsi-connectivity-service-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip" {
+        container media-channel-service-interface-point-spec {
+            uses media-channel-service-interface-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip" {
+        container media-channel-service-interface-point-spec {
+            uses media-channel-service-interface-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connection-end-point-details/tapi-connectivity:output/tapi-connectivity:connection-end-point" {
+        container media-channel-connection-end-point-spec {
+            uses media-channel-connection-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connection-end-point-details/tapi-connectivity:output/tapi-connectivity:connection-end-point" {
+        container otsi-assembly-connection-end-point-spec {
+            uses otsi-assembly-connection-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connection-end-point-details/tapi-connectivity:output/tapi-connectivity:connection-end-point" {
+        container otsi-connection-end-point-spec {
+            uses otsi-connection-end-point-spec;
+            description "none";
+        }
+        description "none";
+    }
     /***********************
     * package object-classes
     **********************/ 
@@ -188,16 +328,19 @@
         }
         grouping media-channel-pool-capability-pac {
             list supportable-spectrum {
+                key 'upper-frequency lower-frequency';
                 config false;
                 uses spectrum-band;
                 description "none";
             }
             list available-spectrum {
+                key 'upper-frequency lower-frequency';
                 config false;
                 uses spectrum-band;
                 description "none";
             }
             list occupied-spectrum {
+                key 'upper-frequency lower-frequency';
                 config false;
                 uses spectrum-band;
                 description "none";
@@ -251,16 +394,19 @@
         }
         grouping otsi-capability-pac {
             list supportable-lower-central-frequency {
+                key 'central-frequency';
                 config false;
                 uses central-frequency;
                 description "The lower frequency of the channel spectrum";
             }
             list supportable-upper-central-frequency {
+                key 'central-frequency';
                 config false;
                 uses central-frequency;
                 description "The Upper frequency of the channel spectrum";
             }
             list supportable-application-identifier {
+                key 'application-code';
                 config false;
                 uses application-identifier;
                 description "The list of supportable ApplicationIdentifiers.";
diff --git a/models/tapi/src/main/yang/tapi-topology@2018-10-16.yang b/models/tapi/src/main/yang/tapi-topology@2018-10-16.yang
index 4b7c9f2..adf6ba0 100644
--- a/models/tapi/src/main/yang/tapi-topology@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-topology@2018-10-16.yang
@@ -705,6 +705,7 @@
             description "none";
             output {
                 list topology {
+                	key 'uuid';
                     uses topology;
                     description "none";
                 }
diff --git a/models/tapi/src/main/yang/tapi-virtual-network@2018-10-16.yang b/models/tapi/src/main/yang/tapi-virtual-network@2018-10-16.yang
index 25f33d8..6e87288 100644
--- a/models/tapi/src/main/yang/tapi-virtual-network@2018-10-16.yang
+++ b/models/tapi/src/main/yang/tapi-virtual-network@2018-10-16.yang
@@ -202,6 +202,7 @@
             description "none";
             input {
                 list sep {
+                	key 'local-id';
                     min-elements 2;
                     uses virtual-network-service-end-point;
                     description "none";
@@ -256,6 +257,7 @@
             description "none";
             output {
                 list service {
+                	key 'uuid';
                     uses virtual-network-service;
                     description "none";
                 }