diff --git a/include/global_info.hpp b/include/global_info.hpp
index 60ba998..34231ae 100644
--- a/include/global_info.hpp
+++ b/include/global_info.hpp
@@ -43,17 +43,17 @@ public:
 
     std::optional<NamespaceInfo*> FindNamespace(const std::optional<std::vector<std::string>>& path);
 
-    std::optional<utils::IdType> FindFunction(const std::optional<std::vector<std::string>>& path,
+    std::optional<std::vector<utils::IdType>> FindFunction(const std::optional<std::vector<std::string>>& path,
                                                const std::string& name);
 
-    std::optional<utils::IdType> FindMethod(const std::optional<std::vector<std::string>>& path,
+    std::optional<std::vector<utils::IdType>> FindMethod(const std::optional<std::vector<std::string>>& path,
                                             const std::string& type,
                                             const std::string& name);
 
-    std::optional<utils::IdType> FindType(const std::optional<std::vector<std::string>>& path,
+    std::optional<std::vector<utils::IdType>> FindType(const std::optional<std::vector<std::string>>& path,
                                           const std::string type);
 
-    std::optional<utils::IdType> FindTypeclass(const std::optional<std::vector<std::string>>& path,
+    std::optional<std::vector<utils::IdType>> FindTypeclass(const std::optional<std::vector<std::string>>& path,
                                                const std::string typeclass);
 
     NamespaceVisitor CreateVisitor() {
diff --git a/src/global_info.cpp b/src/global_info.cpp
index 8618cf0..1365475 100644
--- a/src/global_info.cpp
+++ b/src/global_info.cpp
@@ -142,7 +142,7 @@ std::optional<NamespaceInfo*> GlobalInfo::NamespaceVisitor::FindNamespace(const
   });
 }
 
-std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindFunction(
+std::optional<std::vector<utils::IdType>> GlobalInfo::NamespaceVisitor::FindFunction(
     const std::optional<std::vector<std::string>>& path,
     const std::string& name) {
   return FindSomething<utils::IdType>(path,
@@ -157,7 +157,7 @@ std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindFunction(
   });
 }
 
-std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindMethod(
+std::optional<std::vector<utils::IdType>> GlobalInfo::NamespaceVisitor::FindMethod(
     const std::optional<std::vector<std::string>>& path,
     const std::string& type,
     const std::string& name) {
@@ -185,7 +185,7 @@ std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindMethod(
   });
 }
 
-std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindType(
+std::optional<std::vector<utils::IdType>> GlobalInfo::NamespaceVisitor::FindType(
     const std::optional<std::vector<std::string>>& path,
     const std::string type) {
   return FindSomething<utils::IdType>(path,
@@ -200,7 +200,7 @@ std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindType(
   });
 }
 
-std::optional<utils::IdType> GlobalInfo::NamespaceVisitor::FindTypeclass(
+std::optional<std::vector<utils::IdType>> GlobalInfo::NamespaceVisitor::FindTypeclass(
     const std::optional<std::vector<std::string>>& path,
     const std::string typeclass) {
   return FindSomething<utils::IdType>(path,
diff --git a/tests/functions.lang b/tests/functions.lang
index 6b954c8..fa235ef 100644
--- a/tests/functions.lang
+++ b/tests/functions.lang
@@ -1,5 +1,5 @@
 decl sum ('A : #Add) : 'A -> 'A -> 'A
-def sum 'A : a b = a + b
+def sum : a b = a + b
 
 decl fib : Int -> Int
 def fib : n =
diff --git a/tests/namespaces.lang b/tests/namespaces.lang
index ef58a35..2a16bb6 100644
--- a/tests/namespaces.lang
+++ b/tests/namespaces.lang
@@ -10,10 +10,10 @@ namespace Array {
   decl something : Unit -> Unit
 }
 
-namespace var : Array {
+namespace var Array {
   decl something : Unit -> Unit
 }
 
-namespace const : Array {
+namespace const Array {
   decl something : Unit -> Unit
 }