diff --git a/src/lib/eldbus/eldbus_model.c b/src/lib/eldbus/eldbus_model.c
index 3a2115ead0..ff37b60905 100644
--- a/src/lib/eldbus/eldbus_model.c
+++ b/src/lib/eldbus/eldbus_model.c
@@ -123,7 +123,7 @@ _eldbus_model_efl_model_property_set(Eo *obj,
 
    if (strcmp(property, UNIQUE_NAME_PROPERTY))
      err = EFL_MODEL_ERROR_NOT_FOUND;
-   return eina_future_rejected(efl_loop_future_scheduler_get(obj), err);
+   return efl_loop_future_rejected(obj, err);
 }
 
 static Eina_Value *
@@ -181,7 +181,7 @@ _eldbus_model_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
                                            unsigned int start EINA_UNUSED,
                                            unsigned int count EINA_UNUSED)
 {
-   return eina_future_rejected(efl_loop_future_scheduler_get(obj),
+   return efl_loop_future_rejected(obj,
                                EFL_MODEL_ERROR_NOT_SUPPORTED);
 }
 
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index 378139111a..f5ee2ace82 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -143,11 +143,11 @@ _eldbus_model_arguments_efl_model_property_set(Eo *obj,
    eina_value_flush(prop_value);
    eina_value_copy(value, prop_value);
 
-   return eina_future_resolved(efl_loop_future_scheduler_get(obj),
+   return efl_loop_future_resolved(obj,
                                eina_value_reference_copy(value));
 
  on_error:
-   return eina_future_rejected(efl_loop_future_scheduler_get(obj), err);
+   return efl_loop_future_rejected(obj, err);
 }
 
 static Eina_Value *
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index c58faaf33b..175afcd924 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -67,7 +67,7 @@ _eldbus_model_connection_efl_model_children_slice_get(Eo *obj,
         Eina_Value v;
 
         v = efl_model_list_value_get(pd->childrens, start, count);
-        return eina_future_resolved(efl_loop_future_scheduler_get(obj), v);
+        return efl_loop_future_resolved(obj, v);
      }
 
    p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL);
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index f9106837d4..3759fc3f8f 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -124,7 +124,7 @@ _eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
         Eina_Value v;
 
         v = efl_model_list_value_get(pd->childrens, start, count);
-        return eina_future_resolved(efl_loop_future_scheduler_get(obj), v);
+        return efl_loop_future_resolved(obj, v);
      }
 
    p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL);
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 073baef0ba..4da54ad7f4 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -312,7 +312,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
    return efl_future_then(obj, eina_future_new(data->promise));
 
  on_error:
-   return eina_future_rejected(efl_loop_future_scheduler_get(obj), err);
+   return efl_loop_future_rejected(obj, err);
 }
 
 static Eina_Value *
@@ -380,7 +380,7 @@ _eldbus_model_proxy_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
    _eldbus_model_proxy_listed(pd);
 
    v = efl_model_list_value_get(pd->childrens, start, count);
-   return eina_future_resolved(efl_loop_future_scheduler_get(obj), v);
+   return efl_loop_future_resolved(obj, v);
 }
 
 static unsigned int