diff --git a/src/core/model/ocarina-analyzer-aadl-finder.adb b/src/core/model/ocarina-analyzer-aadl-finder.adb
index 887e1dbca8aa3ef8c6dc2ce244ebee4bbbc9e8f0..7a997d9108d7bb507ae42d3849deb281b9e23272 100644
--- a/src/core/model/ocarina-analyzer-aadl-finder.adb
+++ b/src/core/model/ocarina-analyzer-aadl-finder.adb
@@ -1113,7 +1113,8 @@ package body Ocarina.Analyzer.AADL.Finder is
    is
       pragma Assert
         (Kind (Component) = K_Component_Implementation
-         or else Kind (Component) = K_Component_Type);
+         or else Kind (Component) = K_Component_Type
+         or else Kind (Component) = K_Port_Spec);
       pragma Assert (Kind (Identifier) = K_Identifier);
    begin
       return Find_Subclause_Declaration_Classifier
@@ -1148,6 +1149,7 @@ package body Ocarina.Analyzer.AADL.Finder is
         (Kind (Component) = K_Component_Implementation
          or else Kind (Component) = K_Component_Type
          or else Kind (Component) = K_Feature_Group_Type
+         or else Kind (Component) = K_Port_spec
          or else Kind (Component) = K_Subcomponent_Access);
       pragma Assert (Kind (Declaration_Identifier) = K_Identifier);
       pragma Assert (Subclause_Kinds'Length > 0);
diff --git a/src/core/model/ocarina-analyzer-aadl-links.adb b/src/core/model/ocarina-analyzer-aadl-links.adb
index 8f21eecf8e47c5bb772ea334647fc2b5136b6a6b..746883bc6132785e90b7de3c88821091e863e582 100644
--- a/src/core/model/ocarina-analyzer-aadl-links.adb
+++ b/src/core/model/ocarina-analyzer-aadl-links.adb
@@ -1952,6 +1952,10 @@ package body Ocarina.Analyzer.AADL.Links is
                   when K_Component_Type | K_Component_Implementation =>
                      Corresponding_Container := Pointed_Node;
 
+                  when K_Connection =>
+                     Corresponding_Container :=
+                       Container_Component (Pointed_Node);
+
                   when others =>
                      --  These entities cannot have 'applies to'
                      --  clause in their property associations.
diff --git a/src/core/model/ocarina-analyzer-aadl-queries.adb b/src/core/model/ocarina-analyzer-aadl-queries.adb
index 283bbd7e2c231eb9cb9e0e518bb0196ffa8d6b7c..827c25a7aa86595f5943e0a6a0a63552f0734de5 100644
--- a/src/core/model/ocarina-analyzer-aadl-queries.adb
+++ b/src/core/model/ocarina-analyzer-aadl-queries.adb
@@ -1021,6 +1021,9 @@ package body Ocarina.Analyzer.AADL.Queries is
                     or else
                       Named_Element'Val (Category (List_Node)) =
                       PO_Port_Connections
+                    or else
+                      Named_Element'Val (Category (List_Node)) =
+                      PO_Port_Connection
                     or else
                       Named_Element'Val (Category (List_Node)) =
                       PO_Connection