diff --git a/fwd.hpp b/fwd.hpp
index e4ad036..4f6e76c 100644
--- a/fwd.hpp
+++ b/fwd.hpp
@@ -24,9 +24,9 @@
 
 
 namespace cruft::vk {
-    template <typename T> struct descendant;
-    template <typename T> struct enumerated;
-    template <typename T, typename O> struct owned;
+    template <typename SelfT> struct descendant;
+    template <typename SelfT, typename ParentT> struct enumerated;
+    template <typename SelfT, typename OwnerT> struct owned;
     
     struct instance;
     struct physical_device;
diff --git a/object.cpp b/object.cpp
index 0811ba8..53fe23f 100644
--- a/object.cpp
+++ b/object.cpp
@@ -35,25 +35,3 @@ VK_TYPE_MAP (OBJECT)
 #define DESCENDANT(T) template struct cruft::vk::descendant<cruft::vk::T>;
 VK_DESCENDANT_TYPE_MAP (DESCENDANT)
 
-
-///////////////////////////////////////////////////////////////////////////////
-template <typename T>
-std::vector<T>
-cruft::vk::enumerated<T>::find (const instance &parent) {
-    // find the total number of objects
-    uint32_t expected = 0;
-    error::try_code (enum_traits<native_t<T>>::enumerate (parent.native (), &expected, nullptr));
-
-    // allocate an array of handles and fetch them
-    uint32_t found = expected;
-    native_t<T> handles[expected];
-    error::try_code (enum_traits<native_t<T>>::enumerate (parent.native (), &found, handles));
-
-    // return an collection of objects from the handles
-    return std::vector<T> (handles, handles + found);
-}
-
-
-//-----------------------------------------------------------------------------
-#define ENUMERATED(T) template struct cruft::vk::enumerated<cruft::vk::T>;
-VK_ENUMERATED_TYPE_MAP (ENUMERATED)
diff --git a/object.hpp b/object.hpp
index 1de83ed..011419b 100644
--- a/object.hpp
+++ b/object.hpp
@@ -97,12 +97,17 @@ namespace cruft::vk {
 
     ///////////////////////////////////////////////////////////////////////////
     /// a vulkan object that is obtained by listings from a parent object.
-    template <typename SelfT>
+    template <typename SelfT, typename ParentT>
     struct enumerated : public object<SelfT> {
         using object<SelfT>::object;
 
         static std::vector<SelfT>
-        find (const instance &parent);
+        find (const ParentT &parent)
+        {
+            return error::try_handles<SelfT> (
+                enum_traits<native_t<SelfT>>::enumerate, parent.native ()
+            );
+        }
     };
 
 
diff --git a/physical_device.hpp b/physical_device.hpp
index d65ac8f..042b948 100644
--- a/physical_device.hpp
+++ b/physical_device.hpp
@@ -26,7 +26,7 @@
 #include <string>
 
 namespace cruft::vk {
-    struct physical_device : public enumerated<physical_device> {
+    struct physical_device : public enumerated<physical_device,instance> {
         using enumerated::enumerated;
 
         std::set<std::string> extensions (void) const;
diff --git a/traits.hpp b/traits.hpp
index d8490e1..70600ba 100644
--- a/traits.hpp
+++ b/traits.hpp
@@ -297,7 +297,7 @@ namespace cruft::vk {
     template <typename> struct enum_traits { };
 
     template <> struct enum_traits<VkPhysicalDevice> {
-        static constexpr auto enumerate = vkEnumeratePhysicalDevices;
+        static constexpr auto &enumerate = vkEnumeratePhysicalDevices;
     };
 }