diff --git a/src/ast_handlers.cpp b/src/ast_handlers.cpp
index f160d8c..b77964b 100644
--- a/src/ast_handlers.cpp
+++ b/src/ast_handlers.cpp
@@ -1,5 +1,5 @@
 #include "ast_handlers.hpp"
-std::set<Completion> generateMissingKeyCompletionSet(std::set<std::string> keysNeeded, std::map<std::string, leaf_data_> currentKeys)
+std::set<Completion> generateMissingKeyCompletionSet(std::set<std::string> keysNeeded, ListInstance currentKeys)
 {
     std::set<std::string> missingKeys;
 
diff --git a/src/ast_handlers.hpp b/src/ast_handlers.hpp
index b9d7a9d..870d255 100644
--- a/src/ast_handlers.hpp
+++ b/src/ast_handlers.hpp
@@ -306,7 +306,7 @@
 
 struct trailingSlash_class;
 
-std::set<Completion> generateMissingKeyCompletionSet(std::set<std::string> keysNeeded, std::map<std::string, leaf_data_> currentSet);
+std::set<Completion> generateMissingKeyCompletionSet(std::set<std::string> keysNeeded, ListInstance currentSet);
 
 struct createKeySuggestions_class {
     template <typename T, typename Iterator, typename Context>
diff --git a/src/ast_path.cpp b/src/ast_path.cpp
index f7c0022..b913d0c 100644
--- a/src/ast_path.cpp
+++ b/src/ast_path.cpp
@@ -96,7 +96,7 @@
     return this->m_name == b.m_name;
 }
 
-listElement_::listElement_(const std::string& listName, const std::map<std::string, leaf_data_>& keys)
+listElement_::listElement_(const std::string& listName, const ListInstance& keys)
     : m_name(listName)
     , m_keys(keys)
 {
diff --git a/src/ast_path.hpp b/src/ast_path.hpp
index 2d809bc..9138946 100644
--- a/src/ast_path.hpp
+++ b/src/ast_path.hpp
@@ -65,7 +65,7 @@
 
 struct listElement_ {
     listElement_() {}
-    listElement_(const std::string& listName, const std::map<std::string, leaf_data_>& keys);
+    listElement_(const std::string& listName, const ListInstance& keys);
 
     bool operator==(const listElement_& b) const;
 
diff --git a/src/netconf_access.hpp b/src/netconf_access.hpp
index 964fa54..0cc4eb4 100644
--- a/src/netconf_access.hpp
+++ b/src/netconf_access.hpp
@@ -49,7 +49,7 @@
     std::shared_ptr<Schema> schema() override;
 
 private:
-    std::vector<std::map<std::string, leaf_data_>> listInstances(const std::string& path) override;
+    std::vector<ListInstance> listInstances(const std::string& path) override;
 
     std::string fetchSchema(const std::string_view module, const
             std::optional<std::string_view> revision, const
diff --git a/src/parser_context.hpp b/src/parser_context.hpp
index 88dc71a..2a5ba22 100644
--- a/src/parser_context.hpp
+++ b/src/parser_context.hpp
@@ -32,7 +32,7 @@
 
     // When parsing list suffixes, this path is used to store the path of the list whose keys are being parsed.
     dataPath_ m_tmpListPath;
-    std::map<std::string, leaf_data_> m_tmpListKeys;
+    ListInstance m_tmpListKeys;
 
     bool m_errorHandled = false;
     bool m_completing = false;
diff --git a/src/sysrepo_access.hpp b/src/sysrepo_access.hpp
index 26d6c80..0ca7587 100644
--- a/src/sysrepo_access.hpp
+++ b/src/sysrepo_access.hpp
@@ -45,7 +45,7 @@
     void copyConfig(const Datastore source, const Datastore destination) override;
 
 private:
-    std::vector<std::map<std::string, leaf_data_>> listInstances(const std::string& path) override;
+    std::vector<ListInstance> listInstances(const std::string& path) override;
     [[noreturn]] void reportErrors();
 
     std::string fetchSchema(const char* module, const char* revision, const char* submodule);