diff --git a/configure.ac b/configure.ac
index 837138e..a0791e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_SUBST(ENVENTOR_VERSION_MINOR)
 
 EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
+EFL_ENABLE_EO_LATEST
 
 efl_version="1.12.0"
 requirement_enventor=" \
diff --git a/m4/efl_eo.m4 b/m4/efl_eo.m4
index 864baf5..a90be8a 100644
--- a/m4/efl_eo.m4
+++ b/m4/efl_eo.m4
@@ -4,3 +4,9 @@ AC_DEFUN([EFL_ENABLE_EO_API_SUPPORT],
   AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API])
 ])
 
+AC_DEFUN([EFL_ENABLE_EO_LATEST],
+[
+  AC_DEFINE([EO_LATEST], [1], [Enable access to unstable EFL Eo Latest API])
+])
+
+
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index a1b273c..eb917fd 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -296,8 +296,12 @@ view_obj_idler_cb(void *data)
    elm_object_part_content_set(vd->base, "elm.swallow.content",
                                vd->layout);
    elm_object_content_set(vd->scroller, vd->base);
-
+#if EO_LATEST
+   Eina_Bool ret;
+   if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_swallow_get()))
+#else
    if (eo_do(vd->enventor, enventor_obj_dummy_swallow_get()))
+#endif
      dummy_obj_new(vd->layout);
 
    vd->idler = NULL;
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 6ce01f4..dc65a79 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -579,7 +579,12 @@ enventor_object_add(Evas_Object *parent)
 EAPI Eina_Bool
 enventor_object_file_set(Evas_Object *obj, const char *file)
 {
+#if EO_LATEST
+   Eina_Bool ret;
+   return eo_do_ret(obj, ret, efl_file_set(file, NULL));
+#else
    return eo_do(obj, efl_file_set(file, NULL));
+#endif
 }
 
 #include "enventor_object.eo.c"