diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 555016ba05..9c4269f508 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -292,6 +292,8 @@ _db_fill_implement(Eolian_Class *cl, Eolian_Implement *impl)
           foo_id->set_auto = EINA_TRUE;
         else
           foo_id->get_auto = EINA_TRUE;
+
+        foo_id->impl = impl;
      }
    else if (impl->is_empty)
      {
@@ -304,6 +306,8 @@ _db_fill_implement(Eolian_Class *cl, Eolian_Implement *impl)
           foo_id->set_empty = EINA_TRUE;
         else
           foo_id->get_empty = EINA_TRUE;
+
+        foo_id->impl = impl;
      }
    else if (impl->is_class_ctor)
      {
@@ -334,10 +338,41 @@ pasttags:
    return 0;
 }
 
+static Eina_Bool
+_db_build_implement(Eolian_Class *cl, Eolian_Function *foo_id)
+{
+   if (foo_id->impl || foo_id->get_virtual_pure || foo_id->set_virtual_pure)
+     return EINA_TRUE;
+
+   Eolian_Implement *impl = calloc(1, sizeof(Eolian_Implement));
+
+   if (foo_id->type == EOLIAN_PROP_SET)
+     impl->base = foo_id->set_base;
+   else
+     impl->base = foo_id->base;
+   eina_stringshare_ref(impl->base.file);
+
+   impl->klass = cl;
+   impl->full_name = eina_stringshare_printf("%s.%s", cl->full_name,
+                                             foo_id->name);
+
+   if (foo_id->type == EOLIAN_PROP_SET)
+     impl->is_prop_set = EINA_TRUE;
+   else if (foo_id->type == EOLIAN_PROP_GET)
+     impl->is_prop_get = EINA_TRUE;
+
+   foo_id->impl = impl;
+
+   cl->implements = eina_list_append(cl->implements, impl);
+
+   return EINA_TRUE;
+}
+
 static Eina_Bool
 _db_fill_implements(Eolian_Class *cl, Eo_Class_Def *kls)
 {
    Eolian_Implement *impl;
+   Eolian_Function *foo_id;
    Eina_List *l;
 
    EINA_LIST_FOREACH(kls->implements, l, impl)
@@ -347,7 +382,15 @@ _db_fill_implements(Eolian_Class *cl, Eo_Class_Def *kls)
         if (ret > 0) continue;
         eina_list_data_set(l, NULL); /* prevent double free */
      }
- 
+
+   EINA_LIST_FOREACH(cl->properties, l, foo_id)
+     if (!_db_build_implement(cl, foo_id))
+       return EINA_FALSE;
+
+   EINA_LIST_FOREACH(cl->methods, l, foo_id)
+     if (!_db_build_implement(cl, foo_id))
+       return EINA_FALSE;
+
    return EINA_TRUE;
 }
 
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index e5cbcfe0d6..0b61e1164a 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -97,6 +97,7 @@ struct _Eolian_Function
    Eolian_Type *set_ret_type;
    Eolian_Expression *get_ret_val;
    Eolian_Expression *set_ret_val;
+   Eolian_Implement *impl;
    Eina_Stringshare *get_legacy;
    Eina_Stringshare *set_legacy;
    Eina_Stringshare *get_description;
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 02ce378ce6..d2b50bd2f8 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -262,7 +262,6 @@ START_TEST(eolian_ctor_dtor)
    fail_if(!(impl_func = eolian_implement_function_get(impl, NULL)));
    fail_if(impl_class != base);
    fail_if(strcmp(eolian_function_name_get(impl_func), "destructor"));
-   fail_if(eina_iterator_next(iter, &dummy));
    eina_iterator_free(iter);
 
    /* Custom ctors/dtors */