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";
+                }
+            }
+        }
 
 }