wip-worktree-stateHEADmaster

91 files changed, 3477 insertions, 2251 deletions

diff --git a/TODO b/TODO
index cf36b02..3934289 100644
--- a/TODO
+++ b/TODO
@@ -5,3 +5,5 @@ UGLY !!!!
         Efl::Native.enum_type(:elm_policy_quit)[:elm_policy_quit_last_window_closed]
         )
 
+
+ecore-audio !!
diff --git a/lib/efl/native/ecore.rb~ b/lib/efl/native/ecore.rb~
new file mode 100644
index 0000000..68474e9
--- /dev/null
+++ b/lib/efl/native/ecore.rb~
@@ -0,0 +1,454 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+#
+module Efl
+    #
+    module Ecore
+        #
+        FCT_PREFIX = 'ecore_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'ecore.so.1'
+        #
+        # ENUMS
+        # enum _Ecore_Memory_State {...} Ecore_Memory_State;
+        enum :ecore_memory_state, [ :ecore_memory_state_normal, :ecore_memory_state_low ]
+        # enum _Ecore_Power_State {...} Ecore_Power_State;
+        enum :ecore_power_state, [ :ecore_power_state_mains, :ecore_power_state_battery, :ecore_power_state_low ]
+        # enum _Ecore_Exe_Flags {...} Ecore_Exe_Flags;
+        enum :ecore_exe_flags, [ :ecore_exe_none, 0, :ecore_exe_pipe_read, 1, :ecore_exe_pipe_write, 2, :ecore_exe_pipe_error, 4,
+            :ecore_exe_pipe_read_line_buffered, 8, :ecore_exe_pipe_error_line_buffered, 16, :ecore_exe_pipe_auto, 32, :ecore_exe_respawn, 64, :ecore_exe_use_sh,
+            128, :ecore_exe_not_leader, 256, :ecore_exe_term_with_parent, 512 ]
+        # enum _Ecore_Exe_Win32_Priority {...} Ecore_Exe_Win32_Priority;
+        enum :ecore_exe_win32_priority, [ :ecore_exe_win32_priority_idle, :ecore_exe_win32_priority_below_normal, :ecore_exe_win32_priority_normal,
+            :ecore_exe_win32_priority_above_normal, :ecore_exe_win32_priority_high, :ecore_exe_win32_priority_realtime ]
+        # enum _Ecore_Fd_Handler_Flags {...} Ecore_Fd_Handler_Flags;
+        enum :ecore_fd_handler_flags, [ :ecore_fd_read, 1, :ecore_fd_write, 2, :ecore_fd_error, 4 ]
+        # enum _Ecore_Poller_Type {...} Ecore_Poller_Type;
+        enum :ecore_poller_type, [ :ecore_poller_core, 0 ]
+        # enum _Ecore_Pos_Map {...} Ecore_Pos_Map;
+        enum :ecore_pos_map, [ :ecore_pos_map_linear, :ecore_pos_map_accelerate, :ecore_pos_map_decelerate, :ecore_pos_map_sinusoidal,
+            :ecore_pos_map_accelerate_factor, :ecore_pos_map_decelerate_factor, :ecore_pos_map_sinusoidal_factor, :ecore_pos_map_divisor_interp,
+            :ecore_pos_map_bounce, :ecore_pos_map_spring, :ecore_pos_map_cubic_bezier ]
+        # enum _Ecore_Animator_Source {...} Ecore_Animator_Source;
+        enum :ecore_animator_source, [ :ecore_animator_source_timer, :ecore_animator_source_custom ]
+        #
+        # TYPEDEFS
+        # typedef struct _Ecore_Version Ecore_Version;
+        typedef :pointer, :ecore_version
+        # typedef struct _Ecore_Win32_Handler Ecore_Win32_Handler;
+        typedef :pointer, :ecore_win32_handler
+        # typedef struct _Ecore_Event_Handler Ecore_Event_Handler;
+        typedef :pointer, :ecore_event_handler
+        # typedef struct _Ecore_Event_Filter Ecore_Event_Filter;
+        typedef :pointer, :ecore_event_filter
+        # typedef struct _Ecore_Event Ecore_Event;
+        typedef :pointer, :ecore_event
+        # typedef struct _Ecore_Event_Signal_User Ecore_Event_Signal_User;
+        typedef :pointer, :ecore_event_signal_user
+        # typedef struct _Ecore_Event_Signal_Hup Ecore_Event_Signal_Hup;
+        typedef :pointer, :ecore_event_signal_hup
+        # typedef struct _Ecore_Event_Signal_Exit Ecore_Event_Signal_Exit;
+        typedef :pointer, :ecore_event_signal_exit
+        # typedef struct _Ecore_Event_Signal_Power Ecore_Event_Signal_Power;
+        typedef :pointer, :ecore_event_signal_power
+        # typedef struct _Ecore_Event_Signal_Realtime Ecore_Event_Signal_Realtime;
+        typedef :pointer, :ecore_event_signal_realtime
+        # typedef struct _Ecore_Exe Ecore_Exe;
+        typedef :pointer, :ecore_exe
+        # typedef struct _Ecore_Exe_Event_Add Ecore_Exe_Event_Add;
+        typedef :pointer, :ecore_exe_event_add
+        # typedef struct _Ecore_Exe_Event_Del Ecore_Exe_Event_Del;
+        typedef :pointer, :ecore_exe_event_del
+        # typedef struct _Ecore_Exe_Event_Data_Line Ecore_Exe_Event_Data_Line;
+        typedef :pointer, :ecore_exe_event_data_line
+        # typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data;
+        typedef :pointer, :ecore_exe_event_data
+        # typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
+        typedef :pointer, :ecore_fd_handler
+        # typedef struct _Ecore_Thread Ecore_Thread;
+        typedef :pointer, :ecore_thread
+        # typedef struct _Ecore_Pipe Ecore_Pipe;
+        typedef :pointer, :ecore_pipe
+        # typedef Eo Ecore_Poller;
+        typedef :eo, :ecore_poller
+        # typedef Eo Ecore_Animator;
+        typedef :eo, :ecore_animator
+        # typedef Eo Ecore_Timer;
+        typedef :eo, :ecore_timer
+        # typedef Eo Ecore_Idler;
+        typedef :eo, :ecore_idler
+        # typedef Eo Ecore_Idle_Enterer;
+        typedef :eo, :ecore_idle_enterer
+        # typedef Eo Ecore_Idle_Exiter;
+        typedef :eo, :ecore_idle_exiter
+        # typedef Eo Ecore_Job;
+        typedef :eo, :ecore_job
+        #
+        # CALLBACKS
+        # typedef Eina_Bool (*Ecore_Task_Cb) (void *data);
+        callback :ecore_task_cb, [ :pointer ], :bool
+        # typedef int (*Ecore_Select_Function) (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
+        callback :ecore_select_function_cb, [ :int, :pointer, :pointer, :pointer, :pointer ], :int
+        # typedef void (*Ecore_Cb) (void *data);
+        callback :ecore_cb, [ :pointer ], :void
+        # typedef void *(*Ecore_Data_Cb) (void *data);
+        callback :ecore_data_cb, [ :pointer ], :pointer
+        # typedef Eina_Bool (*Ecore_Filter_Cb) (void *data, void *loop_data, int type, void *event);
+        callback :ecore_filter_cb, [ :pointer, :pointer, :int, :pointer ], :bool
+        # typedef void (*Ecore_End_Cb) (void *user_data, void *func_data);
+        callback :ecore_end_cb, [ :pointer, :pointer ], :void
+        # typedef Eina_Bool (*Ecore_Event_Handler_Cb) (void *data, int type, void *event);
+        callback :ecore_event_handler_cb, [ :pointer, :int, :pointer ], :bool
+        # typedef void (*Ecore_Exe_Cb) (void *data, const Ecore_Exe *exe);
+        callback :ecore_exe_cb, [ :pointer, :ecore_exe ], :void
+        # typedef Eina_Bool (*Ecore_Fd_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
+        callback :ecore_fd_cb, [ :pointer, :ecore_fd_handler ], :bool
+        # typedef void (*Ecore_Fd_Prep_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
+        callback :ecore_fd_prep_cb, [ :pointer, :ecore_fd_handler ], :void
+        # typedef Eina_Bool (*Ecore_Win32_Handle_Cb) (void *data, Ecore_Win32_Handler *wh);
+        callback :ecore_win32_handle_cb, [ :pointer, :ecore_win32_handler ], :bool
+        # typedef void (*Ecore_Thread_Cb) (void *data, Ecore_Thread *thread);
+        callback :ecore_thread_cb, [ :pointer, :ecore_thread ], :void
+        # typedef void (*Ecore_Thread_Notify_Cb) (void *data, Ecore_Thread *thread, void *msg_data);
+        callback :ecore_thread_notify_cb, [ :pointer, :ecore_thread, :pointer ], :void
+        # typedef void (*Ecore_Pipe_Cb) (void *data, void *buffer, unsigned int nbyte);
+        callback :ecore_pipe_cb, [ :pointer, :pointer, :uint ], :void
+        # typedef Eina_Bool (*Ecore_Timeline_Cb) (void *data, double pos);
+        callback :ecore_timeline_cb, [ :pointer, :double ], :bool
+        #
+        # VARIABLES
+        # EAPI extern Ecore_Version *ecore_version;
+        attach_variable :ecore_version, :ecore_version
+        # EAPI extern int ECORE_EXE_EVENT_ADD;
+        attach_variable :ECORE_EXE_EVENT_ADD, :int
+        # EAPI extern int ECORE_EXE_EVENT_DEL;
+        attach_variable :ECORE_EXE_EVENT_DEL, :int
+        # EAPI extern int ECORE_EXE_EVENT_DATA;
+        attach_variable :ECORE_EXE_EVENT_DATA, :int
+        # EAPI extern int ECORE_EXE_EVENT_ERROR;
+        attach_variable :ECORE_EXE_EVENT_ERROR, :int
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI int ecore_init(void);
+        [ :ecore_init, [  ], :int ],
+        # EAPI int ecore_shutdown(void);
+        [ :ecore_shutdown, [  ], :int ],
+        # EAPI void ecore_main_loop_iterate(void);
+        [ :ecore_main_loop_iterate, [  ], :void ],
+        # EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func);
+        [ :ecore_main_loop_select_func_set, [ :ecore_select_function_cb ], :void ],
+        # EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void);
+        [ :ecore_main_loop_select_func_get, [  ], :ecore_select_function_cb ],
+        # EAPI Eina_Bool ecore_main_loop_glib_integrate(void);
+        [ :ecore_main_loop_glib_integrate, [  ], :bool ],
+        # EAPI void ecore_main_loop_glib_always_integrate_disable(void);
+        [ :ecore_main_loop_glib_always_integrate_disable, [  ], :void ],
+        # EAPI void ecore_main_loop_begin(void);
+        [ :ecore_main_loop_begin, [  ], :void ],
+        # EAPI void ecore_main_loop_quit(void);
+        [ :ecore_main_loop_quit, [  ], :void ],
+        # EAPI Eina_Bool ecore_fork_reset_callback_add(Ecore_Cb func, const void *data);
+        [ :ecore_fork_reset_callback_add, [ :ecore_cb, :pointer ], :bool ],
+        # EAPI Eina_Bool ecore_fork_reset_callback_del(Ecore_Cb func, const void *data);
+        [ :ecore_fork_reset_callback_del, [ :ecore_cb, :pointer ], :bool ],
+        # EAPI void ecore_fork_reset(void);
+        [ :ecore_fork_reset, [  ], :void ],
+        # EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data);
+        [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :pointer ], :void ],
+        # EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
+        [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :pointer ], :pointer ],
+        # EAPI int ecore_thread_main_loop_begin(void);
+        [ :ecore_thread_main_loop_begin, [  ], :int ],
+        # EAPI int ecore_thread_main_loop_end(void);
+        [ :ecore_thread_main_loop_end, [  ], :int ],
+        # EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
+        [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :pointer ], :ecore_event_handler ],
+        # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
+        [ :ecore_event_handler_del, [ :ecore_event_handler ], :pointer ],
+        # EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
+        [ :ecore_event_add, [ :int, :pointer, :ecore_end_cb, :pointer ], :ecore_event ],
+        # EAPI void *ecore_event_del(Ecore_Event *event);
+        [ :ecore_event_del, [ :ecore_event ], :pointer ],
+        # EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
+        [ :ecore_event_handler_data_get, [ :ecore_event_handler ], :pointer ],
+        # EAPI void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data);
+        [ :ecore_event_handler_data_set, [ :ecore_event_handler, :pointer ], :pointer ],
+        # EAPI int ecore_event_type_new(void);
+        [ :ecore_event_type_new, [  ], :int ],
+        # EAPI Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data);
+        [ :ecore_event_filter_add, [ :ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :pointer ], :ecore_event_filter ],
+        # EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
+        [ :ecore_event_filter_del, [ :ecore_event_filter ], :pointer ],
+        # EAPI int ecore_event_current_type_get(void);
+        [ :ecore_event_current_type_get, [  ], :int ],
+        # EAPI void *ecore_event_current_event_get(void);
+        [ :ecore_event_current_event_get, [  ], :pointer ],
+        # EAPI Ecore_Memory_State ecore_memory_state_get(void);
+        [ :ecore_memory_state_get, [  ], :ecore_memory_state ],
+        # EAPI void ecore_memory_state_set(Ecore_Memory_State state);
+        [ :ecore_memory_state_set, [ :ecore_memory_state ], :void ],
+        # EAPI Ecore_Power_State ecore_power_state_get(void);
+        [ :ecore_power_state_get, [  ], :ecore_power_state ],
+        # EAPI void ecore_power_state_set(Ecore_Power_State state);
+        [ :ecore_power_state_set, [ :ecore_power_state ], :void ],
+        # EAPI void ecore_exe_run_priority_set(int pri);
+        [ :ecore_exe_run_priority_set, [ :int ], :void ],
+        # EAPI int ecore_exe_run_priority_get(void);
+        [ :ecore_exe_run_priority_get, [  ], :int ],
+        # EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
+        [ :ecore_exe_run, [ :string, :pointer ], :ecore_exe ],
+        # EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
+        [ :ecore_exe_pipe_run, [ :string, :ecore_exe_flags, :pointer ], :ecore_exe ],
+        # EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func);
+        [ :ecore_exe_callback_pre_free_set, [ :ecore_exe, :ecore_exe_cb ], :void ],
+        # EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size);
+        [ :ecore_exe_send, [ :ecore_exe, :pointer, :int ], :bool ],
+        # EAPI void ecore_exe_close_stdin(Ecore_Exe *exe);
+        [ :ecore_exe_close_stdin, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
+        [ :ecore_exe_auto_limits_set, [ :ecore_exe, :int, :int, :int, :int ], :void ],
+        # EAPI Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags);
+        [ :ecore_exe_event_data_get, [ :ecore_exe, :ecore_exe_flags ], :ecore_exe_event_data ],
+        # EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
+        [ :ecore_exe_event_data_free, [ :ecore_exe_event_data ], :void ],
+        # EAPI void *ecore_exe_free(Ecore_Exe *exe);
+        [ :ecore_exe_free, [ :ecore_exe ], :pointer ],
+        # EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
+        [ :ecore_exe_pid_get, [ :ecore_exe ], :ulong ],
+        # EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
+        [ :ecore_exe_tag_set, [ :ecore_exe, :string ], :void ],
+        # EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe);
+        [ :ecore_exe_tag_get, [ :ecore_exe ], :string ],
+        # EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
+        [ :ecore_exe_cmd_get, [ :ecore_exe ], :string ],
+        # EAPI void *ecore_exe_data_get(const Ecore_Exe *exe);
+        [ :ecore_exe_data_get, [ :ecore_exe ], :pointer ],
+        # EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data);
+        [ :ecore_exe_data_set, [ :ecore_exe, :pointer ], :pointer ],
+        # EAPI Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe);
+        [ :ecore_exe_flags_get, [ :ecore_exe ], :ecore_exe_flags ],
+        # EAPI void ecore_exe_pause(Ecore_Exe *exe);
+        [ :ecore_exe_pause, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_continue(Ecore_Exe *exe);
+        [ :ecore_exe_continue, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_interrupt(Ecore_Exe *exe);
+        [ :ecore_exe_interrupt, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_quit(Ecore_Exe *exe);
+        [ :ecore_exe_quit, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_terminate(Ecore_Exe *exe);
+        [ :ecore_exe_terminate, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_kill(Ecore_Exe *exe);
+        [ :ecore_exe_kill, [ :ecore_exe ], :void ],
+        # EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
+        [ :ecore_exe_signal, [ :ecore_exe, :int ], :void ],
+        # EAPI void ecore_exe_hup(Ecore_Exe *exe);
+        [ :ecore_exe_hup, [ :ecore_exe ], :void ],
+        # EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data);
+        [ :ecore_main_fd_handler_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :pointer, :ecore_fd_cb, :pointer ], :ecore_fd_handler ],
+        # EAPI Ecore_Fd_Handler *ecore_main_fd_handler_file_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data);
+        [ :ecore_main_fd_handler_file_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :pointer, :ecore_fd_cb, :pointer ], :ecore_fd_handler ],
+        # EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data);
+        [ :ecore_main_fd_handler_prepare_callback_set, [ :ecore_fd_handler, :ecore_fd_prep_cb, :pointer ], :void ],
+        # EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
+        [ :ecore_main_fd_handler_del, [ :ecore_fd_handler ], :pointer ],
+        # EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
+        [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler ], :int ],
+        # EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
+        [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler, :ecore_fd_handler_flags ], :bool ],
+        # EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
+        [ :ecore_main_fd_handler_active_set, [ :ecore_fd_handler, :ecore_fd_handler_flags ], :void ],
+        # EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
+        [ :ecore_main_win32_handler_add, [ :pointer, :ecore_win32_handle_cb, :pointer ], :ecore_win32_handler ],
+        # EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
+        [ :ecore_main_win32_handler_del, [ :ecore_win32_handler ], :pointer ],
+        # EAPI double ecore_time_get(void);
+        [ :ecore_time_get, [  ], :double ],
+        # EAPI double ecore_time_unix_get(void);
+        [ :ecore_time_unix_get, [  ], :double ],
+        # EAPI double ecore_loop_time_get(void);
+        [ :ecore_loop_time_get, [  ], :double ],
+        # EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data);
+        [ :ecore_thread_run, [ :ecore_thread_cb, :ecore_thread_cb, :ecore_thread_cb, :pointer ], :ecore_thread ],
+        # EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data, Eina_Bool try_no_queue);
+        [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :pointer, :bool ],
+            :ecore_thread ],
+        # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
+        [ :ecore_thread_cancel, [ :ecore_thread ], :bool ],
+        # EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);
+        [ :ecore_thread_check, [ :ecore_thread ], :bool ],
+        # EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data);
+        [ :ecore_thread_feedback, [ :ecore_thread, :pointer ], :bool ],
+        # EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread);
+        [ :ecore_thread_reschedule, [ :ecore_thread ], :bool ],
+        # EAPI int ecore_thread_active_get(void);
+        [ :ecore_thread_active_get, [  ], :int ],
+        # EAPI int ecore_thread_pending_get(void);
+        [ :ecore_thread_pending_get, [  ], :int ],
+        # EAPI int ecore_thread_pending_feedback_get(void);
+        [ :ecore_thread_pending_feedback_get, [  ], :int ],
+        # EAPI int ecore_thread_pending_total_get(void);
+        [ :ecore_thread_pending_total_get, [  ], :int ],
+        # EAPI int ecore_thread_max_get(void);
+        [ :ecore_thread_max_get, [  ], :int ],
+        # EAPI void ecore_thread_max_set(int num);
+        [ :ecore_thread_max_set, [ :int ], :void ],
+        # EAPI void ecore_thread_max_reset(void);
+        [ :ecore_thread_max_reset, [  ], :void ],
+        # EAPI int ecore_thread_available_get(void);
+        [ :ecore_thread_available_get, [  ], :int ],
+        # EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
+        [ :ecore_thread_local_data_add, [ :ecore_thread, :string, :pointer, :eina_free_cb, :bool ], :bool ],
+        # EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb);
+        [ :ecore_thread_local_data_set, [ :ecore_thread, :string, :pointer, :eina_free_cb ], :pointer ],
+        # EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
+        [ :ecore_thread_local_data_find, [ :ecore_thread, :string ], :pointer ],
+        # EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key);
+        [ :ecore_thread_local_data_del, [ :ecore_thread, :string ], :bool ],
+        # EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
+        [ :ecore_thread_global_data_add, [ :string, :pointer, :eina_free_cb, :bool ], :bool ],
+        # EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb);
+        [ :ecore_thread_global_data_set, [ :string, :pointer, :eina_free_cb ], :pointer ],
+        # EAPI void *ecore_thread_global_data_find(const char *key);
+        [ :ecore_thread_global_data_find, [ :string ], :pointer ],
+        # EAPI Eina_Bool ecore_thread_global_data_del(const char *key);
+        [ :ecore_thread_global_data_del, [ :string ], :bool ],
+        # EAPI void *ecore_thread_global_data_wait(const char *key, double seconds);
+        [ :ecore_thread_global_data_wait, [ :string, :double ], :pointer ],
+        # EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
+        [ :ecore_pipe_add, [ :ecore_pipe_cb, :pointer ], :ecore_pipe ],
+        # EAPI Ecore_Pipe *ecore_pipe_full_add(Ecore_Pipe_Cb handler, const void *data, int fd_read, int fd_write, Eina_Bool read_survive_fork, Eina_Bool write_survive_fork);
+        [ :ecore_pipe_full_add, [ :ecore_pipe_cb, :pointer, :int, :int, :bool, :bool ], :ecore_pipe ],
+        # EAPI void *ecore_pipe_del(Ecore_Pipe *p);
+        [ :ecore_pipe_del, [ :ecore_pipe ], :pointer ],
+        # EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes);
+        [ :ecore_pipe_write, [ :ecore_pipe, :pointer, :uint ], :bool ],
+        # EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
+        [ :ecore_pipe_write_close, [ :ecore_pipe ], :void ],
+        # EAPI void ecore_pipe_read_close(Ecore_Pipe *p);
+        [ :ecore_pipe_read_close, [ :ecore_pipe ], :void ],
+        # EAPI int ecore_pipe_read_fd(Ecore_Pipe *p);
+        [ :ecore_pipe_read_fd, [ :ecore_pipe ], :int ],
+        # EAPI int ecore_pipe_write_fd(Ecore_Pipe *p);
+        [ :ecore_pipe_write_fd, [ :ecore_pipe ], :int ],
+        # EAPI void ecore_pipe_thaw(Ecore_Pipe *p);
+        [ :ecore_pipe_thaw, [ :ecore_pipe ], :void ],
+        # EAPI void ecore_pipe_freeze(Ecore_Pipe *p);
+        [ :ecore_pipe_freeze, [ :ecore_pipe ], :void ],
+        # EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
+        [ :ecore_pipe_wait, [ :ecore_pipe, :int, :double ], :int ],
+        # EAPI void ecore_app_args_set(int argc, const char **argv);
+        [ :ecore_app_args_set, [ :int, :pointer ], :void ],
+        # EAPI void ecore_app_args_get(int *argc, char ***argv);
+        [ :ecore_app_args_get, [ :pointer, :pointer ], :void ],
+        # EAPI void ecore_app_restart(void);
+        [ :ecore_app_restart, [  ], :void ],
+        # EAPI void ecore_app_no_system_modules(void);
+        [ :ecore_app_no_system_modules, [  ], :void ],
+        # EAPI void ecore_throttle_adjust(double amount);
+        [ :ecore_throttle_adjust, [ :double ], :void ],
+        # EAPI double ecore_throttle_get(void);
+        [ :ecore_throttle_get, [  ], :double ],
+        # EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
+        [ :ecore_poller_poll_interval_set, [ :ecore_poller_type, :double ], :void ],
+        # EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
+        [ :ecore_poller_poll_interval_get, [ :ecore_poller_type ], :double ],
+        # EAPI void ecore_animator_frametime_set(double frametime);
+        [ :ecore_animator_frametime_set, [ :double ], :void ],
+        # EAPI double ecore_animator_frametime_get(void);
+        [ :ecore_animator_frametime_get, [  ], :double ],
+        # EAPI double ecore_animator_pos_map(double pos, Ecore_Pos_Map map, double v1, double v2);
+        [ :ecore_animator_pos_map, [ :double, :ecore_pos_map, :double, :double ], :double ],
+        # EAPI double ecore_animator_pos_map_n(double pos, Ecore_Pos_Map map, int v_size, double v[]);
+        # FIXME
+        # EAPI void ecore_animator_source_set(Ecore_Animator_Source source);
+        [ :ecore_animator_source_set, [ :ecore_animator_source ], :void ],
+        # EAPI Ecore_Animator_Source ecore_animator_source_get(void);
+        [ :ecore_animator_source_get, [  ], :ecore_animator_source ],
+        # EAPI void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data);
+        [ :ecore_animator_custom_source_tick_begin_callback_set, [ :ecore_cb, :pointer ], :void ],
+        # EAPI void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data);
+        [ :ecore_animator_custom_source_tick_end_callback_set, [ :ecore_cb, :pointer ], :void ],
+        # EAPI void ecore_animator_custom_tick(void);
+        [ :ecore_animator_custom_tick, [  ], :void ],
+        # EAPI double ecore_timer_precision_get(void);
+        [ :ecore_timer_precision_get, [  ], :double ],
+        # EAPI void ecore_timer_precision_set(double precision);
+        [ :ecore_timer_precision_set, [ :double ], :void ],
+        # EAPI char *ecore_timer_dump(void);
+        [ :ecore_timer_dump, [  ], :string ],
+        # EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
+        [ :ecore_poller_poller_interval_set, [ :pointer, :int ], :bool ],
+        # EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller);
+        [ :ecore_poller_poller_interval_get, [ :pointer ], :int ],
+        # EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
+        [ :ecore_poller_add, [ :ecore_poller_type, :int, :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_poller_del(Ecore_Poller *poller);
+        [ :ecore_poller_del, [ :pointer ], :pointer ],
+        # EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_animator_add, [ :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
+        [ :ecore_animator_timeline_add, [ :double, :ecore_timeline_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_animator_del(Ecore_Animator *animator);
+        [ :ecore_animator_del, [ :pointer ], :pointer ],
+        # EAPI void ecore_animator_freeze(Ecore_Animator *animator);
+        [ :ecore_animator_freeze, [ :pointer ], :void ],
+        # EAPI void ecore_animator_thaw(Ecore_Animator *animator);
+        [ :ecore_animator_thaw, [ :pointer ], :void ],
+        # EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
+        [ :ecore_timer_add, [ :double, :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
+        [ :ecore_timer_loop_add, [ :double, :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_timer_del(Ecore_Timer *timer);
+        [ :ecore_timer_del, [ :pointer ], :pointer ],
+        # EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
+        [ :ecore_timer_interval_set, [ :pointer, :double ], :void ],
+        # EAPI double ecore_timer_interval_get(Ecore_Timer *timer);
+        [ :ecore_timer_interval_get, [ :pointer ], :double ],
+        # EAPI void ecore_timer_freeze(Ecore_Timer *timer);
+        [ :ecore_timer_freeze, [ :pointer ], :void ],
+        # EAPI void ecore_timer_thaw(Ecore_Timer *timer);
+        [ :ecore_timer_thaw, [ :pointer ], :void ],
+        # EAPI void ecore_timer_delay(Ecore_Timer *timer, double add);
+        [ :ecore_timer_delay, [ :pointer, :double ], :void ],
+        # EAPI void ecore_timer_reset(Ecore_Timer *timer);
+        [ :ecore_timer_reset, [ :pointer ], :void ],
+        # EAPI double ecore_timer_pending_get(Ecore_Timer *timer);
+        [ :ecore_timer_pending_get, [ :pointer ], :double ],
+        # EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idler_add, [ :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_idler_del(Ecore_Idler *idler);
+        [ :ecore_idler_del, [ :pointer ], :pointer ],
+        # EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idle_enterer_add, [ :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idle_enterer_before_add, [ :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
+        [ :ecore_idle_enterer_del, [ :pointer ], :pointer ],
+        # EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idle_exiter_add, [ :ecore_task_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
+        [ :ecore_idle_exiter_del, [ :pointer ], :pointer ],
+        # EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
+        [ :ecore_job_add, [ :ecore_cb, :pointer ], :pointer ],
+        # EAPI void *ecore_job_del(Ecore_Job *obj);
+        [ :ecore_job_del, [ :pointer ], :pointer ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/ecore_evas.rb b/lib/efl/native/ecore_evas.rb
index 0c0dca4..78f8634 100644
--- a/lib/efl/native/ecore_evas.rb
+++ b/lib/efl/native/ecore_evas.rb
@@ -90,10 +90,9 @@ module Efl
         attach_variable :ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE, :int
         # defined in efl/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
         # EAPI extern int ECORE_EVAS_EXTN_CLIENT_ADD;
-        #attach_variable :ECORE_EVAS_EXTN_CLIENT_ADD, :int
+        # attach_variable :ECORE_EVAS_EXTN_CLIENT_ADD, :int
         # EAPI extern int ECORE_EVAS_EXTN_CLIENT_DEL;
-        #attach_variable :ECORE_EVAS_EXTN_CLIENT_DEL, :int
-        #
+        # attach_variable :ECORE_EVAS_EXTN_CLIENT_DEL, :int
         #
         # FUNCTIONS
         fcts = [
@@ -250,10 +249,49 @@ module Efl
         # EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
         [ :ecore_evas_gl_x11_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
-        [ :ecore_evas_gl_x11_pre_post_swap_callback_set, [ :ecore_evas, :pointer, (callback [:pointer, :evas], :void),
-            (callback [:pointer, :evas], :void) ], :void ],
+        # FIXME
+        # EAPI Ecore_Evas *ecore_evas_gl_x11_pixmap_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
+        [ :ecore_evas_gl_x11_pixmap_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_X_Pixmap ecore_evas_gl_x11_pixmap_get(const Ecore_Evas *ee);
+        [ :ecore_evas_gl_x11_pixmap_get, [ :ecore_evas ], :uint ],
+        # EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
+        [ :ecore_evas_xrender_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee);
+        [ :ecore_evas_xrender_x11_window_get, [ :ecore_evas ], :uint ],
+        # EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
+        [ :ecore_evas_xrender_x11_direct_resize_set, [ :ecore_evas, :bool ], :void ],
+        # EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee);
+        [ :ecore_evas_xrender_x11_direct_resize_get, [ :ecore_evas ], :bool ],
+        # EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
+        [ :ecore_evas_xrender_x11_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
+        # EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
+        [ :ecore_evas_software_x11_8_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee);
+        [ :ecore_evas_software_x11_8_window_get, [ :ecore_evas ], :uint ],
+        # EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee);
+        [ :ecore_evas_software_x11_8_subwindow_get, [ :ecore_evas ], :uint ],
+        # EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
+        [ :ecore_evas_software_x11_8_direct_resize_set, [ :ecore_evas, :bool ], :void ],
+        # EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee);
+        [ :ecore_evas_software_x11_8_direct_resize_get, [ :ecore_evas ], :bool ],
+        # EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
+        [ :ecore_evas_software_x11_8_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
+        # EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
+        [ :ecore_evas_software_x11_16_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee);
+        [ :ecore_evas_software_x11_16_window_get, [ :ecore_evas ], :uint ],
+        # EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
+        [ :ecore_evas_software_x11_16_direct_resize_set, [ :ecore_evas, :bool ], :void ],
+        # EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee);
+        [ :ecore_evas_software_x11_16_direct_resize_get, [ :ecore_evas ], :bool ],
+        # EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
+        [ :ecore_evas_software_x11_16_extra_event_window_add, [ :ecore_evas, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h);
         [ :ecore_evas_fb_new, [ :string, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w, int h);
+        [ :ecore_evas_directfb_new, [ :string, :int, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_DirectFB_Window *ecore_evas_directfb_window_get(const Ecore_Evas *ee);
+        [ :ecore_evas_directfb_window_get, [ :ecore_evas ], :ecore_directfb_window ],
         # EAPI Ecore_Evas *ecore_evas_wayland_shm_new(const char *disp_name, unsigned int parent, int x, int y, int w, int h, Eina_Bool frame);
         [ :ecore_evas_wayland_shm_new, [ :string, :uint, :int, :int, :int, :int, :bool ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_wayland_egl_new(const char *disp_name, unsigned int parent, int x, int y, int w, int h, Eina_Bool frame);
@@ -273,26 +311,31 @@ module Efl
         # EAPI Ecore_Evas *ecore_evas_buffer_new(int w, int h);
         [ :ecore_evas_buffer_new, [ :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc_func) (void *data, int size), void (*free_func) (void *data, void *pix), const void *data);
-        [ :ecore_evas_buffer_allocfunc_new, [ :int, :int, (callback [:pointer,:int], :pointer), (callback [:pointer,:pointer], :void),
-            :pointer ], :ecore_evas ],
+        # FIXME
         # EAPI const void *ecore_evas_buffer_pixels_get(Ecore_Evas *ee);
         [ :ecore_evas_buffer_pixels_get, [ :ecore_evas ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_ews_new(int x, int y, int w, int h);
         [ :ecore_evas_ews_new, [ :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Evas_Object *ecore_evas_ews_backing_store_get(const Ecore_Evas *ee);
-        [ :ecore_evas_ews_backing_store_get, [ :ecore_evas ], :evas_object ],
+        [ :ecore_evas_ews_backing_store_get, [ :ecore_evas ], :pointer ],
         # EAPI void ecore_evas_ews_delete_request(Ecore_Evas *ee);
         [ :ecore_evas_ews_delete_request, [ :ecore_evas ], :void ],
         # EAPI Evas_Object *ecore_evas_object_image_new(Ecore_Evas *ee_target);
-        [ :ecore_evas_object_image_new, [ :ecore_evas ], :evas_object ],
+        [ :ecore_evas_object_image_new, [ :ecore_evas ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_object_ecore_evas_get(Evas_Object *obj);
-        [ :ecore_evas_object_ecore_evas_get, [ :evas_object ], :ecore_evas ],
+        [ :ecore_evas_object_ecore_evas_get, [ :pointer ], :ecore_evas ],
         # EAPI Evas *ecore_evas_object_evas_get(Evas_Object *obj);
-        [ :ecore_evas_object_evas_get, [ :evas_object ], :evas ],
+        [ :ecore_evas_object_evas_get, [ :pointer ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_gdi_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
         [ :ecore_evas_software_gdi_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
         [ :ecore_evas_software_ddraw_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_software_16_ddraw_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_direct3d_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_direct3d_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_gl_glew_new, [ :ecore_win32_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Win32_Window *ecore_evas_win32_window_get(const Ecore_Evas *ee);
         [ :ecore_evas_win32_window_get, [ :ecore_evas ], :ecore_win32_window ],
         # EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
@@ -301,6 +344,18 @@ module Efl
         [ :ecore_evas_sdl16_new, [ :pointer, :int, :int, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_gl_sdl_new(const char* name, int w, int h, int fullscreen, int noframe);
         [ :ecore_evas_gl_sdl_new, [ :pointer, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_software_wince_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_software_wince_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_software_wince_fb_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_software_wince_gapi_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_software_wince_ddraw_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_Evas *ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
+        [ :ecore_evas_software_wince_gdi_new, [ :ecore_wince_window, :int, :int, :int, :int ], :ecore_evas ],
+        # EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee);
+        [ :ecore_evas_software_wince_window_get, [ :ecore_evas ], :ecore_wince_window ],
         # EAPI Ecore_Evas *ecore_evas_cocoa_new(Ecore_Cocoa_Window *parent, int x, int y, int w, int h);
         [ :ecore_evas_cocoa_new, [ :ecore_cocoa_window, :int, :int, :int, :int ], :ecore_evas ],
         # EAPI Ecore_Evas *ecore_evas_psl1ght_new(const char* name, int w, int h);
@@ -308,7 +363,7 @@ module Efl
         # EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee);
         [ :ecore_evas_engine_name_get, [ :ecore_evas ], :string ],
         # EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
-        [ :ecore_evas_ecore_evas_get, [ :evas ], :ecore_evas ],
+        [ :ecore_evas_ecore_evas_get, [ :pointer ], :ecore_evas ],
         # EAPI void ecore_evas_free(Ecore_Evas *ee);
         [ :ecore_evas_free, [ :ecore_evas ], :void ],
         # EAPI void *ecore_evas_data_get(const Ecore_Evas *ee, const char *key);
@@ -348,7 +403,7 @@ module Efl
         # EAPI void ecore_evas_callback_state_change_set(Ecore_Evas *ee, Ecore_Evas_Event_Cb func);
         [ :ecore_evas_callback_state_change_set, [ :ecore_evas, :ecore_evas_event_cb ], :void ],
         # EAPI Evas *ecore_evas_get(const Ecore_Evas *ee);
-        [ :ecore_evas_get, [ :ecore_evas ], :evas ],
+        [ :ecore_evas_get, [ :ecore_evas ], :pointer ],
         # EAPI void ecore_evas_managed_move(Ecore_Evas *ee, int x, int y);
         [ :ecore_evas_managed_move, [ :ecore_evas, :int, :int ], :void ],
         # EAPI void ecore_evas_shaped_set(Ecore_Evas *ee, Eina_Bool shaped);
@@ -380,9 +435,9 @@ module Efl
         # EAPI void ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, int hot_y);
         [ :ecore_evas_cursor_set, [ :ecore_evas, :string, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_cursor_get(const Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y);
-        [ :ecore_evas_cursor_get, [ :ecore_evas, :evas_object, :pointer, :pointer, :pointer ], :void ],
+        [ :ecore_evas_cursor_get, [ :ecore_evas, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
-        [ :ecore_evas_object_cursor_set, [ :ecore_evas, :evas_object, :int, :int, :int ], :void ],
+        [ :ecore_evas_object_cursor_set, [ :ecore_evas, :pointer, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_override_set(Ecore_Evas *ee, Eina_Bool on);
         [ :ecore_evas_override_set, [ :ecore_evas, :bool ], :void ],
         # EAPI Eina_Bool ecore_evas_override_get(const Ecore_Evas *ee);
@@ -422,11 +477,11 @@ module Efl
         # EAPI Eina_Bool ecore_evas_draw_frame_get(const Ecore_Evas *ee);
         [ :ecore_evas_draw_frame_get, [ :ecore_evas ], :bool ],
         # EAPI Eina_Bool ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags);
-        [ :ecore_evas_object_associate, [ :ecore_evas, :evas_object, :ecore_evas_object_associate_flags ], :bool ],
+        [ :ecore_evas_object_associate, [ :ecore_evas, :pointer, :ecore_evas_object_associate_flags ], :bool ],
         # EAPI Eina_Bool ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj);
-        [ :ecore_evas_object_dissociate, [ :ecore_evas, :evas_object ], :bool ],
+        [ :ecore_evas_object_dissociate, [ :ecore_evas, :pointer ], :bool ],
         # EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee);
-        [ :ecore_evas_object_associate_get, [ :ecore_evas ], :evas_object ],
+        [ :ecore_evas_object_associate_get, [ :ecore_evas ], :pointer ],
         # EAPI unsigned char ecore_getopt_callback_ecore_evas_list_engines(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
         [ :ecore_getopt_callback_ecore_evas_list_engines, [ :ecore_getopt, :ecore_getopt_desc, :string, :pointer, :ecore_getopt_value ], :uchar ],
         # EAPI Eina_List *ecore_evas_ecore_evas_list_get(void);
@@ -458,11 +513,11 @@ module Efl
         # EAPI Ecore_Evas *ecore_evas_ews_ecore_evas_get(void);
         [ :ecore_evas_ews_ecore_evas_get, [  ], :ecore_evas ],
         # EAPI Evas *ecore_evas_ews_evas_get(void);
-        [ :ecore_evas_ews_evas_get, [  ], :evas ],
+        [ :ecore_evas_ews_evas_get, [  ], :pointer ],
         # EAPI Evas_Object *ecore_evas_ews_background_get(void);
-        [ :ecore_evas_ews_background_get, [  ], :evas_object ],
+        [ :ecore_evas_ews_background_get, [  ], :pointer ],
         # EAPI void ecore_evas_ews_background_set(Evas_Object *o);
-        [ :ecore_evas_ews_background_set, [ :evas_object ], :void ],
+        [ :ecore_evas_ews_background_set, [ :pointer ], :void ],
         # EAPI const Eina_List *ecore_evas_ews_children_get(void);
         [ :ecore_evas_ews_children_get, [  ], :eina_list ],
         # EAPI void ecore_evas_ews_manager_set(const void *manager);
@@ -474,13 +529,13 @@ module Efl
         # EAPI Eina_Bool ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
         [ :ecore_evas_extn_socket_listen, [ :ecore_evas, :string, :int, :bool ], :bool ],
         # EAPI void ecore_evas_extn_plug_object_data_lock(Evas_Object *obj);
-        [ :ecore_evas_extn_plug_object_data_lock, [ :evas_object ], :void ],
+        [ :ecore_evas_extn_plug_object_data_lock, [ :pointer ], :void ],
         # EAPI void ecore_evas_extn_plug_object_data_unlock(Evas_Object *obj);
-        [ :ecore_evas_extn_plug_object_data_unlock, [ :evas_object ], :void ],
+        [ :ecore_evas_extn_plug_object_data_unlock, [ :pointer ], :void ],
         # EAPI Evas_Object *ecore_evas_extn_plug_new(Ecore_Evas *ee_target);
-        [ :ecore_evas_extn_plug_new, [ :ecore_evas ], :evas_object ],
+        [ :ecore_evas_extn_plug_new, [ :ecore_evas ], :pointer ],
         # EAPI Eina_Bool ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :ecore_evas_extn_plug_connect, [ :evas_object, :string, :int, :bool ], :bool ],
+        [ :ecore_evas_extn_plug_connect, [ :pointer, :string, :int, :bool ], :bool ],
         # EAPI void ecore_evas_pointer_xy_get(const Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y);
         [ :ecore_evas_pointer_xy_get, [ :ecore_evas, :pointer, :pointer ], :void ],
         # EAPI Eina_Bool ecore_evas_pointer_warp(const Ecore_Evas *ee, Evas_Coord x, Evas_Coord y);
diff --git a/lib/efl/native/ecore_evas_types.rb b/lib/efl/native/ecore_evas_types.rb
new file mode 100644
index 0000000..8e71969
--- /dev/null
+++ b/lib/efl/native/ecore_evas_types.rb
@@ -0,0 +1,62 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+#
+module Efl
+    #
+    module EcoreEvasTypes
+        #
+        FCT_PREFIX = 'ecore_evas_types_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'ecore_evas.so.1'
+        #
+        # TYPEDEFS
+        # typedef unsigned int Ecore_X_Window;
+        typedef :uint, :ecore_x_window
+        # typedef unsigned int Ecore_X_Pixmap;
+        typedef :uint, :ecore_x_pixmap
+        # typedef struct _Ecore_DirectFB_Window Ecore_DirectFB_Window;
+        typedef :pointer, :ecore_directfb_window
+        # typedef struct _Ecore_Win32_Window Ecore_Win32_Window;
+        typedef :pointer, :ecore_win32_window
+        # typedef struct _Ecore_WinCE_Window Ecore_WinCE_Window;
+        typedef :pointer, :ecore_wince_window
+        # typedef struct _Ecore_Cocoa_Window Ecore_Cocoa_Window;
+        typedef :pointer, :ecore_cocoa_window
+        # typedef struct _Ecore_Evas Ecore_Evas;
+        typedef :pointer, :ecore_evas
+        # typedef struct _Ecore_Wl_Window Ecore_Wl_Window;
+        typedef :pointer, :ecore_wl_window
+        # typedef struct _Ecore_Getopt Ecore_Getopt;
+        typedef :pointer, :ecore_getopt
+        # typedef struct _Ecore_Getopt_Desc Ecore_Getopt_Desc;
+        typedef :pointer, :ecore_getopt_desc
+        # typedef union _Ecore_Getopt_Value Ecore_Getopt_Value;
+        typedef :pointer, :ecore_getopt_value
+        # typedef uintptr_t Ecore_Window;
+        typedef :pointer, :ecore_window
+        #
+        # CALLBACKS
+        # typedef void (*Ecore_Evas_Event_Cb) (Ecore_Evas *ee);
+        callback :ecore_evas_event_cb, [ :ecore_evas ], :void
+        #
+        # FUNCTIONS
+        fcts = [
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/lib/efl/native/edje.rb b/lib/efl/native/edje.rb
index 1c726eb..579fe7e 100644
--- a/lib/efl/native/edje.rb
+++ b/lib/efl/native/edje.rb
@@ -130,13 +130,13 @@ module Efl
         #
         # CALLBACKS
         # typedef void (*Edje_Signal_Cb) (void *data, Evas_Object *obj, const char *emission, const char *source);
-        callback :edje_message_handler_cb, [ :pointer, :evas_object, :edje_message_type, :int, :pointer ], :void
+        callback :edje_signal_cb, [ :pointer, :pointer, :string, :string ], :void
         # typedef void (*Edje_Text_Filter_Cb) (void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text);
-        callback :edje_text_filter_cb, [ :pointer, :evas_object, :string, :edje_text_filter_type, :pointer ], :void
+        callback :edje_text_filter_cb, [ :pointer, :pointer, :string, :edje_text_filter_type, :pointer ], :void
         # typedef void (*Edje_Markup_Filter_Cb) (void *data, Evas_Object *obj, const char *part, char **text);
-        callback :edje_markup_filter_cb, [ :pointer, :evas_object, :string, :pointer ], :void
+        callback :edje_markup_filter_cb, [ :pointer, :pointer, :string, :pointer ], :void
         # typedef Evas_Object *(*Edje_Item_Provider_Cb) (void *data, Evas_Object *obj, const char *part, const char *item);
-        callback :edje_item_provider_cb, [ :pointer, :evas_object, :string, :string ], :evas_object
+        callback :edje_item_provider_cb, [ :pointer, :pointer, :string, :string ], :pointer
         # typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, const char *part);
         callback :edje_text_change_cb, [ :pointer, :pointer, :string ], :void
         # typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg);
diff --git a/lib/efl/native/eet.rb b/lib/efl/native/eet.rb
index 7b24bb1..02c6ea9 100644
--- a/lib/efl/native/eet.rb
+++ b/lib/efl/native/eet.rb
@@ -242,8 +242,7 @@ module Efl
         # EAPI const char *eet_data_descriptor_name_get(const Eet_Data_Descriptor *edd);
         [ :eet_data_descriptor_name_get, [ :eet_data_descriptor ], :string ],
         # EAPI void eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, const char *name, int type, int group_type, int offset, /* int count_offset, */
-        # int count, const char *counter_name, Eet_Data_Descriptor *subtype);
-        [ :eet_data_descriptor_element_add, [ :eet_data_descriptor, :string, :int, :int, :int, :int, :string, :eet_data_descriptor ], :void ],
+        # FIXME
         # EAPI void * eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name);
         [ :eet_data_read, [ :eet_file, :eet_data_descriptor, :string ], :pointer ],
         # EAPI int eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const void *data, int compress);
diff --git a/lib/efl/native/elm/elm_actionslider.rb b/lib/efl/native/elm/elm_actionslider.rb
index 93c9317..d09cb3b 100644
--- a/lib/efl/native/elm/elm_actionslider.rb
+++ b/lib/efl/native/elm/elm_actionslider.rb
@@ -29,21 +29,21 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_actionslider_add(Evas_Object *parent);
-        [ :elm_actionslider_add, [ :evas_object ], :evas_object ],
-        # EAPI const char *elm_actionslider_selected_label_get(const Evas_Object *obj);
-        [ :elm_actionslider_selected_label_get, [ :evas_object ], :string ],
+        [ :elm_actionslider_add, [ :pointer ], :pointer ],
         # EAPI void elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
-        [ :elm_actionslider_indicator_pos_set, [ :evas_object, :elm_actionslider_pos ], :void ],
+        [ :elm_actionslider_indicator_pos_set, [ :pointer, :elm_actionslider_pos ], :void ],
         # EAPI Elm_Actionslider_Pos elm_actionslider_indicator_pos_get(const Evas_Object *obj);
-        [ :elm_actionslider_indicator_pos_get, [ :evas_object ], :elm_actionslider_pos ],
+        [ :elm_actionslider_indicator_pos_get, [ :pointer ], :elm_actionslider_pos ],
         # EAPI void elm_actionslider_magnet_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
-        [ :elm_actionslider_magnet_pos_set, [ :evas_object, :elm_actionslider_pos ], :void ],
+        [ :elm_actionslider_magnet_pos_set, [ :pointer, :elm_actionslider_pos ], :void ],
         # EAPI Elm_Actionslider_Pos elm_actionslider_magnet_pos_get(const Evas_Object *obj);
-        [ :elm_actionslider_magnet_pos_get, [ :evas_object ], :elm_actionslider_pos ],
+        [ :elm_actionslider_magnet_pos_get, [ :pointer ], :elm_actionslider_pos ],
         # EAPI void elm_actionslider_enabled_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
-        [ :elm_actionslider_enabled_pos_set, [ :evas_object, :elm_actionslider_pos ], :void ],
+        [ :elm_actionslider_enabled_pos_set, [ :pointer, :elm_actionslider_pos ], :void ],
         # EAPI Elm_Actionslider_Pos elm_actionslider_enabled_pos_get(const Evas_Object *obj);
-        [ :elm_actionslider_enabled_pos_get, [ :evas_object ], :elm_actionslider_pos ],
+        [ :elm_actionslider_enabled_pos_get, [ :pointer ], :elm_actionslider_pos ],
+        # EAPI const char *elm_actionslider_selected_label_get(const Evas_Object *obj);
+        [ :elm_actionslider_selected_label_get, [ :pointer ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_bg.rb b/lib/efl/native/elm/elm_bg.rb
index a2b9182..27d9e92 100644
--- a/lib/efl/native/elm/elm_bg.rb
+++ b/lib/efl/native/elm/elm_bg.rb
@@ -28,21 +28,21 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_bg_add(Evas_Object *parent);
-        [ :elm_bg_add, [ :evas_object ], :evas_object ],
+        [ :elm_bg_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_bg_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_bg_file_set, [ :evas_object, :string, :string ], :bool ],
+        [ :elm_bg_file_set, [ :pointer, :string, :string ], :bool ],
         # EAPI void elm_bg_file_get(const Evas_Object *obj, const char **file, const char **group);
-        [ :elm_bg_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_bg_file_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option);
-        [ :elm_bg_option_set, [ :evas_object, :elm_bg_option ], :void ],
+        [ :elm_bg_option_set, [ :pointer, :elm_bg_option ], :void ],
         # EAPI Elm_Bg_Option elm_bg_option_get(const Evas_Object *obj);
-        [ :elm_bg_option_get, [ :evas_object ], :elm_bg_option ],
+        [ :elm_bg_option_get, [ :pointer ], :elm_bg_option ],
         # EAPI void elm_bg_color_set(Evas_Object *obj, int r, int g, int b);
-        [ :elm_bg_color_set, [ :evas_object, :int, :int, :int ], :void ],
+        [ :elm_bg_color_set, [ :pointer, :int, :int, :int ], :void ],
         # EAPI void elm_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b);
-        [ :elm_bg_color_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_bg_color_get, [ :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_bg_load_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_bg_load_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_bg_load_size_set, [ :pointer, :int, :int ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_box.rb b/lib/efl/native/elm/elm_box.rb
index 92c3ed9..1916944 100644
--- a/lib/efl/native/elm/elm_box.rb
+++ b/lib/efl/native/elm/elm_box.rb
@@ -28,51 +28,51 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_box_layout_transition(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data);
+        [ :elm_box_layout_transition, [ :pointer, :evas_object_box_data, :pointer ], :void ],
+        # EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, Ecore_Cb start_layout_free_data, Evas_Object_Box_Layout end_layout, void *end_layout_data, Ecore_Cb end_layout_free_data, Ecore_Cb transition_end_cb, void *transition_end_data);
+        [ :elm_box_transition_new, [ :double, :evas_object_box_layout_cb, :pointer, :ecore_cb, :evas_object_box_layout_cb, :pointer, :ecore_cb,
+            :ecore_cb, :pointer ], :elm_box_transition ],
+        # EAPI void elm_box_transition_free(void *data);
+        [ :elm_box_transition_free, [ :pointer ], :void ],
         # EAPI Evas_Object *elm_box_add(Evas_Object *parent);
-        [ :elm_box_add, [ :evas_object ], :evas_object ],
+        [ :elm_box_add, [ :pointer ], :pointer ],
         # EAPI void elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_box_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_box_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_box_horizontal_get(const Evas_Object *obj);
-        [ :elm_box_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_box_horizontal_get, [ :pointer ], :bool ],
         # EAPI void elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_box_homogeneous_set, [ :evas_object, :bool ], :void ],
+        [ :elm_box_homogeneous_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_box_homogeneous_get(const Evas_Object *obj);
-        [ :elm_box_homogeneous_get, [ :evas_object ], :bool ],
+        [ :elm_box_homogeneous_get, [ :pointer ], :bool ],
         # EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_box_pack_start, [ :evas_object, :evas_object ], :void ],
+        [ :elm_box_pack_start, [ :pointer, :pointer ], :void ],
         # EAPI void elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_box_pack_end, [ :evas_object, :evas_object ], :void ],
+        [ :elm_box_pack_end, [ :pointer, :pointer ], :void ],
         # EAPI void elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before);
-        [ :elm_box_pack_before, [ :evas_object, :evas_object, :evas_object ], :void ],
+        [ :elm_box_pack_before, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_box_pack_after(Evas_Object *obj, Evas_Object *subobj, Evas_Object *after);
-        [ :elm_box_pack_after, [ :evas_object, :evas_object, :evas_object ], :void ],
+        [ :elm_box_pack_after, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_box_clear(Evas_Object *obj);
-        [ :elm_box_clear, [ :evas_object ], :void ],
+        [ :elm_box_clear, [ :pointer ], :void ],
         # EAPI void elm_box_unpack(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_box_unpack, [ :evas_object, :evas_object ], :void ],
+        [ :elm_box_unpack, [ :pointer, :pointer ], :void ],
         # EAPI void elm_box_unpack_all(Evas_Object *obj);
-        [ :elm_box_unpack_all, [ :evas_object ], :void ],
+        [ :elm_box_unpack_all, [ :pointer ], :void ],
+        # EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, Ecore_Cb free_data);
+        [ :elm_box_layout_set, [ :pointer, :evas_object_box_layout_cb, :pointer, :ecore_cb ], :void ],
         # EAPI Eina_List *elm_box_children_get(const Evas_Object *obj);
-        [ :elm_box_children_get, [ :evas_object ], :eina_list ],
+        [ :elm_box_children_get, [ :pointer ], :eina_list ],
         # EAPI void elm_box_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :elm_box_padding_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_box_padding_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_box_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :elm_box_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_box_padding_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_box_align_set(Evas_Object *obj, double horizontal, double vertical);
-        [ :elm_box_align_set, [ :evas_object, :double, :double ], :void ],
+        [ :elm_box_align_set, [ :pointer, :double, :double ], :void ],
         # EAPI void elm_box_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
-        [ :elm_box_align_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_box_align_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_box_recalculate(Evas_Object *obj);
-        [ :elm_box_recalculate, [ :evas_object ], :void ],
-        # EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, Ecore_Cb free_data);
-        [ :elm_box_layout_set, [ :evas_object, :evas_object_box_layout_cb, :pointer, :ecore_cb ], :void ],
-        # EAPI void elm_box_layout_transition(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data);
-        [ :elm_box_layout_transition, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
-        # EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, Ecore_Cb start_layout_free_data, Evas_Object_Box_Layout end_layout, void *end_layout_data, Ecore_Cb end_layout_free_data, Ecore_Cb transition_end_cb, void *transition_end_data);
-        [ :elm_box_transition_new, [ :double, :evas_object_box_layout_cb, :pointer, :ecore_cb, :evas_object_box_layout_cb, :pointer, :ecore_cb,
-            :ecore_cb, :pointer ], :elm_box_transition ],
-        # EAPI void elm_box_transition_free(void *data);
-        [ :elm_box_transition_free, [ :pointer ], :void ],
+        [ :elm_box_recalculate, [ :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_bubble.rb b/lib/efl/native/elm/elm_bubble.rb
index e8bba37..cc5c415 100644
--- a/lib/efl/native/elm/elm_bubble.rb
+++ b/lib/efl/native/elm/elm_bubble.rb
@@ -29,11 +29,11 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_bubble_add(Evas_Object *parent);
-        [ :elm_bubble_add, [ :evas_object ], :evas_object ],
+        [ :elm_bubble_add, [ :pointer ], :pointer ],
         # EAPI void elm_bubble_pos_set(Evas_Object *obj, Elm_Bubble_Pos pos);
-        [ :elm_bubble_pos_set, [ :evas_object, :elm_bubble_pos ], :void ],
+        [ :elm_bubble_pos_set, [ :pointer, :elm_bubble_pos ], :void ],
         # EAPI Elm_Bubble_Pos elm_bubble_pos_get(const Evas_Object *obj);
-        [ :elm_bubble_pos_get, [ :evas_object ], :elm_bubble_pos ],
+        [ :elm_bubble_pos_get, [ :pointer ], :elm_bubble_pos ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_button.rb b/lib/efl/native/elm/elm_button.rb
index 8305b7c..ffc560d 100644
--- a/lib/efl/native/elm/elm_button.rb
+++ b/lib/efl/native/elm/elm_button.rb
@@ -24,19 +24,19 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_button_add(Evas_Object *parent);
-        [ :elm_button_add, [ :evas_object ], :evas_object ],
+        [ :elm_button_add, [ :pointer ], :pointer ],
         # EAPI void elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on);
-        [ :elm_button_autorepeat_set, [ :evas_object, :bool ], :void ],
+        [ :elm_button_autorepeat_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj);
-        [ :elm_button_autorepeat_get, [ :evas_object ], :bool ],
+        [ :elm_button_autorepeat_get, [ :pointer ], :bool ],
         # EAPI void elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, double t);
-        [ :elm_button_autorepeat_initial_timeout_set, [ :evas_object, :double ], :void ],
+        [ :elm_button_autorepeat_initial_timeout_set, [ :pointer, :double ], :void ],
         # EAPI double elm_button_autorepeat_initial_timeout_get(const Evas_Object *obj);
-        [ :elm_button_autorepeat_initial_timeout_get, [ :evas_object ], :double ],
+        [ :elm_button_autorepeat_initial_timeout_get, [ :pointer ], :double ],
         # EAPI void elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, double t);
-        [ :elm_button_autorepeat_gap_timeout_set, [ :evas_object, :double ], :void ],
+        [ :elm_button_autorepeat_gap_timeout_set, [ :pointer, :double ], :void ],
         # EAPI double elm_button_autorepeat_gap_timeout_get(const Evas_Object *obj);
-        [ :elm_button_autorepeat_gap_timeout_get, [ :evas_object ], :double ],
+        [ :elm_button_autorepeat_gap_timeout_get, [ :pointer ], :double ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_calendar.rb b/lib/efl/native/elm/elm_calendar.rb
index cf9bee2..4a64009 100644
--- a/lib/efl/native/elm/elm_calendar.rb
+++ b/lib/efl/native/elm/elm_calendar.rb
@@ -53,44 +53,50 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]);
+        # FIXME
+        # EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark);
+        [ :elm_calendar_mark_del, [ :elm_calendar_mark ], :void ],
         # EAPI Evas_Object *elm_calendar_add(Evas_Object *parent);
-        [ :elm_calendar_add, [ :evas_object ], :evas_object ],
+        [ :elm_calendar_add, [ :pointer ], :pointer ],
         # EAPI const char **elm_calendar_weekdays_names_get(const Evas_Object *obj);
-        [ :elm_calendar_weekdays_names_get, [ :evas_object ], :pointer ],
-        # EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]);
-        [ :elm_calendar_weekdays_names_set, [ :evas_object, :pointer ], :void ],
+        [ :elm_calendar_weekdays_names_get, [ :pointer ], :pointer ],
+        # EAPI void elm_calendar_interval_set(Evas_Object *obj, double interval);
+        [ :elm_calendar_interval_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_calendar_interval_get(const Evas_Object *obj);
+        [ :elm_calendar_interval_get, [ :pointer ], :double ],
         # EAPI void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max);
-        [ :elm_calendar_min_max_year_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_calendar_min_max_year_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max);
-        [ :elm_calendar_min_max_year_get, [ :evas_object, :pointer, :pointer ], :void ],
-        # EAPI void elm_calendar_select_mode_set(Evas_Object *obj, Elm_Calendar_Select_Mode mode);
-        [ :elm_calendar_select_mode_set, [ :evas_object, :_elm_calendar_select_mode ], :void ],
-        # EAPI Elm_Calendar_Select_Mode elm_calendar_select_mode_get(const Evas_Object *obj);
-        [ :elm_calendar_select_mode_get, [ :evas_object ], :_elm_calendar_select_mode ],
+        [ :elm_calendar_min_max_year_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time);
-        [ :elm_calendar_selected_time_set, [ :evas_object, :pointer ], :void ],
+        [ :elm_calendar_selected_time_set, [ :pointer, :pointer ], :void ],
         # EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time);
-        [ :elm_calendar_selected_time_get, [ :evas_object, :pointer ], :bool ],
+        [ :elm_calendar_selected_time_get, [ :pointer, :pointer ], :bool ],
         # EAPI void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func);
-        [ :elm_calendar_format_function_set, [ :evas_object, :elm_calendar_format_cb ], :void ],
+        [ :elm_calendar_format_function_set, [ :pointer, :elm_calendar_format_cb ], :void ],
         # EAPI Elm_Calendar_Mark *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat);
-        [ :elm_calendar_mark_add, [ :evas_object, :string, :pointer, :_elm_calendar_mark_repeat_type ], :elm_calendar_mark ],
-        # EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark);
-        [ :elm_calendar_mark_del, [ :elm_calendar_mark ], :void ],
+        [ :elm_calendar_mark_add, [ :pointer, :string, :pointer, :_elm_calendar_mark_repeat_type ], :elm_calendar_mark ],
         # EAPI void elm_calendar_marks_clear(Evas_Object *obj);
-        [ :elm_calendar_marks_clear, [ :evas_object ], :void ],
+        [ :elm_calendar_marks_clear, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_calendar_marks_get(const Evas_Object *obj);
-        [ :elm_calendar_marks_get, [ :evas_object ], :eina_list ],
+        [ :elm_calendar_marks_get, [ :pointer ], :eina_list ],
         # EAPI void elm_calendar_marks_draw(Evas_Object *obj);
-        [ :elm_calendar_marks_draw, [ :evas_object ], :void ],
-        # EAPI void elm_calendar_interval_set(Evas_Object *obj, double interval);
-        [ :elm_calendar_interval_set, [ :evas_object, :double ], :void ],
-        # EAPI double elm_calendar_interval_get(const Evas_Object *obj);
-        [ :elm_calendar_interval_get, [ :evas_object ], :double ],
+        [ :elm_calendar_marks_draw, [ :pointer ], :void ],
         # EAPI void elm_calendar_first_day_of_week_set(Evas_Object *obj, Elm_Calendar_Weekday day);
-        [ :elm_calendar_first_day_of_week_set, [ :evas_object, :_elm_calendar_weekday ], :void ],
+        [ :elm_calendar_first_day_of_week_set, [ :pointer, :_elm_calendar_weekday ], :void ],
         # EAPI Elm_Calendar_Weekday elm_calendar_first_day_of_week_get(const Evas_Object *obj);
-        [ :elm_calendar_first_day_of_week_get, [ :evas_object ], :_elm_calendar_weekday ],
+        [ :elm_calendar_first_day_of_week_get, [ :pointer ], :_elm_calendar_weekday ],
+        # EAPI void elm_calendar_select_mode_set(Evas_Object *obj, Elm_Calendar_Select_Mode mode);
+        [ :elm_calendar_select_mode_set, [ :pointer, :_elm_calendar_select_mode ], :void ],
+        # EAPI Elm_Calendar_Select_Mode elm_calendar_select_mode_get(const Evas_Object *obj);
+        [ :elm_calendar_select_mode_get, [ :pointer ], :_elm_calendar_select_mode ],
+        # EAPI void elm_calendar_selectable_set(Evas_Object *obj, Elm_Calendar_Selectable selectable);
+        [ :elm_calendar_selectable_set, [ :pointer, :_elm_calendar_selectable ], :void ],
+        # EAPI Elm_Calendar_Selectable elm_calendar_selectable_get(const Evas_Object *obj);
+        [ :elm_calendar_selectable_get, [ :pointer ], :_elm_calendar_selectable ],
+        # EAPI Eina_Bool elm_calendar_displayed_time_get(const Evas_Object *obj, struct tm *displayed_time);
+        [ :elm_calendar_displayed_time_get, [ :pointer, :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_check.rb b/lib/efl/native/elm/elm_check.rb
index 8ee1ed6..3d29dd0 100644
--- a/lib/efl/native/elm/elm_check.rb
+++ b/lib/efl/native/elm/elm_check.rb
@@ -24,13 +24,13 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object * elm_check_add(Evas_Object *parent);
-        [ :elm_check_add, [ :evas_object ], :evas_object ],
+        [ :elm_check_add, [ :pointer ], :pointer ],
         # EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool state);
-        [ :elm_check_state_set, [ :evas_object, :bool ], :void ],
+        [ :elm_check_state_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_check_state_get(const Evas_Object *obj);
-        [ :elm_check_state_get, [ :evas_object ], :bool ],
+        [ :elm_check_state_get, [ :pointer ], :bool ],
         # EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
-        [ :elm_check_state_pointer_set, [ :evas_object, :pointer ], :void ],
+        [ :elm_check_state_pointer_set, [ :pointer, :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_clock.rb b/lib/efl/native/elm/elm_clock.rb
index 8ed7875..6350d3c 100644
--- a/lib/efl/native/elm/elm_clock.rb
+++ b/lib/efl/native/elm/elm_clock.rb
@@ -30,31 +30,31 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_clock_add(Evas_Object *parent);
-        [ :elm_clock_add, [ :evas_object ], :evas_object ],
+        [ :elm_clock_add, [ :pointer ], :pointer ],
         # EAPI void elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec);
-        [ :elm_clock_time_set, [ :evas_object, :int, :int, :int ], :void ],
+        [ :elm_clock_time_set, [ :pointer, :int, :int, :int ], :void ],
         # EAPI void elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec);
-        [ :elm_clock_time_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_clock_time_get, [ :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit);
-        [ :elm_clock_edit_set, [ :evas_object, :bool ], :void ],
+        [ :elm_clock_edit_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_clock_edit_get(const Evas_Object *obj);
-        [ :elm_clock_edit_get, [ :evas_object ], :bool ],
+        [ :elm_clock_edit_get, [ :pointer ], :bool ],
         # EAPI void elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_Mode digedit);
-        [ :elm_clock_edit_mode_set, [ :evas_object, :elm_clock_edit_mode ], :void ],
+        [ :elm_clock_edit_mode_set, [ :pointer, :elm_clock_edit_mode ], :void ],
         # EAPI Elm_Clock_Edit_Mode elm_clock_edit_mode_get(const Evas_Object *obj);
-        [ :elm_clock_edit_mode_get, [ :evas_object ], :elm_clock_edit_mode ],
+        [ :elm_clock_edit_mode_get, [ :pointer ], :elm_clock_edit_mode ],
         # EAPI void elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm);
-        [ :elm_clock_show_am_pm_set, [ :evas_object, :bool ], :void ],
+        [ :elm_clock_show_am_pm_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_clock_show_am_pm_get(const Evas_Object *obj);
-        [ :elm_clock_show_am_pm_get, [ :evas_object ], :bool ],
+        [ :elm_clock_show_am_pm_get, [ :pointer ], :bool ],
         # EAPI void elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds);
-        [ :elm_clock_show_seconds_set, [ :evas_object, :bool ], :void ],
+        [ :elm_clock_show_seconds_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_clock_show_seconds_get(const Evas_Object *obj);
-        [ :elm_clock_show_seconds_get, [ :evas_object ], :bool ],
+        [ :elm_clock_show_seconds_get, [ :pointer ], :bool ],
         # EAPI void elm_clock_first_interval_set(Evas_Object *obj, double interval);
-        [ :elm_clock_first_interval_set, [ :evas_object, :double ], :void ],
+        [ :elm_clock_first_interval_set, [ :pointer, :double ], :void ],
         # EAPI double elm_clock_first_interval_get(const Evas_Object *obj);
-        [ :elm_clock_first_interval_get, [ :evas_object ], :double ],
+        [ :elm_clock_first_interval_get, [ :pointer ], :double ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_cnp.rb b/lib/efl/native/elm/elm_cnp.rb
index 71a9732..e89dedb 100644
--- a/lib/efl/native/elm/elm_cnp.rb
+++ b/lib/efl/native/elm/elm_cnp.rb
@@ -27,27 +27,72 @@ module Efl
         # typedef enum {...} Elm_Sel_Format;
         enum :elm_sel_format, [ :elm_sel_format_targets, -1, :elm_sel_format_none, 0x0, :elm_sel_format_text, 0x01, :elm_sel_format_markup, 0x02,
             :elm_sel_format_image, 0x04, :elm_sel_format_vcard, 0x08, :elm_sel_format_html, 0x10 ]
+        # typedef enum {...} Elm_Xdnd_Action;
+        enum :elm_xdnd_action, [ :elm_xdnd_action_unknown, :elm_xdnd_action_copy, :elm_xdnd_action_move, :elm_xdnd_action_private,
+            :elm_xdnd_action_ask, :elm_xdnd_action_list, :elm_xdnd_action_link, :elm_xdnd_action_description ]
         #
         # TYPEDEFS
         # typedef struct _Elm_Selection_Data Elm_Selection_Data;
         typedef :pointer, :elm_selection_data
+        # typedef struct _Elm_Drag_User_Info Elm_Drag_User_Info;
+        typedef :pointer, :elm_drag_user_info
         #
         # CALLBACKS
         # typedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev);
-        callback :elm_drop_cb, [ :pointer, :evas_object, :elm_selection_data ], :bool
+        callback :elm_drop_cb, [ :pointer, :pointer, :elm_selection_data ], :bool
+        # typedef Elm_Object_Item *(*Elm_Xy_Item_Get_Cb) (Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *xposret, int *yposret);
+        callback :elm_xy_item_get_cb, [ :pointer, :int, :int, :pointer, :pointer ], :elm_object_item
         # typedef void (*Elm_Selection_Loss_Cb) (void *data, Elm_Sel_Type selection);
         callback :elm_selection_loss_cb, [ :pointer, :elm_sel_type ], :void
+        # typedef Evas_Object *(*Elm_Drag_Icon_Create_Cb) (void *data, Evas_Object *win, Evas_Coord *xoff, Evas_Coord *yoff);
+        callback :elm_drag_icon_create_cb, [ :pointer, :pointer, :pointer, :pointer ], :pointer
+        # typedef void (*Elm_Drag_State) (void *data, Evas_Object *obj);
+        callback :elm_drag_state_cb, [ :pointer, :pointer ], :void
+        # typedef void (*Elm_Drag_Done) (void *data, Evas_Object *obj, Eina_Bool accepted);
+        callback :elm_drag_done_cb, [ :pointer, :pointer, :bool ], :void
+        # typedef void (*Elm_Drag_Accept) (void *data, Evas_Object *obj, Eina_Bool doaccept);
+        callback :elm_drag_accept_cb, [ :pointer, :pointer, :bool ], :void
+        # typedef void (*Elm_Drag_Pos) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Action action);
+        callback :elm_drag_pos_cb, [ :pointer, :pointer, :int, :int, :elm_xdnd_action ], :void
+        # typedef void (*Elm_Drag_Start) (void *data, Evas_Object *obj);
+        callback :elm_drag_start_cb, [ :pointer, :pointer ], :void
+        # typedef void (*Elm_Drag_Item_Container_Pos) (void *data, Evas_Object *cont, Elm_Object_Item *it, Evas_Coord x, Evas_Coord y, int xposret, int yposret, Elm_Xdnd_Action action);
+        callback :elm_drag_item_container_pos_cb, [ :pointer, :pointer, :elm_object_item, :int, :int, :int, :int, :elm_xdnd_action ], :void
+        # typedef Eina_Bool (*Elm_Drop_Item_Container_Cb) (void *data, Evas_Object *obj, Elm_Object_Item *it, Elm_Selection_Data *ev, int xposret, int yposret);
+        callback :elm_drop_item_container_cb, [ :pointer, :pointer, :elm_object_item, :elm_selection_data, :int, :int ], :bool
+        # typedef Eina_Bool (*Elm_Item_Container_Data_Get_Cb)( Evas_Object *obj, Elm_Object_Item *it, Elm_Drag_User_Info *info);
+        callback :elm_item_container_data_get_cb, [ :pointer, :elm_object_item, :elm_drag_user_info ], :bool
         #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_Bool elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const void *buf, size_t buflen);
-        [ :elm_cnp_selection_set, [ :evas_object, :elm_sel_type, :elm_sel_format, :pointer, :ulong ], :bool ],
+        [ :elm_cnp_selection_set, [ :pointer, :elm_sel_type, :elm_sel_format, :pointer, :ulong ], :bool ],
         # EAPI Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata);
-        [ :elm_cnp_selection_get, [ :evas_object, :elm_sel_type, :elm_sel_format, :elm_drop_cb, :pointer ], :bool ],
+        [ :elm_cnp_selection_get, [ :pointer, :elm_sel_type, :elm_sel_format, :elm_drop_cb, :pointer ], :bool ],
         # EAPI Eina_Bool elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection);
-        [ :elm_object_cnp_selection_clear, [ :evas_object, :elm_sel_type ], :bool ],
+        [ :elm_object_cnp_selection_clear, [ :pointer, :elm_sel_type ], :bool ],
         # EAPI void elm_cnp_selection_loss_callback_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data);
-        [ :elm_cnp_selection_loss_callback_set, [ :evas_object, :elm_sel_type, :elm_selection_loss_cb, :pointer ], :void ],
+        [ :elm_cnp_selection_loss_callback_set, [ :pointer, :elm_sel_type, :elm_selection_loss_cb, :pointer ], :void ],
+        # EAPI Eina_Bool elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *dropdata);
+        [ :elm_drop_target_add, [ :pointer, :elm_sel_format, :elm_drag_state_cb, :pointer, :elm_drag_state_cb, :pointer, :elm_drag_pos_cb, :pointer,
+            :elm_drop_cb, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *dropdata);
+        [ :elm_drop_target_del, [ :pointer, :elm_sel_format, :elm_drag_state_cb, :pointer, :elm_drag_state_cb, :pointer, :elm_drag_pos_cb, :pointer,
+            :elm_drop_cb, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, Elm_Xdnd_Action action, Elm_Drag_Icon_Create_Cb createicon, void *createdata, Elm_Drag_Pos dragpos, void *dragdata, Elm_Drag_Accept acceptcb, void *acceptdata, Elm_Drag_State dragdone, void *donecbdata);
+        [ :elm_drag_start, [ :pointer, :elm_sel_format, :string, :elm_xdnd_action, :elm_drag_icon_create_cb, :pointer, :elm_drag_pos_cb, :pointer,
+            :elm_drag_accept_cb, :pointer, :elm_drag_state_cb, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action);
+        [ :elm_drag_action_set, [ :pointer, :elm_xdnd_action ], :bool ],
+        # EAPI Eina_Bool elm_drag_item_container_add(Evas_Object *obj, double tm_to_anim, double tm_to_drag, Elm_Xy_Item_Get_Cb itemgetcb, Elm_Item_Container_Data_Get_Cb data_get);
+        [ :elm_drag_item_container_add, [ :pointer, :double, :double, :elm_xy_item_get_cb, :elm_item_container_data_get_cb ], :bool ],
+        # EAPI Eina_Bool elm_drag_item_container_del(Evas_Object *obj);
+        [ :elm_drag_item_container_del, [ :pointer ], :bool ],
+        # EAPI Eina_Bool elm_drop_item_container_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Xy_Item_Get_Cb itemgetcb, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Item_Container_Pos poscb, void *posdata, Elm_Drop_Item_Container_Cb dropcb, void *dropdata);
+        [ :elm_drop_item_container_add, [ :pointer, :elm_sel_format, :elm_xy_item_get_cb, :elm_drag_state_cb, :pointer, :elm_drag_state_cb, :pointer,
+            :elm_drag_item_container_pos_cb, :pointer, :elm_drop_item_container_cb, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_drop_item_container_del(Evas_Object *obj);
+        [ :elm_drop_item_container_del, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_colorselector.rb b/lib/efl/native/elm/elm_colorselector.rb
index ca691b2..5652545 100644
--- a/lib/efl/native/elm/elm_colorselector.rb
+++ b/lib/efl/native/elm/elm_colorselector.rb
@@ -23,7 +23,8 @@ module Efl
         #
         # ENUMS
         # typedef enum {...} Elm_Colorselector_Mode;
-        enum :elm_colorselector_mode, [ :elm_colorselector_palette, 0, :elm_colorselector_components, 1, :elm_colorselector_both, 2 ]
+        enum :elm_colorselector_mode, [ :elm_colorselector_palette, 0, :elm_colorselector_components, 1, :elm_colorselector_both, 2,
+            :elm_colorselector_picker, 3, :elm_colorselector_all, 4 ]
         #
         # TYPEDEFS
         # typedef struct _Elm_Color_RGBA Elm_Color_RGBA;
@@ -33,28 +34,28 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_colorselector_palette_item_color_get(const Elm_Object_Item *it, int *r, int *g, int *b, int *a);
+        [ :elm_colorselector_palette_item_color_get, [ :elm_object_item, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_colorselector_palette_item_color_set(Elm_Object_Item *it, int r, int g, int b, int a);
+        [ :elm_colorselector_palette_item_color_set, [ :elm_object_item, :int, :int, :int, :int ], :void ],
         # EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent);
-        [ :elm_colorselector_add, [ :evas_object ], :evas_object ],
+        [ :elm_colorselector_add, [ :pointer ], :pointer ],
         # EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :elm_colorselector_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_colorselector_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :elm_colorselector_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_colorselector_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_colorselector_mode_set(Evas_Object *obj, Elm_Colorselector_Mode mode);
-        [ :elm_colorselector_mode_set, [ :evas_object, :elm_colorselector_mode ], :void ],
+        [ :elm_colorselector_mode_set, [ :pointer, :elm_colorselector_mode ], :void ],
         # EAPI Elm_Colorselector_Mode elm_colorselector_mode_get(const Evas_Object *obj);
-        [ :elm_colorselector_mode_get, [ :evas_object ], :elm_colorselector_mode ],
-        # EAPI void elm_colorselector_palette_item_color_get(const Elm_Object_Item *it, int *r, int *g, int *b, int *a);
-        [ :elm_colorselector_palette_item_color_get, [ :elm_object_item, :pointer, :pointer, :pointer, :pointer ], :void ],
-        # EAPI void elm_colorselector_palette_item_color_set(Elm_Object_Item *it, int r, int g, int b, int a);
-        [ :elm_colorselector_palette_item_color_set, [ :elm_object_item, :int, :int, :int, :int ], :void ],
+        [ :elm_colorselector_mode_get, [ :pointer ], :elm_colorselector_mode ],
         # EAPI Elm_Object_Item *elm_colorselector_palette_color_add(Evas_Object *obj, int r, int g, int b, int a);
-        [ :elm_colorselector_palette_color_add, [ :evas_object, :int, :int, :int, :int ], :elm_object_item ],
+        [ :elm_colorselector_palette_color_add, [ :pointer, :int, :int, :int, :int ], :elm_object_item ],
         # EAPI void elm_colorselector_palette_clear(Evas_Object *obj);
-        [ :elm_colorselector_palette_clear, [ :evas_object ], :void ],
+        [ :elm_colorselector_palette_clear, [ :pointer ], :void ],
         # EAPI void elm_colorselector_palette_name_set(Evas_Object *obj, const char *palette_name);
-        [ :elm_colorselector_palette_name_set, [ :evas_object, :string ], :void ],
+        [ :elm_colorselector_palette_name_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_colorselector_palette_name_get(const Evas_Object *obj);
-        [ :elm_colorselector_palette_name_get, [ :evas_object ], :string ],
+        [ :elm_colorselector_palette_name_get, [ :pointer ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_config.rb b/lib/efl/native/elm/elm_config.rb
index 9a4a7bb..415f2bc 100644
--- a/lib/efl/native/elm/elm_config.rb
+++ b/lib/efl/native/elm/elm_config.rb
@@ -79,14 +79,30 @@ module Efl
         [ :elm_config_scroll_thumbscroll_threshold_get, [  ], :uint ],
         # EAPI void elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold);
         [ :elm_config_scroll_thumbscroll_threshold_set, [ :uint ], :void ],
+        # EAPI unsigned int elm_config_scroll_thumbscroll_hold_threshold_get(void);
+        [ :elm_config_scroll_thumbscroll_hold_threshold_get, [  ], :uint ],
+        # EAPI void elm_config_scroll_thumbscroll_hold_threshold_set(unsigned int threshold);
+        [ :elm_config_scroll_thumbscroll_hold_threshold_set, [ :uint ], :void ],
         # EAPI double elm_config_scroll_thumbscroll_momentum_threshold_get(void);
         [ :elm_config_scroll_thumbscroll_momentum_threshold_get, [  ], :double ],
         # EAPI void elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold);
         [ :elm_config_scroll_thumbscroll_momentum_threshold_set, [ :double ], :void ],
+        # EAPI unsigned int elm_config_scroll_thumbscroll_flick_distance_tolerance_get(void);
+        [ :elm_config_scroll_thumbscroll_flick_distance_tolerance_get, [  ], :uint ],
+        # EAPI void elm_config_scroll_thumbscroll_flick_distance_tolerance_set(unsigned int distance);
+        [ :elm_config_scroll_thumbscroll_flick_distance_tolerance_set, [ :uint ], :void ],
         # EAPI double elm_config_scroll_thumbscroll_friction_get(void);
         [ :elm_config_scroll_thumbscroll_friction_get, [  ], :double ],
         # EAPI void elm_config_scroll_thumbscroll_friction_set(double friction);
         [ :elm_config_scroll_thumbscroll_friction_set, [ :double ], :void ],
+        # EAPI double elm_config_scroll_thumbscroll_min_friction_get(void);
+        [ :elm_config_scroll_thumbscroll_min_friction_get, [  ], :double ],
+        # EAPI void elm_config_scroll_thumbscroll_min_friction_set(double friction);
+        [ :elm_config_scroll_thumbscroll_min_friction_set, [ :double ], :void ],
+        # EAPI double elm_config_scroll_thumbscroll_friction_standard_get(void);
+        [ :elm_config_scroll_thumbscroll_friction_standard_get, [  ], :double ],
+        # EAPI void elm_config_scroll_thumbscroll_friction_standard_set(double standard);
+        [ :elm_config_scroll_thumbscroll_friction_standard_set, [ :double ], :void ],
         # EAPI double elm_config_scroll_thumbscroll_border_friction_get(void);
         [ :elm_config_scroll_thumbscroll_border_friction_get, [  ], :double ],
         # EAPI void elm_config_scroll_thumbscroll_border_friction_set(double friction);
@@ -95,6 +111,18 @@ module Efl
         [ :elm_config_scroll_thumbscroll_sensitivity_friction_get, [  ], :double ],
         # EAPI void elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction);
         [ :elm_config_scroll_thumbscroll_sensitivity_friction_set, [ :double ], :void ],
+        # EAPI double elm_config_scroll_thumbscroll_acceleration_threshold_get(void);
+        [ :elm_config_scroll_thumbscroll_acceleration_threshold_get, [  ], :double ],
+        # EAPI void elm_config_scroll_thumbscroll_acceleration_threshold_set(double threshold);
+        [ :elm_config_scroll_thumbscroll_acceleration_threshold_set, [ :double ], :void ],
+        # EAPI double elm_config_scroll_thumbscroll_acceleration_time_limit_get(void);
+        [ :elm_config_scroll_thumbscroll_acceleration_time_limit_get, [  ], :double ],
+        # EAPI void elm_config_scroll_thumbscroll_acceleration_time_limit_set(double time_limit);
+        [ :elm_config_scroll_thumbscroll_acceleration_time_limit_set, [ :double ], :void ],
+        # EAPI double elm_config_scroll_thumbscroll_acceleration_weight_get(void);
+        [ :elm_config_scroll_thumbscroll_acceleration_weight_get, [  ], :double ],
+        # EAPI void elm_config_scroll_thumbscroll_acceleration_weight_set(double weight);
+        [ :elm_config_scroll_thumbscroll_acceleration_weight_set, [ :double ], :void ],
         # EAPI double elm_config_longpress_timeout_get(void);
         [ :elm_config_longpress_timeout_get, [  ], :double ],
         # EAPI void elm_config_longpress_timeout_set(double longpress_timeout);
@@ -143,6 +171,10 @@ module Efl
         [ :elm_config_access_get, [  ], :bool ],
         # EAPI void elm_config_access_set(Eina_Bool is_access);
         [ :elm_config_access_set, [ :bool ], :void ],
+        # EAPI Eina_Bool elm_config_selection_unfocused_clear_get(void);
+        [ :elm_config_selection_unfocused_clear_get, [  ], :bool ],
+        # EAPI void elm_config_selection_unfocused_clear_set(Eina_Bool enabled);
+        [ :elm_config_selection_unfocused_clear_set, [ :bool ], :void ],
         # EAPI void elm_config_font_overlay_unset(const char *text_class);
         [ :elm_config_font_overlay_unset, [ :string ], :void ],
         # EAPI void elm_config_font_overlay_apply(void);
@@ -187,6 +219,20 @@ module Efl
         [ :elm_config_mirrored_get, [  ], :bool ],
         # EAPI void elm_config_mirrored_set(Eina_Bool mirrored);
         [ :elm_config_mirrored_set, [ :bool ], :void ],
+        # EAPI Eina_Bool elm_config_clouseau_enabled_get(void);
+        [ :elm_config_clouseau_enabled_get, [  ], :bool ],
+        # EAPI void elm_config_clouseau_enabled_set(Eina_Bool enabled);
+        [ :elm_config_clouseau_enabled_set, [ :bool ], :void ],
+        # EAPI const char *elm_config_indicator_service_get(int rotation);
+        [ :elm_config_indicator_service_get, [ :int ], :string ],
+        # EAPI double elm_config_glayer_long_tap_start_timeout_get(void);
+        [ :elm_config_glayer_long_tap_start_timeout_get, [  ], :double ],
+        # EAPI void elm_config_glayer_long_tap_start_timeout_set(double long_tap_timeout);
+        [ :elm_config_glayer_long_tap_start_timeout_set, [ :double ], :void ],
+        # EAPI double elm_config_glayer_double_tap_timeout_get(void);
+        [ :elm_config_glayer_double_tap_timeout_get, [  ], :double ],
+        # EAPI void elm_config_glayer_double_tap_timeout_set(double double_tap_timeout);
+        [ :elm_config_glayer_double_tap_timeout_set, [ :double ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_conform.rb b/lib/efl/native/elm/elm_conform.rb
index c0a7cbd..1b0a3be 100644
--- a/lib/efl/native/elm/elm_conform.rb
+++ b/lib/efl/native/elm/elm_conform.rb
@@ -24,7 +24,7 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
-        [ :elm_conformant_add, [ :evas_object ], :evas_object ],
+        [ :elm_conformant_add, [ :pointer ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_ctxpopup.rb b/lib/efl/native/elm/elm_ctxpopup.rb
index 89707fd..1e44194 100644
--- a/lib/efl/native/elm/elm_ctxpopup.rb
+++ b/lib/efl/native/elm/elm_ctxpopup.rb
@@ -29,28 +29,28 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_ctxpopup_add(Evas_Object *parent);
-        [ :elm_ctxpopup_add, [ :evas_object ], :evas_object ],
+        [ :elm_ctxpopup_add, [ :pointer ], :pointer ],
         # EAPI void elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_ctxpopup_hover_parent_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_ctxpopup_hover_parent_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_ctxpopup_hover_parent_get(const Evas_Object *obj);
-        [ :elm_ctxpopup_hover_parent_get, [ :evas_object ], :evas_object ],
+        [ :elm_ctxpopup_hover_parent_get, [ :pointer ], :pointer ],
         # EAPI void elm_ctxpopup_clear(Evas_Object *obj);
-        [ :elm_ctxpopup_clear, [ :evas_object ], :void ],
+        [ :elm_ctxpopup_clear, [ :pointer ], :void ],
         # EAPI void elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_ctxpopup_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_ctxpopup_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_ctxpopup_horizontal_get(const Evas_Object *obj);
-        [ :elm_ctxpopup_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_ctxpopup_horizontal_get, [ :pointer ], :bool ],
         # EAPI Elm_Object_Item *elm_ctxpopup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
-        [ :elm_ctxpopup_item_append, [ :evas_object, :string, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_ctxpopup_item_append, [ :pointer, :string, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI void elm_ctxpopup_direction_priority_set(Evas_Object *obj, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth);
-        [ :elm_ctxpopup_direction_priority_set, [ :evas_object, :elm_ctxpopup_direction, :elm_ctxpopup_direction, :elm_ctxpopup_direction,
+        [ :elm_ctxpopup_direction_priority_set, [ :pointer, :elm_ctxpopup_direction, :elm_ctxpopup_direction, :elm_ctxpopup_direction,
             :elm_ctxpopup_direction ], :void ],
         # EAPI void elm_ctxpopup_direction_priority_get(Evas_Object *obj, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth);
-        [ :elm_ctxpopup_direction_priority_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_ctxpopup_direction_priority_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Elm_Ctxpopup_Direction elm_ctxpopup_direction_get(const Evas_Object *obj);
-        [ :elm_ctxpopup_direction_get, [ :evas_object ], :elm_ctxpopup_direction ],
+        [ :elm_ctxpopup_direction_get, [ :pointer ], :elm_ctxpopup_direction ],
         # EAPI void elm_ctxpopup_dismiss(Evas_Object *obj);
-        [ :elm_ctxpopup_dismiss, [ :evas_object ], :void ],
+        [ :elm_ctxpopup_dismiss, [ :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_cursor.rb b/lib/efl/native/elm/elm_cursor.rb
index 39aa83e..a3ea437 100644
--- a/lib/efl/native/elm/elm_cursor.rb
+++ b/lib/efl/native/elm/elm_cursor.rb
@@ -24,19 +24,19 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor);
-        [ :elm_object_cursor_set, [ :evas_object, :string ], :void ],
+        [ :elm_object_cursor_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_object_cursor_get(const Evas_Object *obj);
-        [ :elm_object_cursor_get, [ :evas_object ], :string ],
+        [ :elm_object_cursor_get, [ :pointer ], :string ],
         # EAPI void elm_object_cursor_unset(Evas_Object *obj);
-        [ :elm_object_cursor_unset, [ :evas_object ], :void ],
+        [ :elm_object_cursor_unset, [ :pointer ], :void ],
         # EAPI void elm_object_cursor_style_set(Evas_Object *obj, const char *style);
-        [ :elm_object_cursor_style_set, [ :evas_object, :string ], :void ],
+        [ :elm_object_cursor_style_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_object_cursor_style_get(const Evas_Object *obj);
-        [ :elm_object_cursor_style_get, [ :evas_object ], :string ],
+        [ :elm_object_cursor_style_get, [ :pointer ], :string ],
         # EAPI void elm_object_cursor_theme_search_enabled_set(Evas_Object *obj, Eina_Bool theme_search);
-        [ :elm_object_cursor_theme_search_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_cursor_theme_search_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_object_cursor_theme_search_enabled_get(const Evas_Object *obj);
-        [ :elm_object_cursor_theme_search_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_object_cursor_theme_search_enabled_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_datetime.rb b/lib/efl/native/elm/elm_datetime.rb
index 650aa28..09e7fae 100644
--- a/lib/efl/native/elm/elm_datetime.rb
+++ b/lib/efl/native/elm/elm_datetime.rb
@@ -29,31 +29,31 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_datetime_add(Evas_Object *parent);
-        [ :elm_datetime_add, [ :evas_object ], :evas_object ],
+        [ :elm_datetime_add, [ :pointer ], :pointer ],
         # EAPI const char *elm_datetime_format_get(const Evas_Object *obj);
-        [ :elm_datetime_format_get, [ :evas_object ], :string ],
+        [ :elm_datetime_format_get, [ :pointer ], :string ],
         # EAPI void elm_datetime_format_set(Evas_Object *obj, const char *fmt);
-        [ :elm_datetime_format_set, [ :evas_object, :string ], :void ],
-        # EAPI Eina_Bool elm_datetime_value_max_get(const Evas_Object *obj, struct tm *maxtime);
-        [ :elm_datetime_value_max_get, [ :evas_object, :pointer ], :bool ],
-        # EAPI Eina_Bool elm_datetime_value_max_set(Evas_Object *obj, const struct tm *maxtime);
-        [ :elm_datetime_value_max_set, [ :evas_object, :pointer ], :bool ],
-        # EAPI Eina_Bool elm_datetime_value_min_get(const Evas_Object *obj, struct tm *mintime);
-        [ :elm_datetime_value_min_get, [ :evas_object, :pointer ], :bool ],
-        # EAPI Eina_Bool elm_datetime_value_min_set(Evas_Object *obj, const struct tm *mintime);
-        [ :elm_datetime_value_min_set, [ :evas_object, :pointer ], :bool ],
+        [ :elm_datetime_format_set, [ :pointer, :string ], :void ],
+        # EAPI Eina_Bool elm_datetime_field_visible_get(const Evas_Object *obj, Elm_Datetime_Field_Type fieldtype);
+        [ :elm_datetime_field_visible_get, [ :pointer, :elm_datetime_field_type ], :bool ],
+        # EAPI void elm_datetime_field_visible_set(Evas_Object *obj, Elm_Datetime_Field_Type fieldtype, Eina_Bool visible);
+        [ :elm_datetime_field_visible_set, [ :pointer, :elm_datetime_field_type, :bool ], :void ],
         # EAPI void elm_datetime_field_limit_get(const Evas_Object *obj, Elm_Datetime_Field_Type fieldtype, int *min, int *max);
-        [ :elm_datetime_field_limit_get, [ :evas_object, :elm_datetime_field_type, :pointer, :pointer ], :void ],
+        [ :elm_datetime_field_limit_get, [ :pointer, :elm_datetime_field_type, :pointer, :pointer ], :void ],
         # EAPI void elm_datetime_field_limit_set(Evas_Object *obj, Elm_Datetime_Field_Type fieldtype, int min, int max);
-        [ :elm_datetime_field_limit_set, [ :evas_object, :elm_datetime_field_type, :int, :int ], :void ],
+        [ :elm_datetime_field_limit_set, [ :pointer, :elm_datetime_field_type, :int, :int ], :void ],
         # EAPI Eina_Bool elm_datetime_value_get(const Evas_Object *obj, struct tm *currtime);
-        [ :elm_datetime_value_get, [ :evas_object, :pointer ], :bool ],
+        [ :elm_datetime_value_get, [ :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool elm_datetime_value_set(Evas_Object *obj, const struct tm *newtime);
-        [ :elm_datetime_value_set, [ :evas_object, :pointer ], :bool ],
-        # EAPI Eina_Bool elm_datetime_field_visible_get(const Evas_Object *obj, Elm_Datetime_Field_Type fieldtype);
-        [ :elm_datetime_field_visible_get, [ :evas_object, :elm_datetime_field_type ], :bool ],
-        # EAPI void elm_datetime_field_visible_set(Evas_Object *obj, Elm_Datetime_Field_Type fieldtype, Eina_Bool visible);
-        [ :elm_datetime_field_visible_set, [ :evas_object, :elm_datetime_field_type, :bool ], :void ],
+        [ :elm_datetime_value_set, [ :pointer, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_datetime_value_min_get(const Evas_Object *obj, struct tm *mintime);
+        [ :elm_datetime_value_min_get, [ :pointer, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_datetime_value_min_set(Evas_Object *obj, const struct tm *mintime);
+        [ :elm_datetime_value_min_set, [ :pointer, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_datetime_value_max_get(const Evas_Object *obj, struct tm *maxtime);
+        [ :elm_datetime_value_max_get, [ :pointer, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_datetime_value_max_set(Evas_Object *obj, const struct tm *maxtime);
+        [ :elm_datetime_value_max_set, [ :pointer, :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_dayselector.rb b/lib/efl/native/elm/elm_dayselector.rb
index 500b4ec..ae3d464 100644
--- a/lib/efl/native/elm/elm_dayselector.rb
+++ b/lib/efl/native/elm/elm_dayselector.rb
@@ -29,23 +29,27 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_dayselector_add(Evas_Object *parent);
-        [ :elm_dayselector_add, [ :evas_object ], :evas_object ],
+        [ :elm_dayselector_add, [ :pointer ], :pointer ],
         # EAPI void elm_dayselector_day_selected_set(Evas_Object *obj, Elm_Dayselector_Day day, Eina_Bool selected);
-        [ :elm_dayselector_day_selected_set, [ :evas_object, :elm_dayselector_day, :bool ], :void ],
+        [ :elm_dayselector_day_selected_set, [ :pointer, :elm_dayselector_day, :bool ], :void ],
         # EAPI Eina_Bool elm_dayselector_day_selected_get(const Evas_Object *obj, Elm_Dayselector_Day day);
-        [ :elm_dayselector_day_selected_get, [ :evas_object, :elm_dayselector_day ], :bool ],
+        [ :elm_dayselector_day_selected_get, [ :pointer, :elm_dayselector_day ], :bool ],
         # EAPI void elm_dayselector_week_start_set(Evas_Object *obj, Elm_Dayselector_Day day);
-        [ :elm_dayselector_week_start_set, [ :evas_object, :elm_dayselector_day ], :void ],
+        [ :elm_dayselector_week_start_set, [ :pointer, :elm_dayselector_day ], :void ],
         # EAPI Elm_Dayselector_Day elm_dayselector_week_start_get(const Evas_Object *obj);
-        [ :elm_dayselector_week_start_get, [ :evas_object ], :elm_dayselector_day ],
+        [ :elm_dayselector_week_start_get, [ :pointer ], :elm_dayselector_day ],
         # EAPI void elm_dayselector_weekend_start_set(Evas_Object *obj, Elm_Dayselector_Day day);
-        [ :elm_dayselector_weekend_start_set, [ :evas_object, :elm_dayselector_day ], :void ],
+        [ :elm_dayselector_weekend_start_set, [ :pointer, :elm_dayselector_day ], :void ],
         # EAPI Elm_Dayselector_Day elm_dayselector_weekend_start_get(const Evas_Object *obj);
-        [ :elm_dayselector_weekend_start_get, [ :evas_object ], :elm_dayselector_day ],
+        [ :elm_dayselector_weekend_start_get, [ :pointer ], :elm_dayselector_day ],
         # EAPI void elm_dayselector_weekend_length_set(Evas_Object *obj, unsigned int length);
-        [ :elm_dayselector_weekend_length_set, [ :evas_object, :uint ], :void ],
+        [ :elm_dayselector_weekend_length_set, [ :pointer, :uint ], :void ],
         # EAPI unsigned int elm_dayselector_weekend_length_get(const Evas_Object *obj);
-        [ :elm_dayselector_weekend_length_get, [ :evas_object ], :uint ],
+        [ :elm_dayselector_weekend_length_get, [ :pointer ], :uint ],
+        # EAPI void elm_dayselector_weekdays_names_set(Evas_Object *obj, const char *weekdays[]);
+        # FIXME
+        # EAPI Eina_List *elm_dayselector_weekdays_names_get(const Evas_Object *obj);
+        [ :elm_dayselector_weekdays_names_get, [ :pointer ], :eina_list ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_debug.rb b/lib/efl/native/elm/elm_debug.rb
index 48cddc2..4963a09 100644
--- a/lib/efl/native/elm/elm_debug.rb
+++ b/lib/efl/native/elm/elm_debug.rb
@@ -24,9 +24,9 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI void elm_object_tree_dump(const Evas_Object *top);
-        [ :elm_object_tree_dump, [ :evas_object ], :void ],
+        [ :elm_object_tree_dump, [ :pointer ], :void ],
         # EAPI void elm_object_tree_dot_dump(const Evas_Object *top, const char *file);
-        [ :elm_object_tree_dot_dump, [ :evas_object, :string ], :void ],
+        [ :elm_object_tree_dot_dump, [ :pointer, :string ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_diskselector.rb b/lib/efl/native/elm/elm_diskselector.rb
index 1d62b4f..76ac883 100644
--- a/lib/efl/native/elm/elm_diskselector.rb
+++ b/lib/efl/native/elm/elm_diskselector.rb
@@ -24,40 +24,40 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
+        [ :elm_diskselector_item_selected_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_diskselector_item_selected_get(const Elm_Object_Item *it);
+        [ :elm_diskselector_item_selected_get, [ :elm_object_item ], :bool ],
+        # EAPI Elm_Object_Item *elm_diskselector_item_prev_get(const Elm_Object_Item *it);
+        [ :elm_diskselector_item_prev_get, [ :elm_object_item ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_diskselector_item_next_get(const Elm_Object_Item *it);
+        [ :elm_diskselector_item_next_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Evas_Object *elm_diskselector_add(Evas_Object *parent);
-        [ :elm_diskselector_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_diskselector_round_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_diskselector_round_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_diskselector_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_diskselector_round_enabled_get(const Evas_Object *obj);
-        [ :elm_diskselector_round_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_diskselector_round_enabled_get, [ :pointer ], :bool ],
+        # EAPI void elm_diskselector_round_enabled_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_diskselector_round_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI int elm_diskselector_side_text_max_length_get(const Evas_Object *obj);
-        [ :elm_diskselector_side_text_max_length_get, [ :evas_object ], :int ],
+        [ :elm_diskselector_side_text_max_length_get, [ :pointer ], :int ],
         # EAPI void elm_diskselector_side_text_max_length_set(Evas_Object *obj, int len);
-        [ :elm_diskselector_side_text_max_length_set, [ :evas_object, :int ], :void ],
-        # EAPI void elm_diskselector_display_item_num_set(Evas_Object *obj, int num);
-        [ :elm_diskselector_display_item_num_set, [ :evas_object, :int ], :void ],
-        # EAPI int elm_diskselector_display_item_num_get(const Evas_Object *obj);
-        [ :elm_diskselector_display_item_num_get, [ :evas_object ], :int ],
+        [ :elm_diskselector_side_text_max_length_set, [ :pointer, :int ], :void ],
         # EAPI void elm_diskselector_clear(Evas_Object *obj);
-        [ :elm_diskselector_clear, [ :evas_object ], :void ],
+        [ :elm_diskselector_clear, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_diskselector_items_get(const Evas_Object *obj);
-        [ :elm_diskselector_items_get, [ :evas_object ], :eina_list ],
+        [ :elm_diskselector_items_get, [ :pointer ], :eina_list ],
         # EAPI Elm_Object_Item *elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
-        [ :elm_diskselector_item_append, [ :evas_object, :string, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_diskselector_item_append, [ :pointer, :string, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_diskselector_selected_item_get(const Evas_Object *obj);
-        [ :elm_diskselector_selected_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI void elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
-        [ :elm_diskselector_item_selected_set, [ :elm_object_item, :bool ], :void ],
-        # EAPI Eina_Bool elm_diskselector_item_selected_get(const Elm_Object_Item *it);
-        [ :elm_diskselector_item_selected_get, [ :elm_object_item ], :bool ],
+        [ :elm_diskselector_selected_item_get, [ :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_diskselector_first_item_get(const Evas_Object *obj);
-        [ :elm_diskselector_first_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_diskselector_first_item_get, [ :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_diskselector_last_item_get(const Evas_Object *obj);
-        [ :elm_diskselector_last_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_diskselector_item_prev_get(const Elm_Object_Item *it);
-        [ :elm_diskselector_item_prev_get, [ :elm_object_item ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_diskselector_item_next_get(const Elm_Object_Item *it);
-        [ :elm_diskselector_item_next_get, [ :elm_object_item ], :elm_object_item ],
+        [ :elm_diskselector_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI void elm_diskselector_display_item_num_set(Evas_Object *obj, int num);
+        [ :elm_diskselector_display_item_num_set, [ :pointer, :int ], :void ],
+        # EAPI int elm_diskselector_display_item_num_get(const Evas_Object *obj);
+        [ :elm_diskselector_display_item_num_get, [ :pointer ], :int ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_entry.rb b/lib/efl/native/elm/elm_entry.rb
index 08aaa9e..f74eb55 100644
--- a/lib/efl/native/elm/elm_entry.rb
+++ b/lib/efl/native/elm/elm_entry.rb
@@ -33,7 +33,7 @@ module Efl
         enum :elm_input_panel_layout, [ :elm_input_panel_layout_normal, :elm_input_panel_layout_number, :elm_input_panel_layout_email,
             :elm_input_panel_layout_url, :elm_input_panel_layout_phonenumber, :elm_input_panel_layout_ip, :elm_input_panel_layout_month,
             :elm_input_panel_layout_numberonly, :elm_input_panel_layout_invalid, :elm_input_panel_layout_hex, :elm_input_panel_layout_terminal,
-            :elm_input_panel_layout_password ]
+            :elm_input_panel_layout_password, :elm_input_panel_layout_datetime ]
         # typedef enum {...} Elm_Input_Panel_Lang;
         enum :elm_input_panel_lang, [ :elm_input_panel_lang_automatic, :elm_input_panel_lang_alphabet ]
         # typedef enum {...} Elm_Autocapital_Type;
@@ -42,7 +42,8 @@ module Efl
         # typedef enum {...} Elm_Input_Panel_Return_Key_Type;
         enum :elm_input_panel_return_key_type, [ :elm_input_panel_return_key_type_default, :elm_input_panel_return_key_type_done,
             :elm_input_panel_return_key_type_go, :elm_input_panel_return_key_type_join, :elm_input_panel_return_key_type_login,
-            :elm_input_panel_return_key_type_next, :elm_input_panel_return_key_type_search, :elm_input_panel_return_key_type_send ]
+            :elm_input_panel_return_key_type_next, :elm_input_panel_return_key_type_search, :elm_input_panel_return_key_type_send,
+            :elm_input_panel_return_key_type_signin ]
         # typedef enum {...} Elm_Cnp_Mode;
         enum :elm_cnp_mode, [ :elm_cnp_mode_markup, :elm_cnp_mode_no_image, :elm_cnp_mode_plaintext ]
         #
@@ -51,6 +52,8 @@ module Efl
         typedef :pointer, :elm_entry_anchor_info
         # typedef struct _Elm_Entry_Anchor_Hover_Info Elm_Entry_Anchor_Hover_Info;
         typedef :pointer, :elm_entry_anchor_hover_info
+        # typedef struct _Elm_Entry_Context_Menu_Item Elm_Entry_Context_Menu_Item;
+        typedef :pointer, :elm_entry_context_menu_item
         # typedef Edje_Entry_Change_Info Elm_Entry_Change_Info;
         typedef :edje_entry_change_info, :elm_entry_change_info
         # typedef struct _Elm_Entry_Filter_Limit_Size Elm_Entry_Filter_Limit_Size;
@@ -60,202 +63,208 @@ module Efl
         #
         # CALLBACKS
         # typedef Evas_Object * (*Elm_Entry_Item_Provider_Cb) (void *data, Evas_Object * entry, const char *item);
-        callback :elm_entry_item_provider_cb, [ :pointer, :evas_object, :string ], :evas_object
+        callback :elm_entry_item_provider_cb, [ :pointer, :pointer, :string ], :pointer
         # typedef void (*Elm_Entry_Filter_Cb) (void *data, Evas_Object *entry, char **text);
-        callback :elm_entry_filter_cb, [ :pointer, :evas_object, :pointer ], :void
+        callback :elm_entry_filter_cb, [ :pointer, :pointer, :pointer ], :void
         #
         # FUNCTIONS
         fcts = [
+        # EAPI char *elm_entry_markup_to_utf8(const char *s);
+        [ :elm_entry_markup_to_utf8, [ :string ], :string ],
+        # EAPI char *elm_entry_utf8_to_markup(const char *s);
+        [ :elm_entry_utf8_to_markup, [ :string ], :string ],
+        # EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text);
+        [ :elm_entry_filter_limit_size, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text);
+        [ :elm_entry_filter_accept_set, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI const char *elm_entry_context_menu_item_label_get(const Elm_Entry_Context_Menu_Item *item);
+        [ :elm_entry_context_menu_item_label_get, [ :elm_entry_context_menu_item ], :string ],
+        # EAPI void elm_entry_context_menu_item_icon_get(const Elm_Entry_Context_Menu_Item *item, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type);
+        [ :elm_entry_context_menu_item_icon_get, [ :elm_entry_context_menu_item, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
-        [ :elm_entry_add, [ :evas_object ], :evas_object ],
+        [ :elm_entry_add, [ :pointer ], :pointer ],
+        # EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
+        [ :elm_entry_entry_set, [ :pointer, :string ], :void ],
+        # EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
+        [ :elm_entry_entry_get, [ :pointer ], :string ],
         # EAPI void elm_entry_text_style_user_push(Evas_Object *obj, const char *style);
-        [ :elm_entry_text_style_user_push, [ :evas_object, :string ], :void ],
+        [ :elm_entry_text_style_user_push, [ :pointer, :string ], :void ],
         # EAPI void elm_entry_text_style_user_pop(Evas_Object *obj);
-        [ :elm_entry_text_style_user_pop, [ :evas_object ], :void ],
+        [ :elm_entry_text_style_user_pop, [ :pointer ], :void ],
         # EAPI const char* elm_entry_text_style_user_peek(const Evas_Object *obj);
-        [ :elm_entry_text_style_user_peek, [ :evas_object ], :pointer ],
+        [ :elm_entry_text_style_user_peek, [ :pointer ], :pointer ],
         # EAPI void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);
-        [ :elm_entry_single_line_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_single_line_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_single_line_get(const Evas_Object *obj);
-        [ :elm_entry_single_line_get, [ :evas_object ], :bool ],
+        [ :elm_entry_single_line_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool password);
-        [ :elm_entry_password_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_password_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_password_get(const Evas_Object *obj);
-        [ :elm_entry_password_get, [ :evas_object ], :bool ],
-        # EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
-        [ :elm_entry_entry_set, [ :evas_object, :string ], :void ],
-        # EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
-        [ :elm_entry_entry_get, [ :evas_object ], :string ],
+        [ :elm_entry_password_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_entry_append(Evas_Object *obj, const char *entry);
-        [ :elm_entry_entry_append, [ :evas_object, :string ], :void ],
+        [ :elm_entry_entry_append, [ :pointer, :string ], :void ],
         # EAPI Eina_Bool elm_entry_is_empty(const Evas_Object *obj);
-        [ :elm_entry_is_empty, [ :evas_object ], :bool ],
-        # EAPI const char *elm_entry_selection_get(const Evas_Object *obj);
-        [ :elm_entry_selection_get, [ :evas_object ], :string ],
+        [ :elm_entry_is_empty, [ :pointer ], :bool ],
         # EAPI Evas_Object * elm_entry_textblock_get(Evas_Object *obj);
-        [ :elm_entry_textblock_get, [ :evas_object ], :evas_object ],
+        [ :elm_entry_textblock_get, [ :pointer ], :pointer ],
         # EAPI void elm_entry_calc_force(Evas_Object *obj);
-        [ :elm_entry_calc_force, [ :evas_object ], :void ],
+        [ :elm_entry_calc_force, [ :pointer ], :void ],
+        # EAPI const char *elm_entry_selection_get(const Evas_Object *obj);
+        [ :elm_entry_selection_get, [ :pointer ], :string ],
+        # EAPI void elm_entry_selection_handler_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+        [ :elm_entry_selection_handler_disabled_set, [ :pointer, :bool ], :void ],
+        # EAPI void elm_entry_selection_handler_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+        [ :elm_entry_selection_handler_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry);
-        [ :elm_entry_entry_insert, [ :evas_object, :string ], :void ],
+        [ :elm_entry_entry_insert, [ :pointer, :string ], :void ],
         # EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap);
-        [ :elm_entry_line_wrap_set, [ :evas_object, :elm_wrap_type ], :void ],
+        [ :elm_entry_line_wrap_set, [ :pointer, :elm_wrap_type ], :void ],
         # EAPI Elm_Wrap_Type elm_entry_line_wrap_get(const Evas_Object *obj);
-        [ :elm_entry_line_wrap_get, [ :evas_object ], :elm_wrap_type ],
+        [ :elm_entry_line_wrap_get, [ :pointer ], :elm_wrap_type ],
         # EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable);
-        [ :elm_entry_editable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_editable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_editable_get(const Evas_Object *obj);
-        [ :elm_entry_editable_get, [ :evas_object ], :bool ],
+        [ :elm_entry_editable_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_select_none(Evas_Object *obj);
-        [ :elm_entry_select_none, [ :evas_object ], :void ],
+        [ :elm_entry_select_none, [ :pointer ], :void ],
         # EAPI void elm_entry_select_all(Evas_Object *obj);
-        [ :elm_entry_select_all, [ :evas_object ], :void ],
+        [ :elm_entry_select_all, [ :pointer ], :void ],
+        # EAPI Eina_Bool elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_entry_cursor_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool elm_entry_cursor_next(Evas_Object *obj);
-        [ :elm_entry_cursor_next, [ :evas_object ], :bool ],
+        [ :elm_entry_cursor_next, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_entry_cursor_prev(Evas_Object *obj);
-        [ :elm_entry_cursor_prev, [ :evas_object ], :bool ],
+        [ :elm_entry_cursor_prev, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_entry_cursor_up(Evas_Object *obj);
-        [ :elm_entry_cursor_up, [ :evas_object ], :bool ],
+        [ :elm_entry_cursor_up, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_entry_cursor_down(Evas_Object *obj);
-        [ :elm_entry_cursor_down, [ :evas_object ], :bool ],
+        [ :elm_entry_cursor_down, [ :pointer ], :bool ],
         # EAPI void elm_entry_cursor_begin_set(Evas_Object *obj);
-        [ :elm_entry_cursor_begin_set, [ :evas_object ], :void ],
+        [ :elm_entry_cursor_begin_set, [ :pointer ], :void ],
         # EAPI void elm_entry_cursor_end_set(Evas_Object *obj);
-        [ :elm_entry_cursor_end_set, [ :evas_object ], :void ],
+        [ :elm_entry_cursor_end_set, [ :pointer ], :void ],
         # EAPI void elm_entry_cursor_line_begin_set(Evas_Object *obj);
-        [ :elm_entry_cursor_line_begin_set, [ :evas_object ], :void ],
+        [ :elm_entry_cursor_line_begin_set, [ :pointer ], :void ],
         # EAPI void elm_entry_cursor_line_end_set(Evas_Object *obj);
-        [ :elm_entry_cursor_line_end_set, [ :evas_object ], :void ],
+        [ :elm_entry_cursor_line_end_set, [ :pointer ], :void ],
         # EAPI void elm_entry_cursor_selection_begin(Evas_Object *obj);
-        [ :elm_entry_cursor_selection_begin, [ :evas_object ], :void ],
+        [ :elm_entry_cursor_selection_begin, [ :pointer ], :void ],
         # EAPI void elm_entry_cursor_selection_end(Evas_Object *obj);
-        [ :elm_entry_cursor_selection_end, [ :evas_object ], :void ],
+        [ :elm_entry_cursor_selection_end, [ :pointer ], :void ],
         # EAPI Eina_Bool elm_entry_cursor_is_format_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_is_format_get, [ :evas_object ], :bool ],
+        [ :elm_entry_cursor_is_format_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_entry_cursor_is_visible_format_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_is_visible_format_get, [ :evas_object ], :bool ],
+        [ :elm_entry_cursor_is_visible_format_get, [ :pointer ], :bool ],
         # EAPI char *elm_entry_cursor_content_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_content_get, [ :evas_object ], :string ],
-        # EAPI Eina_Bool elm_entry_cursor_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_entry_cursor_geometry_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        [ :elm_entry_cursor_content_get, [ :pointer ], :string ],
         # EAPI void elm_entry_cursor_pos_set(Evas_Object *obj, int pos);
-        [ :elm_entry_cursor_pos_set, [ :evas_object, :int ], :void ],
+        [ :elm_entry_cursor_pos_set, [ :pointer, :int ], :void ],
         # EAPI int elm_entry_cursor_pos_get(const Evas_Object *obj);
-        [ :elm_entry_cursor_pos_get, [ :evas_object ], :int ],
+        [ :elm_entry_cursor_pos_get, [ :pointer ], :int ],
         # EAPI void elm_entry_selection_cut(Evas_Object *obj);
-        [ :elm_entry_selection_cut, [ :evas_object ], :void ],
+        [ :elm_entry_selection_cut, [ :pointer ], :void ],
         # EAPI void elm_entry_selection_copy(Evas_Object *obj);
-        [ :elm_entry_selection_copy, [ :evas_object ], :void ],
+        [ :elm_entry_selection_copy, [ :pointer ], :void ],
         # EAPI void elm_entry_selection_paste(Evas_Object *obj);
-        [ :elm_entry_selection_paste, [ :evas_object ], :void ],
+        [ :elm_entry_selection_paste, [ :pointer ], :void ],
         # EAPI void elm_entry_context_menu_clear(Evas_Object *obj);
-        [ :elm_entry_context_menu_clear, [ :evas_object ], :void ],
+        [ :elm_entry_context_menu_clear, [ :pointer ], :void ],
         # EAPI void elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
-        [ :elm_entry_context_menu_item_add, [ :evas_object, :string, :string, :elm_icon_type, :evas_smart_cb, :pointer ], :void ],
+        [ :elm_entry_context_menu_item_add, [ :pointer, :string, :string, :elm_icon_type, :evas_smart_cb, :pointer ], :void ],
         # EAPI void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_entry_context_menu_disabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_context_menu_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj);
-        [ :elm_entry_context_menu_disabled_get, [ :evas_object ], :bool ],
+        [ :elm_entry_context_menu_disabled_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_item_provider_append(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data);
-        [ :elm_entry_item_provider_append, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
+        [ :elm_entry_item_provider_append, [ :pointer, :elm_entry_item_provider_cb, :pointer ], :void ],
         # EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data);
-        [ :elm_entry_item_provider_prepend, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
+        [ :elm_entry_item_provider_prepend, [ :pointer, :elm_entry_item_provider_cb, :pointer ], :void ],
         # EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data);
-        [ :elm_entry_item_provider_remove, [ :evas_object, :elm_entry_item_provider_cb, :pointer ], :void ],
+        [ :elm_entry_item_provider_remove, [ :pointer, :elm_entry_item_provider_cb, :pointer ], :void ],
         # EAPI void elm_entry_markup_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
-        [ :elm_entry_markup_filter_append, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
+        [ :elm_entry_markup_filter_append, [ :pointer, :elm_entry_filter_cb, :pointer ], :void ],
         # EAPI void elm_entry_markup_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
-        [ :elm_entry_markup_filter_prepend, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
+        [ :elm_entry_markup_filter_prepend, [ :pointer, :elm_entry_filter_cb, :pointer ], :void ],
         # EAPI void elm_entry_markup_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data);
-        [ :elm_entry_markup_filter_remove, [ :evas_object, :elm_entry_filter_cb, :pointer ], :void ],
-        # EAPI char *elm_entry_markup_to_utf8(const char *s);
-        [ :elm_entry_markup_to_utf8, [ :string ], :string ],
-        # EAPI char *elm_entry_utf8_to_markup(const char *s);
-        [ :elm_entry_utf8_to_markup, [ :string ], :string ],
+        [ :elm_entry_markup_filter_remove, [ :pointer, :elm_entry_filter_cb, :pointer ], :void ],
         # EAPI Eina_Bool elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format);
-        [ :elm_entry_file_set, [ :evas_object, :string, :elm_text_format ], :bool ],
+        [ :elm_entry_file_set, [ :pointer, :string, :elm_text_format ], :bool ],
         # EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format);
-        [ :elm_entry_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_entry_file_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_entry_file_save(Evas_Object *obj);
-        [ :elm_entry_file_save, [ :evas_object ], :void ],
+        [ :elm_entry_file_save, [ :pointer ], :void ],
         # EAPI void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave);
-        [ :elm_entry_autosave_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_autosave_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_autosave_get(const Evas_Object *obj);
-        [ :elm_entry_autosave_get, [ :evas_object ], :bool ],
+        [ :elm_entry_autosave_get, [ :pointer ], :bool ],
+        # EAPI void elm_entry_cnp_mode_set(Evas_Object *obj, Elm_Cnp_Mode cnp_mode);
+        [ :elm_entry_cnp_mode_set, [ :pointer, :elm_cnp_mode ], :void ],
+        # EAPI Elm_Cnp_Mode elm_entry_cnp_mode_get(const Evas_Object *obj);
+        [ :elm_entry_cnp_mode_get, [ :pointer ], :elm_cnp_mode ],
         # EAPI void elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll);
-        [ :elm_entry_scrollable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_scrollable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_scrollable_get(const Evas_Object *obj);
-        [ :elm_entry_scrollable_get, [ :evas_object ], :bool ],
+        [ :elm_entry_scrollable_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting);
-        [ :elm_entry_icon_visible_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_icon_visible_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting);
-        [ :elm_entry_end_visible_set, [ :evas_object, :bool ], :void ],
-        # EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
-        [ :elm_entry_scrollbar_policy_set, [ :evas_object, :elm_scroller_policy, :elm_scroller_policy ], :void ],
-        # EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_entry_bounce_set, [ :evas_object, :bool, :bool ], :void ],
-        # EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_entry_bounce_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_entry_end_visible_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout);
-        [ :elm_entry_input_panel_layout_set, [ :evas_object, :elm_input_panel_layout ], :void ],
+        [ :elm_entry_input_panel_layout_set, [ :pointer, :elm_input_panel_layout ], :void ],
         # EAPI Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(const Evas_Object *obj);
-        [ :elm_entry_input_panel_layout_get, [ :evas_object ], :elm_input_panel_layout ],
+        [ :elm_entry_input_panel_layout_get, [ :pointer ], :elm_input_panel_layout ],
         # EAPI void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type);
-        [ :elm_entry_autocapital_type_set, [ :evas_object, :elm_autocapital_type ], :void ],
+        [ :elm_entry_autocapital_type_set, [ :pointer, :elm_autocapital_type ], :void ],
         # EAPI Elm_Autocapital_Type elm_entry_autocapital_type_get(const Evas_Object *obj);
-        [ :elm_entry_autocapital_type_get, [ :evas_object ], :elm_autocapital_type ],
+        [ :elm_entry_autocapital_type_get, [ :pointer ], :elm_autocapital_type ],
+        # EAPI void elm_entry_prediction_allow_set(Evas_Object *obj, Eina_Bool prediction);
+        [ :elm_entry_prediction_allow_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_entry_prediction_allow_get(const Evas_Object *obj);
+        [ :elm_entry_prediction_allow_get, [ :pointer ], :bool ],
+        # EAPI void elm_entry_imf_context_reset(Evas_Object *obj);
+        [ :elm_entry_imf_context_reset, [ :pointer ], :void ],
         # EAPI void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_entry_input_panel_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_input_panel_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_input_panel_enabled_get(const Evas_Object *obj);
-        [ :elm_entry_input_panel_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_entry_input_panel_enabled_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_input_panel_show(Evas_Object *obj);
-        [ :elm_entry_input_panel_show, [ :evas_object ], :void ],
+        [ :elm_entry_input_panel_show, [ :pointer ], :void ],
         # EAPI void elm_entry_input_panel_hide(Evas_Object *obj);
-        [ :elm_entry_input_panel_hide, [ :evas_object ], :void ],
+        [ :elm_entry_input_panel_hide, [ :pointer ], :void ],
         # EAPI void elm_entry_input_panel_language_set(Evas_Object *obj, Elm_Input_Panel_Lang lang);
-        [ :elm_entry_input_panel_language_set, [ :evas_object, :elm_input_panel_lang ], :void ],
+        [ :elm_entry_input_panel_language_set, [ :pointer, :elm_input_panel_lang ], :void ],
         # EAPI Elm_Input_Panel_Lang elm_entry_input_panel_language_get(const Evas_Object *obj);
-        [ :elm_entry_input_panel_language_get, [ :evas_object ], :elm_input_panel_lang ],
+        [ :elm_entry_input_panel_language_get, [ :pointer ], :elm_input_panel_lang ],
         # EAPI void elm_entry_input_panel_imdata_set(Evas_Object *obj, const void *data, int len);
-        [ :elm_entry_input_panel_imdata_set, [ :evas_object, :pointer, :int ], :void ],
+        [ :elm_entry_input_panel_imdata_set, [ :pointer, :pointer, :int ], :void ],
         # EAPI void elm_entry_input_panel_imdata_get(const Evas_Object *obj, void *data, int *len);
-        [ :elm_entry_input_panel_imdata_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_entry_input_panel_imdata_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_entry_input_panel_return_key_type_set(Evas_Object *obj, Elm_Input_Panel_Return_Key_Type return_key_type);
-        [ :elm_entry_input_panel_return_key_type_set, [ :evas_object, :elm_input_panel_return_key_type ], :void ],
+        [ :elm_entry_input_panel_return_key_type_set, [ :pointer, :elm_input_panel_return_key_type ], :void ],
         # EAPI Elm_Input_Panel_Return_Key_Type elm_entry_input_panel_return_key_type_get(const Evas_Object *obj);
-        [ :elm_entry_input_panel_return_key_type_get, [ :evas_object ], :elm_input_panel_return_key_type ],
+        [ :elm_entry_input_panel_return_key_type_get, [ :pointer ], :elm_input_panel_return_key_type ],
         # EAPI void elm_entry_input_panel_return_key_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_entry_input_panel_return_key_disabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_entry_input_panel_return_key_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_entry_input_panel_return_key_disabled_get(const Evas_Object *obj);
-        [ :elm_entry_input_panel_return_key_disabled_get, [ :evas_object ], :bool ],
+        [ :elm_entry_input_panel_return_key_disabled_get, [ :pointer ], :bool ],
         # EAPI void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_entry_input_panel_return_key_autoenabled_set, [ :evas_object, :bool ], :void ],
-        # EAPI void elm_entry_imf_context_reset(Evas_Object *obj);
-        [ :elm_entry_imf_context_reset, [ :evas_object ], :void ],
-        # EAPI void elm_entry_prediction_allow_set(Evas_Object *obj, Eina_Bool prediction);
-        [ :elm_entry_prediction_allow_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_entry_prediction_allow_get(const Evas_Object *obj);
-        [ :elm_entry_prediction_allow_get, [ :evas_object ], :bool ],
-        # EAPI void elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text);
-        [ :elm_entry_filter_limit_size, [ :pointer, :evas_object, :pointer ], :void ],
-        # EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text);
-        [ :elm_entry_filter_accept_set, [ :pointer, :evas_object, :pointer ], :void ],
+        [ :elm_entry_input_panel_return_key_autoenabled_set, [ :pointer, :bool ], :void ],
         # EAPI void *elm_entry_imf_context_get(Evas_Object *obj);
-        [ :elm_entry_imf_context_get, [ :evas_object ], :pointer ],
-        # EAPI void elm_entry_cnp_mode_set(Evas_Object *obj, Elm_Cnp_Mode cnp_mode);
-        [ :elm_entry_cnp_mode_set, [ :evas_object, :elm_cnp_mode ], :void ],
-        # EAPI Elm_Cnp_Mode elm_entry_cnp_mode_get(const Evas_Object *obj);
-        [ :elm_entry_cnp_mode_get, [ :evas_object ], :elm_cnp_mode ],
+        [ :elm_entry_imf_context_get, [ :pointer ], :pointer ],
         # EAPI void elm_entry_anchor_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_entry_anchor_hover_parent_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_entry_anchor_hover_parent_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_entry_anchor_hover_parent_get(const Evas_Object *obj);
-        [ :elm_entry_anchor_hover_parent_get, [ :evas_object ], :evas_object ],
+        [ :elm_entry_anchor_hover_parent_get, [ :pointer ], :pointer ],
         # EAPI void elm_entry_anchor_hover_style_set(Evas_Object *obj, const char *style);
-        [ :elm_entry_anchor_hover_style_set, [ :evas_object, :string ], :void ],
+        [ :elm_entry_anchor_hover_style_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_entry_anchor_hover_style_get(const Evas_Object *obj);
-        [ :elm_entry_anchor_hover_style_get, [ :evas_object ], :string ],
+        [ :elm_entry_anchor_hover_style_get, [ :pointer ], :string ],
         # EAPI void elm_entry_anchor_hover_end(Evas_Object *obj);
-        [ :elm_entry_anchor_hover_end, [ :evas_object ], :void ],
+        [ :elm_entry_anchor_hover_end, [ :pointer ], :void ],
+        # EAPI void elm_entry_input_panel_layout_variation_set(Evas_Object *obj, int variation);
+        [ :elm_entry_input_panel_layout_variation_set, [ :pointer, :int ], :void ],
+        # EAPI int elm_entry_input_panel_layout_variation_get(const Evas_Object *obj);
+        [ :elm_entry_input_panel_layout_variation_get, [ :pointer ], :int ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_fileselector.rb b/lib/efl/native/elm/elm_fileselector.rb
index 6c86789..0b0769a 100644
--- a/lib/efl/native/elm/elm_fileselector.rb
+++ b/lib/efl/native/elm/elm_fileselector.rb
@@ -28,35 +28,53 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent);
-        [ :elm_fileselector_add, [ :evas_object ], :evas_object ],
+        [ :elm_fileselector_add, [ :pointer ], :pointer ],
         # EAPI void elm_fileselector_is_save_set(Evas_Object *obj, Eina_Bool is_save);
-        [ :elm_fileselector_is_save_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_is_save_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_is_save_get(const Evas_Object *obj);
-        [ :elm_fileselector_is_save_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_is_save_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_folder_only_set(Evas_Object *obj, Eina_Bool only);
-        [ :elm_fileselector_folder_only_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_folder_only_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_folder_only_get(const Evas_Object *obj);
-        [ :elm_fileselector_folder_only_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_folder_only_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_buttons_ok_cancel_set(Evas_Object *obj, Eina_Bool buttons);
-        [ :elm_fileselector_buttons_ok_cancel_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_buttons_ok_cancel_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_buttons_ok_cancel_get(const Evas_Object *obj);
-        [ :elm_fileselector_buttons_ok_cancel_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_buttons_ok_cancel_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_expandable_set(Evas_Object *obj, Eina_Bool expand);
-        [ :elm_fileselector_expandable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_expandable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_expandable_get(const Evas_Object *obj);
-        [ :elm_fileselector_expandable_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_expandable_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_path_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_path_set, [ :evas_object, :string ], :void ],
+        [ :elm_fileselector_path_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_fileselector_path_get(const Evas_Object *obj);
-        [ :elm_fileselector_path_get, [ :evas_object ], :string ],
-        # EAPI Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_selected_set, [ :evas_object, :string ], :bool ],
-        # EAPI const char *elm_fileselector_selected_get(const Evas_Object *obj);
-        [ :elm_fileselector_selected_get, [ :evas_object ], :string ],
+        [ :elm_fileselector_path_get, [ :pointer ], :string ],
         # EAPI void elm_fileselector_mode_set(Evas_Object *obj, Elm_Fileselector_Mode mode);
-        [ :elm_fileselector_mode_set, [ :evas_object, :elm_fileselector_mode ], :void ],
+        [ :elm_fileselector_mode_set, [ :pointer, :elm_fileselector_mode ], :void ],
         # EAPI Elm_Fileselector_Mode elm_fileselector_mode_get(const Evas_Object *obj);
-        [ :elm_fileselector_mode_get, [ :evas_object ], :elm_fileselector_mode ],
+        [ :elm_fileselector_mode_get, [ :pointer ], :elm_fileselector_mode ],
+        # EAPI void elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi);
+        [ :elm_fileselector_multi_select_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_fileselector_multi_select_get(const Evas_Object *obj);
+        [ :elm_fileselector_multi_select_get, [ :pointer ], :bool ],
+        # EAPI Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const char *path);
+        [ :elm_fileselector_selected_set, [ :pointer, :string ], :bool ],
+        # EAPI const char *elm_fileselector_selected_get(const Evas_Object *obj);
+        [ :elm_fileselector_selected_get, [ :pointer ], :string ],
+        # EAPI const Eina_List *elm_fileselector_selected_paths_get(const Evas_Object *obj);
+        [ :elm_fileselector_selected_paths_get, [ :pointer ], :eina_list ],
+        # EAPI Eina_Bool elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_types, const char *filter_name);
+        [ :elm_fileselector_mime_types_filter_append, [ :pointer, :string, :string ], :bool ],
+        # EAPI void elm_fileselector_filters_clear(Evas_Object *obj);
+        [ :elm_fileselector_filters_clear, [ :pointer ], :void ],
+        # EAPI void elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible);
+        [ :elm_fileselector_hidden_visible_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_fileselector_hidden_visible_get(const Evas_Object *obj);
+        [ :elm_fileselector_hidden_visible_get, [ :pointer ], :bool ],
+        # EAPI void elm_fileselector_thumbnail_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+        [ :elm_fileselector_thumbnail_size_set, [ :pointer, :int, :int ], :void ],
+        # EAPI void elm_fileselector_thumbnail_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_fileselector_thumbnail_size_get, [ :pointer, :pointer, :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_fileselector_button.rb b/lib/efl/native/elm/elm_fileselector_button.rb
index 7b7fe4f..a20c534 100644
--- a/lib/efl/native/elm/elm_fileselector_button.rb
+++ b/lib/efl/native/elm/elm_fileselector_button.rb
@@ -24,35 +24,35 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent);
-        [ :elm_fileselector_button_add, [ :evas_object ], :evas_object ],
+        [ :elm_fileselector_button_add, [ :pointer ], :pointer ],
         # EAPI void elm_fileselector_button_window_title_set(Evas_Object *obj, const char *title);
-        [ :elm_fileselector_button_window_title_set, [ :evas_object, :string ], :void ],
+        [ :elm_fileselector_button_window_title_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_fileselector_button_window_title_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_window_title_get, [ :evas_object ], :string ],
+        [ :elm_fileselector_button_window_title_get, [ :pointer ], :string ],
         # EAPI void elm_fileselector_button_window_size_set(Evas_Object *obj, Evas_Coord width, Evas_Coord height);
-        [ :elm_fileselector_button_window_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_fileselector_button_window_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_fileselector_button_window_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
-        [ :elm_fileselector_button_window_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_fileselector_button_window_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_fileselector_button_path_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_button_path_set, [ :evas_object, :string ], :void ],
+        [ :elm_fileselector_button_path_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_fileselector_button_path_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_path_get, [ :evas_object ], :string ],
+        [ :elm_fileselector_button_path_get, [ :pointer ], :string ],
         # EAPI void elm_fileselector_button_expandable_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_expandable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_button_expandable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_button_expandable_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_expandable_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_button_expandable_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_button_folder_only_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_folder_only_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_button_folder_only_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_button_folder_only_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_folder_only_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_button_folder_only_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_button_is_save_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_is_save_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_button_is_save_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_button_is_save_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_is_save_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_button_is_save_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_button_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_button_inwin_mode_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_button_inwin_mode_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_button_inwin_mode_get(const Evas_Object *obj);
-        [ :elm_fileselector_button_inwin_mode_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_button_inwin_mode_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_fileselector_entry.rb b/lib/efl/native/elm/elm_fileselector_entry.rb
index 3af8cd5..86e4f72 100644
--- a/lib/efl/native/elm/elm_fileselector_entry.rb
+++ b/lib/efl/native/elm/elm_fileselector_entry.rb
@@ -24,39 +24,39 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_fileselector_entry_add(Evas_Object *parent);
-        [ :elm_fileselector_entry_add, [ :evas_object ], :evas_object ],
+        [ :elm_fileselector_entry_add, [ :pointer ], :pointer ],
         # EAPI void elm_fileselector_entry_window_title_set(Evas_Object *obj, const char *title);
-        [ :elm_fileselector_entry_window_title_set, [ :evas_object, :string ], :void ],
+        [ :elm_fileselector_entry_window_title_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_fileselector_entry_window_title_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_window_title_get, [ :evas_object ], :string ],
+        [ :elm_fileselector_entry_window_title_get, [ :pointer ], :string ],
         # EAPI void elm_fileselector_entry_window_size_set(Evas_Object *obj, Evas_Coord width, Evas_Coord height);
-        [ :elm_fileselector_entry_window_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_fileselector_entry_window_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_fileselector_entry_window_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
-        [ :elm_fileselector_entry_window_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_fileselector_entry_window_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_fileselector_entry_path_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_entry_path_set, [ :evas_object, :string ], :void ],
+        [ :elm_fileselector_entry_path_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_fileselector_entry_path_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_path_get, [ :evas_object ], :string ],
+        [ :elm_fileselector_entry_path_get, [ :pointer ], :string ],
         # EAPI void elm_fileselector_entry_expandable_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_expandable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_entry_expandable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_entry_expandable_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_expandable_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_entry_expandable_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_entry_folder_only_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_folder_only_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_entry_folder_only_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_entry_folder_only_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_folder_only_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_entry_folder_only_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_entry_is_save_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_is_save_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_entry_is_save_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_entry_is_save_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_is_save_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_entry_is_save_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_entry_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_fileselector_entry_inwin_mode_set, [ :evas_object, :bool ], :void ],
+        [ :elm_fileselector_entry_inwin_mode_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_fileselector_entry_inwin_mode_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_inwin_mode_get, [ :evas_object ], :bool ],
+        [ :elm_fileselector_entry_inwin_mode_get, [ :pointer ], :bool ],
         # EAPI void elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path);
-        [ :elm_fileselector_entry_selected_set, [ :evas_object, :string ], :void ],
+        [ :elm_fileselector_entry_selected_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_fileselector_entry_selected_get(const Evas_Object *obj);
-        [ :elm_fileselector_entry_selected_get, [ :evas_object ], :string ],
+        [ :elm_fileselector_entry_selected_get, [ :pointer ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_flip.rb b/lib/efl/native/elm/elm_flip.rb
index d4b3ad9..a342366 100644
--- a/lib/efl/native/elm/elm_flip.rb
+++ b/lib/efl/native/elm/elm_flip.rb
@@ -30,30 +30,33 @@ module Efl
         enum :elm_flip_interaction, [ :elm_flip_interaction_none, :elm_flip_interaction_rotate, :elm_flip_interaction_cube, :elm_flip_interaction_page
             ]
         # typedef enum {...} Elm_Flip_Direction;
-        enum :elm_flip_direction, [ :elm_flip_direction_up, :elm_flip_direction_down, :elm_flip_direction_left, :elm_flip_direction_right ]
+        enum :elm_flip_direction, [ :elm_flip_direction_up, 0, :elm_flip_direction_down, 1, :elm_flip_direction_left, 2, :elm_flip_direction_right, 3
+            ]
         #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
-        [ :elm_flip_add, [ :evas_object ], :evas_object ],
+        [ :elm_flip_add, [ :pointer ], :pointer ],
+        # EAPI Eina_Bool elm_flip_front_visible_get(const Evas_Object *obj);
+        [ :elm_flip_front_visible_get, [ :pointer ], :bool ],
         # EAPI void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y);
-        [ :elm_flip_perspective_set, [ :evas_object, :int, :int, :int ], :void ],
+        [ :elm_flip_perspective_set, [ :pointer, :int, :int, :int ], :void ],
         # EAPI void elm_flip_go(Evas_Object *obj, Elm_Flip_Mode mode);
-        [ :elm_flip_go, [ :evas_object, :elm_flip_mode ], :void ],
+        [ :elm_flip_go, [ :pointer, :elm_flip_mode ], :void ],
         # EAPI void elm_flip_go_to(Evas_Object *obj, Eina_Bool front, Elm_Flip_Mode mode);
-        [ :elm_flip_go_to, [ :evas_object, :bool, :elm_flip_mode ], :void ],
+        [ :elm_flip_go_to, [ :pointer, :bool, :elm_flip_mode ], :void ],
         # EAPI void elm_flip_interaction_set(Evas_Object *obj, Elm_Flip_Interaction mode);
-        [ :elm_flip_interaction_set, [ :evas_object, :elm_flip_interaction ], :void ],
+        [ :elm_flip_interaction_set, [ :pointer, :elm_flip_interaction ], :void ],
         # EAPI Elm_Flip_Interaction elm_flip_interaction_get(const Evas_Object *obj);
-        [ :elm_flip_interaction_get, [ :evas_object ], :elm_flip_interaction ],
+        [ :elm_flip_interaction_get, [ :pointer ], :elm_flip_interaction ],
         # EAPI void elm_flip_interaction_direction_enabled_set(Evas_Object *obj, Elm_Flip_Direction dir, Eina_Bool enabled);
-        [ :elm_flip_interaction_direction_enabled_set, [ :evas_object, :elm_flip_direction, :bool ], :void ],
+        [ :elm_flip_interaction_direction_enabled_set, [ :pointer, :elm_flip_direction, :bool ], :void ],
         # EAPI Eina_Bool elm_flip_interaction_direction_enabled_get(Evas_Object *obj, Elm_Flip_Direction dir);
-        [ :elm_flip_interaction_direction_enabled_get, [ :evas_object, :elm_flip_direction ], :bool ],
+        [ :elm_flip_interaction_direction_enabled_get, [ :pointer, :elm_flip_direction ], :bool ],
         # EAPI void elm_flip_interaction_direction_hitsize_set(Evas_Object *obj, Elm_Flip_Direction dir, double hitsize);
-        [ :elm_flip_interaction_direction_hitsize_set, [ :evas_object, :elm_flip_direction, :double ], :void ],
+        [ :elm_flip_interaction_direction_hitsize_set, [ :pointer, :elm_flip_direction, :double ], :void ],
         # EAPI double elm_flip_interaction_direction_hitsize_get(Evas_Object *obj, Elm_Flip_Direction dir);
-        [ :elm_flip_interaction_direction_hitsize_get, [ :evas_object, :elm_flip_direction ], :double ],
+        [ :elm_flip_interaction_direction_hitsize_get, [ :pointer, :elm_flip_direction ], :double ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_flipselector.rb b/lib/efl/native/elm/elm_flipselector.rb
index 895ecf2..b02f969 100644
--- a/lib/efl/native/elm/elm_flipselector.rb
+++ b/lib/efl/native/elm/elm_flipselector.rb
@@ -23,24 +23,6 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
-        # EAPI Evas_Object *elm_flipselector_add(Evas_Object *parent);
-        [ :elm_flipselector_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_flipselector_flip_next(Evas_Object *obj);
-        [ :elm_flipselector_flip_next, [ :evas_object ], :void ],
-        # EAPI void elm_flipselector_flip_prev(Evas_Object *obj);
-        [ :elm_flipselector_flip_prev, [ :evas_object ], :void ],
-        # EAPI Elm_Object_Item *elm_flipselector_item_append(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_flipselector_item_append, [ :evas_object, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_flipselector_item_prepend(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_flipselector_item_prepend, [ :evas_object, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI const Eina_List *elm_flipselector_items_get(const Evas_Object *obj);
-        [ :elm_flipselector_items_get, [ :evas_object ], :eina_list ],
-        # EAPI Elm_Object_Item *elm_flipselector_first_item_get(const Evas_Object *obj);
-        [ :elm_flipselector_first_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_flipselector_last_item_get(const Evas_Object *obj);
-        [ :elm_flipselector_last_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_flipselector_selected_item_get(const Evas_Object *obj);
-        [ :elm_flipselector_selected_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI void elm_flipselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
         [ :elm_flipselector_item_selected_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_flipselector_item_selected_get(const Elm_Object_Item *it);
@@ -49,10 +31,28 @@ module Efl
         [ :elm_flipselector_item_prev_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_flipselector_item_next_get(const Elm_Object_Item *it);
         [ :elm_flipselector_item_next_get, [ :elm_object_item ], :elm_object_item ],
+        # EAPI Evas_Object *elm_flipselector_add(Evas_Object *parent);
+        [ :elm_flipselector_add, [ :pointer ], :pointer ],
+        # EAPI void elm_flipselector_flip_next(Evas_Object *obj);
+        [ :elm_flipselector_flip_next, [ :pointer ], :void ],
+        # EAPI void elm_flipselector_flip_prev(Evas_Object *obj);
+        [ :elm_flipselector_flip_prev, [ :pointer ], :void ],
+        # EAPI Elm_Object_Item *elm_flipselector_item_append(Evas_Object *obj, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_flipselector_item_append, [ :pointer, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_flipselector_item_prepend(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
+        [ :elm_flipselector_item_prepend, [ :pointer, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI const Eina_List *elm_flipselector_items_get(const Evas_Object *obj);
+        [ :elm_flipselector_items_get, [ :pointer ], :eina_list ],
+        # EAPI Elm_Object_Item *elm_flipselector_first_item_get(const Evas_Object *obj);
+        [ :elm_flipselector_first_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_flipselector_last_item_get(const Evas_Object *obj);
+        [ :elm_flipselector_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_flipselector_selected_item_get(const Evas_Object *obj);
+        [ :elm_flipselector_selected_item_get, [ :pointer ], :elm_object_item ],
         # EAPI void elm_flipselector_first_interval_set(Evas_Object *obj, double interval);
-        [ :elm_flipselector_first_interval_set, [ :evas_object, :double ], :void ],
+        [ :elm_flipselector_first_interval_set, [ :pointer, :double ], :void ],
         # EAPI double elm_flipselector_first_interval_get(const Evas_Object *obj);
-        [ :elm_flipselector_first_interval_get, [ :evas_object ], :double ],
+        [ :elm_flipselector_first_interval_get, [ :pointer ], :double ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_focus.rb b/lib/efl/native/elm/elm_focus.rb
index 91cb862..3be30d0 100644
--- a/lib/efl/native/elm/elm_focus.rb
+++ b/lib/efl/native/elm/elm_focus.rb
@@ -21,32 +21,42 @@ module Efl
         #
         ffi_lib 'elementary.so.1'
         #
+        # ENUMS
+        # typedef enum {...} Elm_Focus_Direction;
+        enum :elm_focus_direction, [ :elm_focus_previous, :elm_focus_next, :elm_focus_up, :elm_focus_down, :elm_focus_right, :elm_focus_left ]
+        #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj);
-        [ :elm_object_focus_get, [ :evas_object ], :bool ],
+        [ :elm_object_focus_get, [ :pointer ], :bool ],
         # EAPI void elm_object_focus_set(Evas_Object *obj, Eina_Bool focus);
-        [ :elm_object_focus_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_focus_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_object_focus_allow_set(Evas_Object *obj, Eina_Bool enable);
-        [ :elm_object_focus_allow_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_focus_allow_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_object_focus_allow_get(const Evas_Object *obj);
-        [ :elm_object_focus_allow_get, [ :evas_object ], :bool ],
+        [ :elm_object_focus_allow_get, [ :pointer ], :bool ],
         # EAPI void elm_object_focus_custom_chain_set(Evas_Object *obj, Eina_List *objs);
-        [ :elm_object_focus_custom_chain_set, [ :evas_object, :eina_list ], :void ],
+        [ :elm_object_focus_custom_chain_set, [ :pointer, :eina_list ], :void ],
         # EAPI void elm_object_focus_custom_chain_unset(Evas_Object *obj);
-        [ :elm_object_focus_custom_chain_unset, [ :evas_object ], :void ],
+        [ :elm_object_focus_custom_chain_unset, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_object_focus_custom_chain_get(const Evas_Object *obj);
-        [ :elm_object_focus_custom_chain_get, [ :evas_object ], :eina_list ],
+        [ :elm_object_focus_custom_chain_get, [ :pointer ], :eina_list ],
         # EAPI void elm_object_focus_custom_chain_append(Evas_Object *obj, Evas_Object *child, Evas_Object *relative_child);
-        [ :elm_object_focus_custom_chain_append, [ :evas_object, :evas_object, :evas_object ], :void ],
+        [ :elm_object_focus_custom_chain_append, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_object_focus_custom_chain_prepend(Evas_Object *obj, Evas_Object *child, Evas_Object *relative_child);
-        [ :elm_object_focus_custom_chain_prepend, [ :evas_object, :evas_object, :evas_object ], :void ],
+        [ :elm_object_focus_custom_chain_prepend, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Direction dir);
-        [ :elm_object_focus_next, [ :evas_object, :elm_focus_direction ], :void ],
+        [ :elm_object_focus_next, [ :pointer, :elm_focus_direction ], :void ],
+        # EAPI Evas_Object * elm_object_focus_next_object_get(const Evas_Object *obj, Elm_Focus_Direction dir);
+        [ :elm_object_focus_next_object_get, [ :pointer, :elm_focus_direction ], :pointer ],
+        # EAPI void elm_object_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir);
+        [ :elm_object_focus_next_object_set, [ :pointer, :pointer, :elm_focus_direction ], :void ],
+        # EAPI Evas_Object *elm_object_focused_object_get(const Evas_Object *obj);
+        [ :elm_object_focused_object_get, [ :pointer ], :pointer ],
         # EAPI void elm_object_tree_focus_allow_set(Evas_Object *obj, Eina_Bool focusable);
-        [ :elm_object_tree_focus_allow_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_tree_focus_allow_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_object_tree_focus_allow_get(const Evas_Object *obj);
-        [ :elm_object_tree_focus_allow_get, [ :evas_object ], :bool ],
+        [ :elm_object_tree_focus_allow_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_frame.rb b/lib/efl/native/elm/elm_frame.rb
index 1f6b4ce..0e40cc7 100644
--- a/lib/efl/native/elm/elm_frame.rb
+++ b/lib/efl/native/elm/elm_frame.rb
@@ -24,17 +24,17 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_frame_add(Evas_Object *parent);
-        [ :elm_frame_add, [ :evas_object ], :evas_object ],
+        [ :elm_frame_add, [ :pointer ], :pointer ],
         # EAPI void elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool autocollapse);
-        [ :elm_frame_autocollapse_set, [ :evas_object, :bool ], :void ],
+        [ :elm_frame_autocollapse_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_frame_autocollapse_get(const Evas_Object *obj);
-        [ :elm_frame_autocollapse_get, [ :evas_object ], :bool ],
+        [ :elm_frame_autocollapse_get, [ :pointer ], :bool ],
         # EAPI void elm_frame_collapse_set(Evas_Object *obj, Eina_Bool collapse);
-        [ :elm_frame_collapse_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_frame_collapse_get(const Evas_Object *obj);
-        [ :elm_frame_collapse_get, [ :evas_object ], :bool ],
+        [ :elm_frame_collapse_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_frame_collapse_go(Evas_Object *obj, Eina_Bool collapse);
-        [ :elm_frame_collapse_go, [ :evas_object, :bool ], :void ],
+        [ :elm_frame_collapse_go, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_frame_collapse_get(const Evas_Object *obj);
+        [ :elm_frame_collapse_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_gen.rb b/lib/efl/native/elm/elm_gen.rb
index 4038137..155e859 100644
--- a/lib/efl/native/elm/elm_gen.rb
+++ b/lib/efl/native/elm/elm_gen.rb
@@ -29,13 +29,13 @@ module Efl
         #
         # CALLBACKS
         # typedef char *(*Elm_Gen_Item_Text_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_text_get_cb, [ :pointer, :evas_object, :string ], :string
+        callback :elm_gen_item_text_get_cb, [ :pointer, :pointer, :string ], :string
         # typedef Evas_Object *(*Elm_Gen_Item_Content_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_content_get_cb, [ :pointer, :evas_object, :string ], :evas_object
+        callback :elm_gen_item_content_get_cb, [ :pointer, :pointer, :string ], :pointer
         # typedef Eina_Bool (*Elm_Gen_Item_State_Get_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :elm_gen_item_state_get_cb, [ :pointer, :evas_object, :string ], :bool
+        callback :elm_gen_item_state_get_cb, [ :pointer, :pointer, :string ], :bool
         # typedef void (*Elm_Gen_Item_Del_Cb) (void *data, Evas_Object *obj);
-        callback :elm_gen_item_del_cb, [ :pointer, :evas_object ], :void
+        callback :elm_gen_item_del_cb, [ :pointer, :pointer ], :void
         #
         # FUNCTIONS
         fcts = [
diff --git a/lib/efl/native/elm/elm_general.rb b/lib/efl/native/elm/elm_general.rb
index 1fa26bb..f4e734a 100644
--- a/lib/efl/native/elm/elm_general.rb
+++ b/lib/efl/native/elm/elm_general.rb
@@ -27,24 +27,27 @@ module Efl
         enum :elm_object_layer, [ :elm_object_layer_background, EVAS_LAYER_MIN+64, :elm_object_layer_default, 0, :elm_object_layer_focus,
             EVAS_LAYER_MAX-128, :elm_object_layer_tooltip, EVAS_LAYER_MAX-64, :elm_object_layer_cursor, EVAS_LAYER_MAX-32, :elm_object_layer_last, 32736 ]
         # typedef enum {...} Elm_Policy;
-        enum :elm_policy, [ :elm_policy_quit, :elm_policy_last ]
+        enum :elm_policy, [ :elm_policy_quit, :elm_policy_exit, :elm_policy_throttle, :elm_policy_last ]
         # typedef enum {...} Elm_Policy_Quit;
         enum :elm_policy_quit, [ :elm_policy_quit_none, 0, :elm_policy_quit_last_window_closed, 1 ]
-        # typedef enum {...} Elm_Focus_Direction;
-        enum :elm_focus_direction, [ :elm_focus_previous, :elm_focus_next ]
+        # typedef enum {...} Elm_Policy_Exit;
+        enum :elm_policy_exit, [ :elm_policy_exit_none, 0, :elm_policy_exit_windows_del, 1 ]
+        # typedef enum {...} Elm_Policy_Throttle;
+        enum :elm_policy_throttle, [ :elm_policy_throttle_config, 0, :elm_policy_throttle_hidden_always, 1, :elm_policy_throttle_never, 2 ]
         # typedef enum {...} Elm_Object_Select_Mode;
         enum :elm_object_select_mode, [ :elm_object_select_mode_default, 0, :elm_object_select_mode_always, 1, :elm_object_select_mode_none, 2,
             :elm_object_select_mode_display_only, 3, :elm_object_select_mode_max, 4 ]
+        # typedef enum {...} Elm_Object_Multi_Select_Mode;
+        enum :elm_object_multi_select_mode, [ :elm_object_multi_select_mode_default, 0, :elm_object_multi_select_mode_with_control, 1,
+            :elm_object_multi_select_mode_max, 2 ]
         #
         # TYPEDEFS
         # typedef struct _Elm_Event_Policy_Changed Elm_Event_Policy_Changed;
         typedef :pointer, :elm_event_policy_changed
-        # typedef struct _Elm_Object_Item Elm_Object_Item;
-        typedef :pointer, :elm_object_item
         #
         # CALLBACKS
         # typedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info);
-        callback :elm_event_cb, [ :pointer, :evas_object, :evas_object, :evas_callback_type, :pointer ], :bool
+        callback :elm_event_cb, [ :pointer, :pointer, :pointer, :evas_callback_type, :pointer ], :bool
         #
         # VARIABLES
         # EAPI extern int ELM_ECORE_EVENT_ETHUMB_CONNECT;
@@ -78,26 +81,22 @@ module Efl
         [ :elm_quicklaunch_shutdown, [  ], :int ],
         # EAPI void elm_quicklaunch_seed(void);
         [ :elm_quicklaunch_seed, [  ], :void ],
-        # EAPI Eina_Bool elm_quicklaunch_prepare(int argc, char **argv);
-        [ :elm_quicklaunch_prepare, [ :int, :pointer ], :bool ],
+        # EAPI Eina_Bool elm_quicklaunch_prepare(int argc, char **argv, const char *cwd);
+        [ :elm_quicklaunch_prepare, [ :int, :pointer, :string ], :bool ],
         # EAPI Eina_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);
-        [ :elm_quicklaunch_fork, [ :int, :pointer, :string, (callback [:pointer], :void), :pointer], :bool ],
+        # FIXME
         # EAPI void elm_quicklaunch_cleanup(void);
         [ :elm_quicklaunch_cleanup, [  ], :void ],
         # EAPI int elm_quicklaunch_fallback(int argc, char **argv);
         [ :elm_quicklaunch_fallback, [ :int, :pointer ], :int ],
-        # EAPI char *elm_quicklaunch_exe_path_get(const char *exe);
-        [ :elm_quicklaunch_exe_path_get, [ :string ], :string ],
+        # EAPI char *elm_quicklaunch_exe_path_get(const char *exe, const char *cwd);
+        [ :elm_quicklaunch_exe_path_get, [ :string, :string ], :string ],
         # EAPI Eina_Bool elm_policy_set(unsigned int policy, int value);
         [ :elm_policy_set, [ :uint, :int ], :bool ],
         # EAPI int elm_policy_get(unsigned int policy);
         [ :elm_policy_get, [ :uint ], :int ],
         # EAPI void elm_language_set(const char *lang);
         [ :elm_language_set, [ :string ], :void ],
-        # EAPI void elm_object_domain_translatable_text_part_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
-        [ :elm_object_domain_translatable_text_part_set, [ :evas_object, :string, :string, :string ], :void ],
-        # EAPI const char *elm_object_translatable_text_part_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_translatable_text_part_get, [ :evas_object, :string ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_gengrid.rb b/lib/efl/native/elm/elm_gengrid.rb
index 17cf053..7a7e706 100644
--- a/lib/efl/native/elm/elm_gengrid.rb
+++ b/lib/efl/native/elm/elm_gengrid.rb
@@ -42,40 +42,6 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
-        # EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent);
-        [ :elm_gengrid_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_gengrid_clear(Evas_Object *obj);
-        [ :elm_gengrid_clear, [ :evas_object ], :void ],
-        # EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi);
-        [ :elm_gengrid_multi_select_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj);
-        [ :elm_gengrid_multi_select_get, [ :evas_object ], :bool ],
-        # EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_gengrid_horizontal_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_gengrid_horizontal_get(const Evas_Object *obj);
-        [ :elm_gengrid_horizontal_get, [ :evas_object ], :bool ],
-        # EAPI Elm_Object_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_append, [ :evas_object, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_prepend, [ :evas_object, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_insert_before, [ :evas_object, :pointer, :pointer, :elm_object_item, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_insert_after, [ :evas_object, :pointer, :pointer, :elm_object_item, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_gengrid_item_sorted_insert, [ :evas_object, :pointer, :pointer, :eina_compare_cb, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_gengrid_selected_item_get(const Evas_Object *obj);
-        [ :elm_gengrid_selected_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj);
-        [ :elm_gengrid_selected_items_get, [ :evas_object ], :eina_list ],
-        # EAPI Eina_List *elm_gengrid_realized_items_get(const Evas_Object *obj);
-        [ :elm_gengrid_realized_items_get, [ :evas_object ], :eina_list ],
-        # EAPI void elm_gengrid_realized_items_update(Evas_Object *obj);
-        [ :elm_gengrid_realized_items_update, [ :evas_object ], :void ],
-        # EAPI Elm_Object_Item *elm_gengrid_first_item_get(const Evas_Object *obj);
-        [ :elm_gengrid_first_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_gengrid_last_item_get(const Evas_Object *obj);
-        [ :elm_gengrid_last_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_gengrid_item_next_get(const Elm_Object_Item *it);
         [ :elm_gengrid_item_next_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_gengrid_item_prev_get(const Elm_Object_Item *it);
@@ -96,8 +62,6 @@ module Efl
         [ :elm_gengrid_item_item_class_get, [ :elm_object_item ], :pointer ],
         # EAPI int elm_gengrid_item_index_get(const Elm_Object_Item *it);
         [ :elm_gengrid_item_index_get, [ :elm_object_item ], :int ],
-        # EAPI unsigned int elm_gengrid_items_count(const Evas_Object *obj);
-        [ :elm_gengrid_items_count, [ :evas_object ], :uint ],
         # EAPI Elm_Gengrid_Item_Class *elm_gengrid_item_class_new(void);
         [ :elm_gengrid_item_class_new, [  ], :pointer ],
         # EAPI void elm_gengrid_item_class_free(Elm_Gengrid_Item_Class *itc);
@@ -134,42 +98,86 @@ module Efl
         [ :elm_gengrid_item_cursor_engine_only_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it);
         [ :elm_gengrid_item_cursor_engine_only_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *x, unsigned int *y);
+        [ :elm_gengrid_item_pos_get, [ :elm_object_item, :pointer, :pointer ], :void ],
+        # EAPI void elm_gengrid_item_select_mode_set(Elm_Object_Item *it, Elm_Object_Select_Mode mode);
+        [ :elm_gengrid_item_select_mode_set, [ :elm_object_item, :elm_object_select_mode ], :void ],
+        # EAPI Elm_Object_Select_Mode elm_gengrid_item_select_mode_get(const Elm_Object_Item *it);
+        [ :elm_gengrid_item_select_mode_get, [ :elm_object_item ], :elm_object_select_mode ],
+        # EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent);
+        [ :elm_gengrid_add, [ :pointer ], :pointer ],
+        # EAPI void elm_gengrid_clear(Evas_Object *obj);
+        [ :elm_gengrid_clear, [ :pointer ], :void ],
+        # EAPI void elm_gengrid_multi_select_set(Evas_Object *obj, Eina_Bool multi);
+        [ :elm_gengrid_multi_select_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_gengrid_multi_select_get(const Evas_Object *obj);
+        [ :elm_gengrid_multi_select_get, [ :pointer ], :bool ],
+        # EAPI void elm_gengrid_multi_select_mode_set(Evas_Object *obj, Elm_Object_Multi_Select_Mode mode);
+        [ :elm_gengrid_multi_select_mode_set, [ :pointer, :elm_object_multi_select_mode ], :void ],
+        # EAPI Elm_Object_Multi_Select_Mode elm_gengrid_multi_select_mode_get(const Evas_Object *obj);
+        [ :elm_gengrid_multi_select_mode_get, [ :pointer ], :elm_object_multi_select_mode ],
+        # EAPI void elm_gengrid_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
+        [ :elm_gengrid_horizontal_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_gengrid_horizontal_get(const Evas_Object *obj);
+        [ :elm_gengrid_horizontal_get, [ :pointer ], :bool ],
+        # EAPI Elm_Object_Item *elm_gengrid_item_append(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_gengrid_item_append, [ :pointer, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_item_prepend(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_gengrid_item_prepend, [ :pointer, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_item_insert_before(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_gengrid_item_insert_before, [ :pointer, :pointer, :pointer, :elm_object_item, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_item_insert_after(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Elm_Object_Item *relative, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_gengrid_item_insert_after, [ :pointer, :pointer, :pointer, :elm_object_item, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_gengrid_item_sorted_insert, [ :pointer, :pointer, :pointer, :eina_compare_cb, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_selected_item_get(const Evas_Object *obj);
+        [ :elm_gengrid_selected_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI const Eina_List *elm_gengrid_selected_items_get(const Evas_Object *obj);
+        [ :elm_gengrid_selected_items_get, [ :pointer ], :eina_list ],
+        # EAPI Eina_List *elm_gengrid_realized_items_get(const Evas_Object *obj);
+        [ :elm_gengrid_realized_items_get, [ :pointer ], :eina_list ],
+        # EAPI void elm_gengrid_realized_items_update(Evas_Object *obj);
+        [ :elm_gengrid_realized_items_update, [ :pointer ], :void ],
+        # EAPI Elm_Object_Item *elm_gengrid_first_item_get(const Evas_Object *obj);
+        [ :elm_gengrid_first_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_last_item_get(const Evas_Object *obj);
+        [ :elm_gengrid_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI unsigned int elm_gengrid_items_count(const Evas_Object *obj);
+        [ :elm_gengrid_items_count, [ :pointer ], :uint ],
         # EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_gengrid_item_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_gengrid_item_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_gengrid_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_gengrid_item_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_gengrid_item_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_gengrid_group_item_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_gengrid_group_item_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_gengrid_group_item_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_gengrid_group_item_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_gengrid_group_item_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_gengrid_group_item_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_gengrid_align_set(Evas_Object *obj, double align_x, double align_y);
-        [ :elm_gengrid_align_set, [ :evas_object, :double, :double ], :void ],
+        [ :elm_gengrid_align_set, [ :pointer, :double, :double ], :void ],
         # EAPI void elm_gengrid_align_get(const Evas_Object *obj, double *align_x, double *align_y);
-        [ :elm_gengrid_align_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_gengrid_align_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_gengrid_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
-        [ :elm_gengrid_reorder_mode_set, [ :evas_object, :bool ], :void ],
+        [ :elm_gengrid_reorder_mode_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_gengrid_reorder_mode_get(const Evas_Object *obj);
-        [ :elm_gengrid_reorder_mode_get, [ :evas_object ], :bool ],
+        [ :elm_gengrid_reorder_mode_get, [ :pointer ], :bool ],
         # EAPI void elm_gengrid_page_show(const Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_gengrid_page_show, [ :evas_object, :int, :int ], :void ],
-        # EAPI void elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *x, unsigned int *y);
-        [ :elm_gengrid_item_pos_get, [ :elm_object_item, :pointer, :pointer ], :void ],
+        [ :elm_gengrid_page_show, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_gengrid_filled_set(Evas_Object *obj, Eina_Bool fill);
-        [ :elm_gengrid_filled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_gengrid_filled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_gengrid_filled_get(const Evas_Object *obj);
-        [ :elm_gengrid_filled_get, [ :evas_object ], :bool ],
+        [ :elm_gengrid_filled_get, [ :pointer ], :bool ],
         # EAPI void elm_gengrid_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode);
-        [ :elm_gengrid_select_mode_set, [ :evas_object, :elm_object_select_mode ], :void ],
+        [ :elm_gengrid_select_mode_set, [ :pointer, :elm_object_select_mode ], :void ],
         # EAPI Elm_Object_Select_Mode elm_gengrid_select_mode_get(const Evas_Object *obj);
-        [ :elm_gengrid_select_mode_get, [ :evas_object ], :elm_object_select_mode ],
+        [ :elm_gengrid_select_mode_get, [ :pointer ], :elm_object_select_mode ],
         # EAPI void elm_gengrid_highlight_mode_set(Evas_Object *obj, Eina_Bool highlight);
-        [ :elm_gengrid_highlight_mode_set, [ :evas_object, :bool ], :void ],
+        [ :elm_gengrid_highlight_mode_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_gengrid_highlight_mode_get(const Evas_Object *obj);
-        [ :elm_gengrid_highlight_mode_get, [ :evas_object ], :bool ],
-        # EAPI void elm_gengrid_item_select_mode_set(Elm_Object_Item *it, Elm_Object_Select_Mode mode);
-        [ :elm_gengrid_item_select_mode_set, [ :elm_object_item, :elm_object_select_mode ], :void ],
-        # EAPI Elm_Object_Select_Mode elm_gengrid_item_select_mode_get(const Elm_Object_Item *it);
-        [ :elm_gengrid_item_select_mode_get, [ :elm_object_item ], :elm_object_select_mode ],
+        [ :elm_gengrid_highlight_mode_get, [ :pointer ], :bool ],
+        # EAPI Elm_Object_Item *elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth);
+        [ :elm_gengrid_nth_item_get, [ :pointer, :uint ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_gengrid_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *xposret, int *yposret);
+        [ :elm_gengrid_at_xy_item_get, [ :pointer, :int, :int, :pointer, :pointer ], :elm_object_item ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_genlist.rb b/lib/efl/native/elm/elm_genlist.rb
index d260d3c..1e812ab 100644
--- a/lib/efl/native/elm/elm_genlist.rb
+++ b/lib/efl/native/elm/elm_genlist.rb
@@ -49,43 +49,6 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
-        # EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
-        [ :elm_genlist_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_genlist_clear(Evas_Object *obj);
-        [ :elm_genlist_clear, [ :evas_object ], :void ],
-        # EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
-        [ :elm_genlist_multi_select_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_multi_select_get(const Evas_Object *obj);
-        [ :elm_genlist_multi_select_get, [ :evas_object ], :bool ],
-        # EAPI void elm_genlist_mode_set(Evas_Object *obj, Elm_List_Mode mode);
-        [ :elm_genlist_mode_set, [ :evas_object, :elm_list_mode ], :void ],
-        # EAPI Elm_List_Mode elm_genlist_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_mode_get, [ :evas_object ], :elm_list_mode ],
-        # EAPI Elm_Object_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_append, [ :evas_object, :pointer, :pointer, :elm_object_item, :elm_genlist_item_type, :evas_smart_cb, :pointer ],
-            :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_prepend, [ :evas_object, :pointer, :pointer, :elm_object_item, :elm_genlist_item_type, :evas_smart_cb, :pointer ],
-            :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Object_Item *before, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_insert_before, [ :evas_object, :pointer, :pointer, :elm_object_item, :elm_object_item, :elm_genlist_item_type,
-            :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Object_Item *after, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_insert_after, [ :evas_object, :pointer, :pointer, :elm_object_item, :elm_object_item, :elm_genlist_item_type,
-            :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type type, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
-        [ :elm_genlist_item_sorted_insert, [ :evas_object, :pointer, :pointer, :elm_object_item, :elm_genlist_item_type, :eina_compare_cb,
-            :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
-        [ :elm_genlist_selected_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj);
-        [ :elm_genlist_selected_items_get, [ :evas_object ], :eina_list ],
-        # EAPI Eina_List *elm_genlist_realized_items_get(const Evas_Object *obj);
-        [ :elm_genlist_realized_items_get, [ :evas_object ], :eina_list ],
-        # EAPI Elm_Object_Item *elm_genlist_first_item_get(const Evas_Object *obj);
-        [ :elm_genlist_first_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_genlist_last_item_get(const Evas_Object *obj);
-        [ :elm_genlist_last_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_genlist_item_next_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_next_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_genlist_item_prev_get(const Elm_Object_Item *it);
@@ -106,10 +69,6 @@ module Efl
         [ :elm_genlist_item_item_class_get, [ :elm_object_item ], :pointer ],
         # EAPI int elm_genlist_item_index_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_index_get, [ :elm_object_item ], :int ],
-        # EAPI void elm_genlist_realized_items_update(Evas_Object *obj);
-        [ :elm_genlist_realized_items_update, [ :evas_object ], :void ],
-        # EAPI unsigned int elm_genlist_items_count(const Evas_Object *obj);
-        [ :elm_genlist_items_count, [ :evas_object ], :uint ],
         # EAPI Elm_Genlist_Item_Class *elm_genlist_item_class_new(void);
         [ :elm_genlist_item_class_new, [  ], :pointer ],
         # EAPI void elm_genlist_item_class_free(Elm_Genlist_Item_Class *itc);
@@ -146,20 +105,6 @@ module Efl
         [ :elm_genlist_item_cursor_engine_only_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_cursor_engine_only_get, [ :elm_object_item ], :bool ],
-        # EAPI void elm_genlist_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_genlist_homogeneous_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_homogeneous_get(const Evas_Object *obj);
-        [ :elm_genlist_homogeneous_get, [ :evas_object ], :bool ],
-        # EAPI void elm_genlist_block_count_set(Evas_Object *obj, int count);
-        [ :elm_genlist_block_count_set, [ :evas_object, :int ], :void ],
-        # EAPI int elm_genlist_block_count_get(const Evas_Object *obj);
-        [ :elm_genlist_block_count_get, [ :evas_object ], :int ],
-        # EAPI void elm_genlist_longpress_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_genlist_longpress_timeout_set, [ :evas_object, :double ], :void ],
-        # EAPI double elm_genlist_longpress_timeout_get(const Evas_Object *obj);
-        [ :elm_genlist_longpress_timeout_get, [ :evas_object ], :double ],
-        # EAPI Elm_Object_Item *elm_genlist_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret);
-        [ :elm_genlist_at_xy_item_get, [ :evas_object, :int, :int, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_genlist_item_parent_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_parent_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI void elm_genlist_item_subitems_clear(Elm_Object_Item *it);
@@ -182,38 +127,103 @@ module Efl
         [ :elm_genlist_item_decorate_mode_set, [ :elm_object_item, :string, :bool ], :void ],
         # EAPI const char *elm_genlist_item_decorate_mode_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_decorate_mode_get, [ :elm_object_item ], :string ],
-        # EAPI Elm_Object_Item *elm_genlist_decorated_item_get(const Evas_Object *obj);
-        [ :elm_genlist_decorated_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI void elm_genlist_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
-        [ :elm_genlist_reorder_mode_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_reorder_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_reorder_mode_get, [ :evas_object ], :bool ],
         # EAPI Elm_Genlist_Item_Type elm_genlist_item_type_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_type_get, [ :elm_object_item ], :elm_genlist_item_type ],
-        # EAPI void elm_genlist_decorate_mode_set(Evas_Object *obj, Eina_Bool decorated);
-        [ :elm_genlist_decorate_mode_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_genlist_decorate_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_decorate_mode_get, [ :evas_object ], :bool ],
         # EAPI void elm_genlist_item_flip_set(Elm_Object_Item *it, Eina_Bool flip);
         [ :elm_genlist_item_flip_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_genlist_item_flip_get(const Elm_Object_Item *it);
         [ :elm_genlist_item_flip_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_genlist_item_select_mode_set(Elm_Object_Item *it, Elm_Object_Select_Mode mode);
+        [ :elm_genlist_item_select_mode_set, [ :elm_object_item, :elm_object_select_mode ], :void ],
+        # EAPI Elm_Object_Select_Mode elm_genlist_item_select_mode_get(const Elm_Object_Item *it);
+        [ :elm_genlist_item_select_mode_get, [ :elm_object_item ], :elm_object_select_mode ],
+        # EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
+        [ :elm_genlist_add, [ :pointer ], :pointer ],
+        # EAPI void elm_genlist_clear(Evas_Object *obj);
+        [ :elm_genlist_clear, [ :pointer ], :void ],
+        # EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
+        [ :elm_genlist_multi_select_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_genlist_multi_select_get(const Evas_Object *obj);
+        [ :elm_genlist_multi_select_get, [ :pointer ], :bool ],
+        # EAPI void elm_genlist_multi_select_mode_set(Evas_Object *obj, Elm_Object_Multi_Select_Mode mode);
+        [ :elm_genlist_multi_select_mode_set, [ :pointer, :elm_object_multi_select_mode ], :void ],
+        # EAPI Elm_Object_Multi_Select_Mode elm_genlist_multi_select_mode_get(const Evas_Object *obj);
+        [ :elm_genlist_multi_select_mode_get, [ :pointer ], :elm_object_multi_select_mode ],
+        # EAPI void elm_genlist_mode_set(Evas_Object *obj, Elm_List_Mode mode);
+        [ :elm_genlist_mode_set, [ :pointer, :elm_list_mode ], :void ],
+        # EAPI Elm_List_Mode elm_genlist_mode_get(const Evas_Object *obj);
+        [ :elm_genlist_mode_get, [ :pointer ], :elm_list_mode ],
+        # EAPI Elm_Object_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_genlist_item_append, [ :pointer, :pointer, :pointer, :elm_object_item, :elm_genlist_item_type, :evas_smart_cb, :pointer ],
+            :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_genlist_item_prepend, [ :pointer, :pointer, :pointer, :elm_object_item, :elm_genlist_item_type, :evas_smart_cb, :pointer ],
+            :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Object_Item *before, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_genlist_item_insert_before, [ :pointer, :pointer, :pointer, :elm_object_item, :elm_object_item, :elm_genlist_item_type, :evas_smart_cb,
+            :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Object_Item *after, Elm_Genlist_Item_Type type, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_genlist_item_insert_after, [ :pointer, :pointer, :pointer, :elm_object_item, :elm_object_item, :elm_genlist_item_type, :evas_smart_cb,
+            :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type type, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
+        [ :elm_genlist_item_sorted_insert, [ :pointer, :pointer, :pointer, :elm_object_item, :elm_genlist_item_type, :eina_compare_cb, :evas_smart_cb,
+            :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
+        [ :elm_genlist_selected_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj);
+        [ :elm_genlist_selected_items_get, [ :pointer ], :eina_list ],
+        # EAPI Eina_List *elm_genlist_realized_items_get(const Evas_Object *obj);
+        [ :elm_genlist_realized_items_get, [ :pointer ], :eina_list ],
+        # EAPI Elm_Object_Item *elm_genlist_first_item_get(const Evas_Object *obj);
+        [ :elm_genlist_first_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_last_item_get(const Evas_Object *obj);
+        [ :elm_genlist_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI void elm_genlist_realized_items_update(Evas_Object *obj);
+        [ :elm_genlist_realized_items_update, [ :pointer ], :void ],
+        # EAPI unsigned int elm_genlist_items_count(const Evas_Object *obj);
+        [ :elm_genlist_items_count, [ :pointer ], :uint ],
+        # EAPI void elm_genlist_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
+        [ :elm_genlist_homogeneous_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_genlist_homogeneous_get(const Evas_Object *obj);
+        [ :elm_genlist_homogeneous_get, [ :pointer ], :bool ],
+        # EAPI void elm_genlist_block_count_set(Evas_Object *obj, int count);
+        [ :elm_genlist_block_count_set, [ :pointer, :int ], :void ],
+        # EAPI int elm_genlist_block_count_get(const Evas_Object *obj);
+        [ :elm_genlist_block_count_get, [ :pointer ], :int ],
+        # EAPI void elm_genlist_longpress_timeout_set(Evas_Object *obj, double timeout);
+        [ :elm_genlist_longpress_timeout_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_genlist_longpress_timeout_get(const Evas_Object *obj);
+        [ :elm_genlist_longpress_timeout_get, [ :pointer ], :double ],
+        # EAPI Elm_Object_Item *elm_genlist_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret);
+        [ :elm_genlist_at_xy_item_get, [ :pointer, :int, :int, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_genlist_decorated_item_get(const Evas_Object *obj);
+        [ :elm_genlist_decorated_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI void elm_genlist_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
+        [ :elm_genlist_reorder_mode_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_genlist_reorder_mode_get(const Evas_Object *obj);
+        [ :elm_genlist_reorder_mode_get, [ :pointer ], :bool ],
+        # EAPI void elm_genlist_decorate_mode_set(Evas_Object *obj, Eina_Bool decorated);
+        [ :elm_genlist_decorate_mode_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_genlist_decorate_mode_get(const Evas_Object *obj);
+        [ :elm_genlist_decorate_mode_get, [ :pointer ], :bool ],
         # EAPI void elm_genlist_tree_effect_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_genlist_tree_effect_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_genlist_tree_effect_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_genlist_tree_effect_enabled_get(const Evas_Object *obj);
-        [ :elm_genlist_tree_effect_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_genlist_tree_effect_enabled_get, [ :pointer ], :bool ],
         # EAPI void elm_genlist_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode);
-        [ :elm_genlist_select_mode_set, [ :evas_object, :elm_object_select_mode ], :void ],
+        [ :elm_genlist_select_mode_set, [ :pointer, :elm_object_select_mode ], :void ],
         # EAPI Elm_Object_Select_Mode elm_genlist_select_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_select_mode_get, [ :evas_object ], :elm_object_select_mode ],
+        [ :elm_genlist_select_mode_get, [ :pointer ], :elm_object_select_mode ],
         # EAPI void elm_genlist_highlight_mode_set(Evas_Object *obj, Eina_Bool highlight);
-        [ :elm_genlist_highlight_mode_set, [ :evas_object, :bool ], :void ],
+        [ :elm_genlist_highlight_mode_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_genlist_highlight_mode_get(const Evas_Object *obj);
-        [ :elm_genlist_highlight_mode_get, [ :evas_object ], :bool ],
-        # EAPI void elm_genlist_item_select_mode_set(Elm_Object_Item *it, Elm_Object_Select_Mode mode);
-        [ :elm_genlist_item_select_mode_set, [ :elm_object_item, :elm_object_select_mode ], :void ],
-        # EAPI Elm_Object_Select_Mode elm_genlist_item_select_mode_get(const Elm_Object_Item *it);
-        [ :elm_genlist_item_select_mode_get, [ :elm_object_item ], :elm_object_select_mode ],
+        [ :elm_genlist_highlight_mode_get, [ :pointer ], :bool ],
+        # EAPI Elm_Object_Item * elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth);
+        [ :elm_genlist_nth_item_get, [ :pointer, :uint ], :elm_object_item ],
+        # EAPI void elm_genlist_focus_on_selection_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_genlist_focus_on_selection_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_genlist_focus_on_selection_get(const Evas_Object *obj);
+        [ :elm_genlist_focus_on_selection_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_gesture_layer.rb b/lib/efl/native/elm/elm_gesture_layer.rb
index 2610ee4..18ca6ed 100644
--- a/lib/efl/native/elm/elm_gesture_layer.rb
+++ b/lib/efl/native/elm/elm_gesture_layer.rb
@@ -48,24 +48,84 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
-        # EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data);
-        [ :elm_gesture_layer_cb_set, [ :evas_object, :elm_gesture_type, :elm_gesture_state, :elm_gesture_event_cb, :pointer ], :void ],
+        # EAPI void elm_gesture_layer_line_min_length_set(Evas_Object *obj, int line_min_length);
+        [ :elm_gesture_layer_line_min_length_set, [ :pointer, :int ], :void ],
+        # EAPI int elm_gesture_layer_line_min_length_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_line_min_length_get, [ :pointer ], :int ],
+        # EAPI void elm_gesture_layer_zoom_distance_tolerance_set(Evas_Object *obj, Evas_Coord zoom_distance_tolerance);
+        [ :elm_gesture_layer_zoom_distance_tolerance_set, [ :pointer, :int ], :void ],
+        # EAPI Evas_Coord elm_gesture_layer_zoom_distance_tolerance_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_zoom_distance_tolerance_get, [ :pointer ], :int ],
+        # EAPI void elm_gesture_layer_line_distance_tolerance_set(Evas_Object *obj, Evas_Coord line_distance_tolerance);
+        [ :elm_gesture_layer_line_distance_tolerance_set, [ :pointer, :int ], :void ],
+        # EAPI Evas_Coord elm_gesture_layer_line_distance_tolerance_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_line_distance_tolerance_get, [ :pointer ], :int ],
+        # EAPI void elm_gesture_layer_line_angular_tolerance_set(Evas_Object *obj, double line_angular_tolerance);
+        [ :elm_gesture_layer_line_angular_tolerance_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_gesture_layer_line_angular_tolerance_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_line_angular_tolerance_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_zoom_wheel_factor_set(Evas_Object *obj, double zoom_wheel_factor);
+        [ :elm_gesture_layer_zoom_wheel_factor_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_gesture_layer_zoom_wheel_factor_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_zoom_wheel_factor_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_zoom_finger_factor_set(Evas_Object *obj, double zoom_finger_factor);
+        [ :elm_gesture_layer_zoom_finger_factor_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_gesture_layer_zoom_finger_factor_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_zoom_finger_factor_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_rotate_angular_tolerance_set(Evas_Object *obj, double rotate_angular_tolerance);
+        [ :elm_gesture_layer_rotate_angular_tolerance_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_gesture_layer_rotate_angular_tolerance_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_rotate_angular_tolerance_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_flick_time_limit_ms_set(Evas_Object *obj, unsigned int flick_time_limit_ms);
+        [ :elm_gesture_layer_flick_time_limit_ms_set, [ :pointer, :uint ], :void ],
+        # EAPI unsigned int elm_gesture_layer_flick_time_limit_ms_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_flick_time_limit_ms_get, [ :pointer ], :uint ],
+        # EAPI void elm_gesture_layer_long_tap_start_timeout_set(Evas_Object *obj, double long_tap_start_timeout);
+        [ :elm_gesture_layer_long_tap_start_timeout_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_gesture_layer_long_tap_start_timeout_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_long_tap_start_timeout_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_continues_enable_set(Evas_Object *obj, Eina_Bool continues_enable);
+        [ :elm_gesture_layer_continues_enable_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_gesture_layer_continues_enable_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_continues_enable_get, [ :pointer ], :bool ],
+        # EAPI void elm_gesture_layer_double_tap_timeout_set(Evas_Object *obj, double double_tap_timeout);
+        [ :elm_gesture_layer_double_tap_timeout_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_gesture_layer_double_tap_timeout_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_double_tap_timeout_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_tap_finger_size_set(Evas_Object *obj, Evas_Coord sz);
+        [ :elm_gesture_layer_tap_finger_size_set, [ :pointer, :int ], :void ],
+        # EAPI Evas_Coord elm_gesture_layer_tap_finger_size_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_tap_finger_size_get, [ :pointer ], :int ],
+        # EAPI Evas_Object *elm_gesture_layer_add(Evas_Object *parent);
+        [ :elm_gesture_layer_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_gesture_layer_hold_events_get(const Evas_Object *obj);
-        [ :elm_gesture_layer_hold_events_get, [ :evas_object ], :bool ],
+        [ :elm_gesture_layer_hold_events_get, [ :pointer ], :bool ],
         # EAPI void elm_gesture_layer_hold_events_set(Evas_Object *obj, Eina_Bool hold_events);
-        [ :elm_gesture_layer_hold_events_set, [ :evas_object, :bool ], :void ],
-        # EAPI void elm_gesture_layer_zoom_step_set(Evas_Object *obj, double step);
-        [ :elm_gesture_layer_zoom_step_set, [ :evas_object, :double ], :void ],
+        [ :elm_gesture_layer_hold_events_set, [ :pointer, :bool ], :void ],
         # EAPI double elm_gesture_layer_zoom_step_get(const Evas_Object *obj);
-        [ :elm_gesture_layer_zoom_step_get, [ :evas_object ], :double ],
-        # EAPI void elm_gesture_layer_rotate_step_set(Evas_Object *obj, double step);
-        [ :elm_gesture_layer_rotate_step_set, [ :evas_object, :double ], :void ],
+        [ :elm_gesture_layer_zoom_step_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_zoom_step_set(Evas_Object *obj, double step);
+        [ :elm_gesture_layer_zoom_step_set, [ :pointer, :double ], :void ],
         # EAPI double elm_gesture_layer_rotate_step_get(const Evas_Object *obj);
-        [ :elm_gesture_layer_rotate_step_get, [ :evas_object ], :double ],
+        [ :elm_gesture_layer_rotate_step_get, [ :pointer ], :double ],
+        # EAPI void elm_gesture_layer_rotate_step_set(Evas_Object *obj, double step);
+        [ :elm_gesture_layer_rotate_step_set, [ :pointer, :double ], :void ],
         # EAPI Eina_Bool elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *target);
-        [ :elm_gesture_layer_attach, [ :evas_object, :evas_object ], :bool ],
-        # EAPI Evas_Object *elm_gesture_layer_add(Evas_Object *parent);
-        [ :elm_gesture_layer_add, [ :evas_object ], :evas_object ],
+        [ :elm_gesture_layer_attach, [ :pointer, :pointer ], :bool ],
+        # EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data);
+        [ :elm_gesture_layer_cb_set, [ :pointer, :elm_gesture_type, :elm_gesture_state, :elm_gesture_event_cb, :pointer ], :void ],
+        # EAPI void elm_gesture_layer_cb_add(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data);
+        [ :elm_gesture_layer_cb_add, [ :pointer, :elm_gesture_type, :elm_gesture_state, :elm_gesture_event_cb, :pointer ], :void ],
+        # EAPI void elm_gesture_layer_cb_del(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data);
+        [ :elm_gesture_layer_cb_del, [ :pointer, :elm_gesture_type, :elm_gesture_state, :elm_gesture_event_cb, :pointer ], :void ],
+        # EAPI void elm_gesture_layer_tap_finger_size_set(Evas_Object *obj, Evas_Coord sz);
+        [ :elm_gesture_layer_tap_finger_size_set, [ :pointer, :int ], :void ],
+        # EAPI Evas_Coord elm_gesture_layer_tap_finger_size_get(const Evas_Object *obj);
+        [ :elm_gesture_layer_tap_finger_size_get, [ :pointer ], :int ],
+        # EAPI void elm_gesture_layer_tap_longpress_cb_add(Evas_Object *obj, Elm_Gesture_State state, Elm_Gesture_Event_Cb cb, void *data);
+        [ :elm_gesture_layer_tap_longpress_cb_add, [ :pointer, :elm_gesture_state, :elm_gesture_event_cb, :pointer ], :void ],
+        # EAPI void elm_gesture_layer_tap_longpress_cb_del(Evas_Object *obj, Elm_Gesture_State state, Elm_Gesture_Event_Cb cb, void *data);
+        [ :elm_gesture_layer_tap_longpress_cb_del, [ :pointer, :elm_gesture_state, :elm_gesture_event_cb, :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_glview.rb b/lib/efl/native/elm/elm_glview.rb
index 6f1d2a6..0ade2f8 100644
--- a/lib/efl/native/elm/elm_glview.rb
+++ b/lib/efl/native/elm/elm_glview.rb
@@ -32,34 +32,34 @@ module Efl
         #
         # CALLBACKS
         # typedef void (*Elm_GLView_Func_Cb) (Evas_Object *obj);
-        callback :elm_glview_func_cb, [ :evas_object ], :void
+        callback :elm_glview_func_cb, [ :pointer ], :void
         #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_glview_add(Evas_Object *parent);
-        [ :elm_glview_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_glview_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_glview_size_set, [ :evas_object, :int, :int ], :void ],
-        # EAPI void elm_glview_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_glview_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_glview_add, [ :pointer ], :pointer ],
         # EAPI Evas_GL_API *elm_glview_gl_api_get(const Evas_Object *obj);
-        [ :elm_glview_gl_api_get, [ :evas_object ], :pointer ],
+        [ :elm_glview_gl_api_get, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode);
-        [ :elm_glview_mode_set, [ :evas_object, :elm_glview_mode ], :bool ],
+        [ :elm_glview_mode_set, [ :pointer, :elm_glview_mode ], :bool ],
         # EAPI Eina_Bool elm_glview_resize_policy_set(Evas_Object *obj, Elm_GLView_Resize_Policy policy);
-        [ :elm_glview_resize_policy_set, [ :evas_object, :elm_glview_resize_policy ], :bool ],
+        [ :elm_glview_resize_policy_set, [ :pointer, :elm_glview_resize_policy ], :bool ],
         # EAPI Eina_Bool elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Render_Policy policy);
-        [ :elm_glview_render_policy_set, [ :evas_object, :elm_glview_render_policy ], :bool ],
+        [ :elm_glview_render_policy_set, [ :pointer, :elm_glview_render_policy ], :bool ],
+        # EAPI void elm_glview_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+        [ :elm_glview_size_set, [ :pointer, :int, :int ], :void ],
+        # EAPI void elm_glview_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_glview_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_init_func_set, [ :evas_object, :elm_glview_func_cb ], :void ],
+        [ :elm_glview_init_func_set, [ :pointer, :elm_glview_func_cb ], :void ],
         # EAPI void elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_del_func_set, [ :evas_object, :elm_glview_func_cb ], :void ],
+        [ :elm_glview_del_func_set, [ :pointer, :elm_glview_func_cb ], :void ],
         # EAPI void elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_resize_func_set, [ :evas_object, :elm_glview_func_cb ], :void ],
+        [ :elm_glview_resize_func_set, [ :pointer, :elm_glview_func_cb ], :void ],
         # EAPI void elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
-        [ :elm_glview_render_func_set, [ :evas_object, :elm_glview_func_cb ], :void ],
+        [ :elm_glview_render_func_set, [ :pointer, :elm_glview_func_cb ], :void ],
         # EAPI void elm_glview_changed_set(Evas_Object *obj);
-        [ :elm_glview_changed_set, [ :evas_object ], :void ],
+        [ :elm_glview_changed_set, [ :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_grid.rb b/lib/efl/native/elm/elm_grid.rb
index 1807fb6..43990ac 100644
--- a/lib/efl/native/elm/elm_grid.rb
+++ b/lib/efl/native/elm/elm_grid.rb
@@ -24,23 +24,23 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_grid_add(Evas_Object *parent);
-        [ :elm_grid_add, [ :evas_object ], :evas_object ],
+        [ :elm_grid_add, [ :pointer ], :pointer ],
         # EAPI void elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :elm_grid_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_grid_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_grid_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_grid_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :elm_grid_pack, [ :evas_object, :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_grid_pack, [ :pointer, :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_grid_unpack(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_grid_unpack, [ :evas_object, :evas_object ], :void ],
+        [ :elm_grid_unpack, [ :pointer, :pointer ], :void ],
         # EAPI void elm_grid_clear(Evas_Object *obj, Eina_Bool clear);
-        [ :elm_grid_clear, [ :evas_object, :bool ], :void ],
+        [ :elm_grid_clear, [ :pointer, :bool ], :void ],
         # EAPI void elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :elm_grid_pack_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_grid_pack_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_grid_pack_get(Evas_Object *subobj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_grid_pack_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_grid_pack_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Eina_List *elm_grid_children_get(const Evas_Object *obj);
-        [ :elm_grid_children_get, [ :evas_object ], :eina_list ],
+        [ :elm_grid_children_get, [ :pointer ], :eina_list ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_hover.rb b/lib/efl/native/elm/elm_hover.rb
index 65294c4..6f650c3 100644
--- a/lib/efl/native/elm/elm_hover.rb
+++ b/lib/efl/native/elm/elm_hover.rb
@@ -28,19 +28,19 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
-        [ :elm_hover_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_hover_target_set(Evas_Object *obj, Evas_Object *target);
-        [ :elm_hover_target_set, [ :evas_object, :evas_object ], :void ],
-        # EAPI Evas_Object *elm_hover_target_get(const Evas_Object *obj);
-        [ :elm_hover_target_get, [ :evas_object ], :evas_object ],
+        [ :elm_hover_add, [ :pointer ], :pointer ],
         # EAPI void elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_hover_parent_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_hover_parent_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_hover_parent_get(const Evas_Object *obj);
-        [ :elm_hover_parent_get, [ :evas_object ], :evas_object ],
+        [ :elm_hover_parent_get, [ :pointer ], :pointer ],
+        # EAPI void elm_hover_target_set(Evas_Object *obj, Evas_Object *target);
+        [ :elm_hover_target_set, [ :pointer, :pointer ], :void ],
+        # EAPI Evas_Object *elm_hover_target_get(const Evas_Object *obj);
+        [ :elm_hover_target_get, [ :pointer ], :pointer ],
         # EAPI const char *elm_hover_best_content_location_get(const Evas_Object *obj, Elm_Hover_Axis pref_axis);
-        [ :elm_hover_best_content_location_get, [ :evas_object, :elm_hover_axis ], :string ],
+        [ :elm_hover_best_content_location_get, [ :pointer, :elm_hover_axis ], :string ],
         # EAPI void elm_hover_dismiss(Evas_Object *obj);
-        [ :elm_hover_dismiss, [ :evas_object ], :void ],
+        [ :elm_hover_dismiss, [ :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_hoversel.rb b/lib/efl/native/elm/elm_hoversel.rb
index 72d2275..e2e9f15 100644
--- a/lib/efl/native/elm/elm_hoversel.rb
+++ b/lib/efl/native/elm/elm_hoversel.rb
@@ -25,27 +25,27 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
-        [ :elm_hoversel_add, [ :evas_object ], :evas_object ],
+        [ :elm_hoversel_add, [ :pointer ], :pointer ],
         # EAPI void elm_hoversel_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_hoversel_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_hoversel_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_hoversel_horizontal_get(const Evas_Object *obj);
-        [ :elm_hoversel_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_hoversel_horizontal_get, [ :pointer ], :bool ],
         # EAPI void elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_hoversel_hover_parent_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_hoversel_hover_parent_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_hoversel_hover_parent_get(const Evas_Object *obj);
-        [ :elm_hoversel_hover_parent_get, [ :evas_object ], :evas_object ],
+        [ :elm_hoversel_hover_parent_get, [ :pointer ], :pointer ],
         # EAPI void elm_hoversel_hover_begin(Evas_Object *obj);
-        [ :elm_hoversel_hover_begin, [ :evas_object ], :void ],
+        [ :elm_hoversel_hover_begin, [ :pointer ], :void ],
         # EAPI void elm_hoversel_hover_end(Evas_Object *obj);
-        [ :elm_hoversel_hover_end, [ :evas_object ], :void ],
+        [ :elm_hoversel_hover_end, [ :pointer ], :void ],
         # EAPI Eina_Bool elm_hoversel_expanded_get(const Evas_Object *obj);
-        [ :elm_hoversel_expanded_get, [ :evas_object ], :bool ],
+        [ :elm_hoversel_expanded_get, [ :pointer ], :bool ],
         # EAPI void elm_hoversel_clear(Evas_Object *obj);
-        [ :elm_hoversel_clear, [ :evas_object ], :void ],
+        [ :elm_hoversel_clear, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_hoversel_items_get(const Evas_Object *obj);
-        [ :elm_hoversel_items_get, [ :evas_object ], :eina_list ],
+        [ :elm_hoversel_items_get, [ :pointer ], :eina_list ],
         # EAPI Elm_Object_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
-        [ :elm_hoversel_item_add, [ :evas_object, :string, :string, :elm_icon_type, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_hoversel_item_add, [ :pointer, :string, :string, :elm_icon_type, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI void elm_hoversel_item_icon_set(Elm_Object_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type);
         [ :elm_hoversel_item_icon_set, [ :elm_object_item, :string, :string, :elm_icon_type ], :void ],
         # EAPI void elm_hoversel_item_icon_get(const Elm_Object_Item *it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type);
diff --git a/lib/efl/native/elm/elm_icon.rb b/lib/efl/native/elm/elm_icon.rb
index d5fd491..7e78b37 100644
--- a/lib/efl/native/elm/elm_icon.rb
+++ b/lib/efl/native/elm/elm_icon.rb
@@ -30,17 +30,17 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_icon_add(Evas_Object *parent);
-        [ :elm_icon_add, [ :evas_object ], :evas_object ],
+        [ :elm_icon_add, [ :pointer ], :pointer ],
         # EAPI void elm_icon_thumb_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_icon_thumb_set, [ :evas_object, :string, :string ], :void ],
+        [ :elm_icon_thumb_set, [ :pointer, :string, :string ], :void ],
         # EAPI Eina_Bool elm_icon_standard_set(Evas_Object *obj, const char *name);
-        [ :elm_icon_standard_set, [ :evas_object, :string ], :bool ],
+        [ :elm_icon_standard_set, [ :pointer, :string ], :bool ],
         # EAPI const char *elm_icon_standard_get(const Evas_Object *obj);
-        [ :elm_icon_standard_get, [ :evas_object ], :string ],
+        [ :elm_icon_standard_get, [ :pointer ], :string ],
         # EAPI void elm_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
-        [ :elm_icon_order_lookup_set, [ :evas_object, :elm_icon_lookup_order ], :void ],
+        [ :elm_icon_order_lookup_set, [ :pointer, :elm_icon_lookup_order ], :void ],
         # EAPI Elm_Icon_Lookup_Order elm_icon_order_lookup_get(const Evas_Object *obj);
-        [ :elm_icon_order_lookup_get, [ :evas_object ], :elm_icon_lookup_order ],
+        [ :elm_icon_order_lookup_get, [ :pointer ], :elm_icon_lookup_order ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_image.rb b/lib/efl/native/elm/elm_image.rb
index 2f660c3..87d3051 100644
--- a/lib/efl/native/elm/elm_image.rb
+++ b/lib/efl/native/elm/elm_image.rb
@@ -26,64 +26,72 @@ module Efl
         enum :elm_image_orient, [ :elm_image_orient_none, 0, :elm_image_orient_0, 0, :elm_image_rotate_90, 1, :elm_image_rotate_180, 2,
             :elm_image_rotate_270, 3, :elm_image_flip_horizontal, 4, :elm_image_flip_vertical, 5, :elm_image_flip_transpose, 6, :elm_image_flip_transverse, 7 ]
         #
+        # TYPEDEFS
+        # typedef struct _Elm_Image_Progress Elm_Image_Progress;
+        typedef :pointer, :elm_image_progress
+        # typedef struct _Elm_Image_Error Elm_Image_Error;
+        typedef :pointer, :elm_image_error
+        #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_image_add(Evas_Object *parent);
-        [ :elm_image_add, [ :evas_object ], :evas_object ],
+        [ :elm_image_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_image_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key);
-        [ :elm_image_memfile_set, [ :evas_object, :pointer, :ulong, :string, :string ], :bool ],
+        [ :elm_image_memfile_set, [ :pointer, :pointer, :ulong, :string, :string ], :bool ],
+        # EAPI Eina_Bool elm_image_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group);
+        [ :elm_image_mmap_set, [ :pointer, :eina_file, :string ], :bool ],
         # EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_image_file_set, [ :evas_object, :string, :string ], :bool ],
+        [ :elm_image_file_set, [ :pointer, :string, :string ], :bool ],
         # EAPI void elm_image_file_get(const Evas_Object *obj, const char **file, const char **group);
-        [ :elm_image_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_image_file_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth);
-        [ :elm_image_smooth_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_smooth_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_smooth_get(const Evas_Object *obj);
-        [ :elm_image_smooth_get, [ :evas_object ], :bool ],
+        [ :elm_image_smooth_get, [ :pointer ], :bool ],
         # EAPI void elm_image_object_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :elm_image_object_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_image_object_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
-        [ :elm_image_no_scale_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_no_scale_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_no_scale_get(const Evas_Object *obj);
-        [ :elm_image_no_scale_get, [ :evas_object ], :bool ],
+        [ :elm_image_no_scale_get, [ :pointer ], :bool ],
         # EAPI void elm_image_resizable_set(Evas_Object *obj, Eina_Bool size_up, Eina_Bool size_down);
-        [ :elm_image_resizable_set, [ :evas_object, :bool, :bool ], :void ],
+        [ :elm_image_resizable_set, [ :pointer, :bool, :bool ], :void ],
         # EAPI void elm_image_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down);
-        [ :elm_image_resizable_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_image_resizable_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
-        [ :elm_image_fill_outside_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_fill_outside_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj);
-        [ :elm_image_fill_outside_get, [ :evas_object ], :bool ],
+        [ :elm_image_fill_outside_get, [ :pointer ], :bool ],
         # EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_image_preload_disabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_preload_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_image_prescale_set(Evas_Object *obj, int size);
-        [ :elm_image_prescale_set, [ :evas_object, :int ], :void ],
+        [ :elm_image_prescale_set, [ :pointer, :int ], :void ],
         # EAPI int elm_image_prescale_get(const Evas_Object *obj);
-        [ :elm_image_prescale_get, [ :evas_object ], :int ],
+        [ :elm_image_prescale_get, [ :pointer ], :int ],
         # EAPI void elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient);
-        [ :elm_image_orient_set, [ :evas_object, :elm_image_orient ], :void ],
+        [ :elm_image_orient_set, [ :pointer, :elm_image_orient ], :void ],
         # EAPI Elm_Image_Orient elm_image_orient_get(const Evas_Object *obj);
-        [ :elm_image_orient_get, [ :evas_object ], :elm_image_orient ],
+        [ :elm_image_orient_get, [ :pointer ], :elm_image_orient ],
         # EAPI void elm_image_editable_set(Evas_Object *obj, Eina_Bool set);
-        [ :elm_image_editable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_editable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_editable_get(const Evas_Object *obj);
-        [ :elm_image_editable_get, [ :evas_object ], :bool ],
+        [ :elm_image_editable_get, [ :pointer ], :bool ],
         # EAPI Evas_Object *elm_image_object_get(const Evas_Object *obj);
-        [ :elm_image_object_get, [ :evas_object ], :evas_object ],
+        [ :elm_image_object_get, [ :pointer ], :pointer ],
         # EAPI void elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
-        [ :elm_image_aspect_fixed_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_aspect_fixed_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj);
-        [ :elm_image_aspect_fixed_get, [ :evas_object ], :bool ],
+        [ :elm_image_aspect_fixed_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_image_animated_available_get(const Evas_Object *obj);
-        [ :elm_image_animated_available_get, [ :evas_object ], :bool ],
+        [ :elm_image_animated_available_get, [ :pointer ], :bool ],
         # EAPI void elm_image_animated_set(Evas_Object *obj, Eina_Bool animated);
-        [ :elm_image_animated_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_animated_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_animated_get(const Evas_Object *obj);
-        [ :elm_image_animated_get, [ :evas_object ], :bool ],
+        [ :elm_image_animated_get, [ :pointer ], :bool ],
         # EAPI void elm_image_animated_play_set(Evas_Object *obj, Eina_Bool play);
-        [ :elm_image_animated_play_set, [ :evas_object, :bool ], :void ],
+        [ :elm_image_animated_play_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_image_animated_play_get(const Evas_Object *obj);
-        [ :elm_image_animated_play_get, [ :evas_object ], :bool ],
+        [ :elm_image_animated_play_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_index.rb b/lib/efl/native/elm/elm_index.rb
index e5fb579..5f581e8 100644
--- a/lib/efl/native/elm/elm_index.rb
+++ b/lib/efl/native/elm/elm_index.rb
@@ -23,46 +23,54 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_index_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
+        [ :elm_index_item_selected_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Evas_Object *elm_index_add(Evas_Object *parent);
-        [ :elm_index_add, [ :evas_object ], :evas_object ],
+        [ :elm_index_add, [ :pointer ], :pointer ],
         # EAPI void elm_index_autohide_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_index_autohide_disabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_index_autohide_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_index_autohide_disabled_get(const Evas_Object *obj);
-        [ :elm_index_autohide_disabled_get, [ :evas_object ], :bool ],
+        [ :elm_index_autohide_disabled_get, [ :pointer ], :bool ],
         # EAPI void elm_index_item_level_set(Evas_Object *obj, int level);
-        [ :elm_index_item_level_set, [ :evas_object, :int ], :void ],
+        [ :elm_index_item_level_set, [ :pointer, :int ], :void ],
         # EAPI int elm_index_item_level_get(const Evas_Object *obj);
-        [ :elm_index_item_level_get, [ :evas_object ], :int ],
-        # EAPI void elm_index_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
-        [ :elm_index_item_selected_set, [ :elm_object_item, :bool ], :void ],
+        [ :elm_index_item_level_get, [ :pointer ], :int ],
         # EAPI Elm_Object_Item *elm_index_selected_item_get(const Evas_Object *obj, int level);
-        [ :elm_index_selected_item_get, [ :evas_object, :int ], :elm_object_item ],
+        [ :elm_index_selected_item_get, [ :pointer, :int ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_index_item_append(Evas_Object *obj, const char *letter, Evas_Smart_Cb func, const void *data);
-        [ :elm_index_item_append, [ :evas_object, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_index_item_append, [ :pointer, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_index_item_prepend(Evas_Object *obj, const char *letter, Evas_Smart_Cb func, const void *data);
-        [ :elm_index_item_prepend, [ :evas_object, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_index_item_prepend, [ :pointer, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_index_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *letter, Evas_Smart_Cb func, const void *data);
-        [ :elm_index_item_insert_after, [ :evas_object, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_index_item_insert_after, [ :pointer, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_index_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *letter, Evas_Smart_Cb func, const void *data);
-        [ :elm_index_item_insert_before, [ :evas_object, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_index_item_insert_before, [ :pointer, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_index_item_sorted_insert(Evas_Object *obj, const char *letter, Evas_Smart_Cb func, const void *data, Eina_Compare_Cb cmp_func, Eina_Compare_Cb cmp_data_func);
-        [ :elm_index_item_sorted_insert, [ :evas_object, :string, :evas_smart_cb, :pointer, :eina_compare_cb, :eina_compare_cb ], :elm_object_item ],
+        [ :elm_index_item_sorted_insert, [ :pointer, :string, :evas_smart_cb, :pointer, :eina_compare_cb, :eina_compare_cb ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_index_item_find(Evas_Object *obj, const void *data);
-        [ :elm_index_item_find, [ :evas_object, :pointer ], :elm_object_item ],
+        [ :elm_index_item_find, [ :pointer, :pointer ], :elm_object_item ],
         # EAPI void elm_index_item_clear(Evas_Object *obj);
-        [ :elm_index_item_clear, [ :evas_object ], :void ],
+        [ :elm_index_item_clear, [ :pointer ], :void ],
         # EAPI void elm_index_level_go(Evas_Object *obj, int level);
-        [ :elm_index_level_go, [ :evas_object, :int ], :void ],
+        [ :elm_index_level_go, [ :pointer, :int ], :void ],
         # EAPI const char *elm_index_item_letter_get(const Elm_Object_Item *item);
         [ :elm_index_item_letter_get, [ :elm_object_item ], :string ],
         # EAPI void elm_index_indicator_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_index_indicator_disabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_index_indicator_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_index_indicator_disabled_get(const Evas_Object *obj);
-        [ :elm_index_indicator_disabled_get, [ :evas_object ], :bool ],
+        [ :elm_index_indicator_disabled_get, [ :pointer ], :bool ],
         # EAPI void elm_index_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_index_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_index_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_index_horizontal_get(const Evas_Object *obj);
-        [ :elm_index_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_index_horizontal_get, [ :pointer ], :bool ],
+        # EAPI void elm_index_delay_change_time_set(Evas_Object *obj, double delay_change_time);
+        [ :elm_index_delay_change_time_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_index_delay_change_time_get(const Evas_Object *obj);
+        [ :elm_index_delay_change_time_get, [ :pointer ], :double ],
+        # EAPI void elm_index_omit_enabled_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_index_omit_enabled_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_index_omit_enabled_get(const Evas_Object *obj);
+        [ :elm_index_omit_enabled_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_inwin.rb b/lib/efl/native/elm/elm_inwin.rb
index 39cab20..0008e71 100644
--- a/lib/efl/native/elm/elm_inwin.rb
+++ b/lib/efl/native/elm/elm_inwin.rb
@@ -24,15 +24,15 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent);
-        [ :elm_win_inwin_add, [ :evas_object ], :evas_object ],
+        [ :elm_win_inwin_add, [ :pointer ], :pointer ],
         # EAPI void elm_win_inwin_activate(Evas_Object *obj);
-        [ :elm_win_inwin_activate, [ :evas_object ], :void ],
+        [ :elm_win_inwin_activate, [ :pointer ], :void ],
         # EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content);
-        [ :elm_win_inwin_content_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_win_inwin_content_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
-        [ :elm_win_inwin_content_get, [ :evas_object ], :evas_object ],
+        [ :elm_win_inwin_content_get, [ :pointer ], :pointer ],
         # EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj);
-        [ :elm_win_inwin_content_unset, [ :evas_object ], :evas_object ],
+        [ :elm_win_inwin_content_unset, [ :pointer ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_label.rb b/lib/efl/native/elm/elm_label.rb
index 37e0d8d..21b8a9e 100644
--- a/lib/efl/native/elm/elm_label.rb
+++ b/lib/efl/native/elm/elm_label.rb
@@ -22,30 +22,38 @@ module Efl
         #
         ffi_lib 'elementary.so.1'
         #
+        # ENUMS
+        # typedef enum {...} Elm_Label_Slide_Mode;
+        enum :elm_label_slide_mode, [ :elm_label_slide_mode_none, 0, :elm_label_slide_mode_auto, 1, :elm_label_slide_mode_always, 2 ]
+        #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_label_add(Evas_Object *parent);
-        [ :elm_label_add, [ :evas_object ], :evas_object ],
+        [ :elm_label_add, [ :pointer ], :pointer ],
+        # EAPI void elm_label_slide_area_limit_set(Evas_Object *obj, Eina_Bool limit);
+        [ :elm_label_slide_area_limit_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_label_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap);
-        [ :elm_label_line_wrap_set, [ :evas_object, :elm_wrap_type ], :void ],
+        [ :elm_label_line_wrap_set, [ :pointer, :elm_wrap_type ], :void ],
         # EAPI Elm_Wrap_Type elm_label_line_wrap_get(const Evas_Object *obj);
-        [ :elm_label_line_wrap_get, [ :evas_object ], :elm_wrap_type ],
+        [ :elm_label_line_wrap_get, [ :pointer ], :elm_wrap_type ],
         # EAPI void elm_label_wrap_width_set(Evas_Object *obj, Evas_Coord w);
-        [ :elm_label_wrap_width_set, [ :evas_object, :int ], :void ],
+        [ :elm_label_wrap_width_set, [ :pointer, :int ], :void ],
         # EAPI Evas_Coord elm_label_wrap_width_get(const Evas_Object *obj);
-        [ :elm_label_wrap_width_get, [ :evas_object ], :int ],
+        [ :elm_label_wrap_width_get, [ :pointer ], :int ],
         # EAPI void elm_label_ellipsis_set(Evas_Object *obj, Eina_Bool ellipsis);
-        [ :elm_label_ellipsis_set, [ :evas_object, :bool ], :void ],
+        [ :elm_label_ellipsis_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_label_ellipsis_get(const Evas_Object *obj);
-        [ :elm_label_ellipsis_get, [ :evas_object ], :bool ],
-        # EAPI void elm_label_slide_set(Evas_Object *obj, Eina_Bool slide);
-        [ :elm_label_slide_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_label_slide_get(const Evas_Object *obj);
-        [ :elm_label_slide_get, [ :evas_object ], :bool ],
+        [ :elm_label_ellipsis_get, [ :pointer ], :bool ],
+        # EAPI void elm_label_slide_mode_set(Evas_Object *obj, Elm_Label_Slide_Mode mode);
+        [ :elm_label_slide_mode_set, [ :pointer, :elm_label_slide_mode ], :void ],
+        # EAPI Elm_Label_Slide_Mode elm_label_slide_mode_get(const Evas_Object *obj);
+        [ :elm_label_slide_mode_get, [ :pointer ], :elm_label_slide_mode ],
         # EAPI void elm_label_slide_duration_set(Evas_Object *obj, double duration);
-        [ :elm_label_slide_duration_set, [ :evas_object, :double ], :void ],
+        [ :elm_label_slide_duration_set, [ :pointer, :double ], :void ],
         # EAPI double elm_label_slide_duration_get(const Evas_Object *obj);
-        [ :elm_label_slide_duration_get, [ :evas_object ], :double ],
+        [ :elm_label_slide_duration_get, [ :pointer ], :double ],
+        # EAPI void elm_label_slide_go(Evas_Object *obj);
+        [ :elm_label_slide_go, [ :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_layout.rb b/lib/efl/native/elm/elm_layout.rb
index 1db4072..d90f5c1 100644
--- a/lib/efl/native/elm/elm_layout.rb
+++ b/lib/efl/native/elm/elm_layout.rb
@@ -25,73 +25,75 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
-        [ :elm_layout_add, [ :evas_object ], :evas_object ],
+        [ :elm_layout_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const char *file, const char *group);
-        [ :elm_layout_file_set, [ :evas_object, :string, :string ], :bool ],
+        [ :elm_layout_file_set, [ :pointer, :string, :string ], :bool ],
         # EAPI int elm_layout_freeze(Evas_Object *obj);
-        [ :elm_layout_freeze, [ :evas_object ], :int ],
+        [ :elm_layout_freeze, [ :pointer ], :int ],
         # EAPI int elm_layout_thaw(Evas_Object *obj);
-        [ :elm_layout_thaw, [ :evas_object ], :int ],
+        [ :elm_layout_thaw, [ :pointer ], :int ],
         # EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style);
-        [ :elm_layout_theme_set, [ :evas_object, :string, :string, :string ], :bool ],
+        [ :elm_layout_theme_set, [ :pointer, :string, :string, :string ], :bool ],
         # EAPI void elm_layout_signal_emit(Evas_Object *obj, const char *emission, const char *source);
-        [ :elm_layout_signal_emit, [ :evas_object, :string, :string ], :void ],
+        [ :elm_layout_signal_emit, [ :pointer, :string, :string ], :void ],
         # EAPI void elm_layout_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :elm_layout_signal_callback_add, [ :evas_object, :string, :string, :edje_signal_cb, :pointer ], :void ],
+        [ :elm_layout_signal_callback_add, [ :pointer, :string, :string, :edje_signal_cb, :pointer ], :void ],
         # EAPI void *elm_layout_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
-        [ :elm_layout_signal_callback_del, [ :evas_object, :string, :string, :edje_signal_cb ], :pointer ],
+        [ :elm_layout_signal_callback_del, [ :pointer, :string, :string, :edje_signal_cb ], :pointer ],
         # EAPI Eina_Bool elm_layout_box_append(Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :elm_layout_box_append, [ :evas_object, :string, :evas_object ], :bool ],
+        [ :elm_layout_box_append, [ :pointer, :string, :pointer ], :bool ],
         # EAPI Eina_Bool elm_layout_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :elm_layout_box_prepend, [ :evas_object, :string, :evas_object ], :bool ],
+        [ :elm_layout_box_prepend, [ :pointer, :string, :pointer ], :bool ],
         # EAPI Eina_Bool elm_layout_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
-        [ :elm_layout_box_insert_before, [ :evas_object, :string, :evas_object, :evas_object ], :bool ],
+        [ :elm_layout_box_insert_before, [ :pointer, :string, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool elm_layout_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
-        [ :elm_layout_box_insert_at, [ :evas_object, :string, :evas_object, :uint ], :bool ],
+        [ :elm_layout_box_insert_at, [ :pointer, :string, :pointer, :uint ], :bool ],
         # EAPI Evas_Object *elm_layout_box_remove(Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :elm_layout_box_remove, [ :evas_object, :string, :evas_object ], :evas_object ],
+        [ :elm_layout_box_remove, [ :pointer, :string, :pointer ], :pointer ],
         # EAPI Eina_Bool elm_layout_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :elm_layout_box_remove_all, [ :evas_object, :string, :bool ], :bool ],
+        [ :elm_layout_box_remove_all, [ :pointer, :string, :bool ], :bool ],
         # EAPI Eina_Bool elm_layout_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :elm_layout_table_pack, [ :evas_object, :string, :evas_object, :ushort, :ushort, :ushort, :ushort ], :bool ],
+        [ :elm_layout_table_pack, [ :pointer, :string, :pointer, :ushort, :ushort, :ushort, :ushort ], :bool ],
         # EAPI Evas_Object *elm_layout_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child_obj);
-        [ :elm_layout_table_unpack, [ :evas_object, :string, :evas_object ], :evas_object ],
+        [ :elm_layout_table_unpack, [ :pointer, :string, :pointer ], :pointer ],
         # EAPI Eina_Bool elm_layout_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :elm_layout_table_clear, [ :evas_object, :string, :bool ], :bool ],
+        [ :elm_layout_table_clear, [ :pointer, :string, :bool ], :bool ],
         # EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
-        [ :elm_layout_edje_get, [ :evas_object ], :evas_object ],
+        [ :elm_layout_edje_get, [ :pointer ], :pointer ],
         # EAPI const char *elm_layout_data_get(const Evas_Object *obj, const char *key);
-        [ :elm_layout_data_get, [ :evas_object, :string ], :string ],
+        [ :elm_layout_data_get, [ :pointer, :string ], :string ],
         # EAPI void elm_layout_sizing_eval(Evas_Object *obj);
-        [ :elm_layout_sizing_eval, [ :evas_object ], :void ],
+        [ :elm_layout_sizing_eval, [ :pointer ], :void ],
+        # EAPI void elm_layout_sizing_restricted_eval(Evas_Object *obj, Eina_Bool w, Eina_Bool h);
+        [ :elm_layout_sizing_restricted_eval, [ :pointer, :bool, :bool ], :void ],
         # EAPI Eina_Bool elm_layout_part_cursor_set(Evas_Object *obj, const char *part_name, const char *cursor);
-        [ :elm_layout_part_cursor_set, [ :evas_object, :string, :string ], :bool ],
+        [ :elm_layout_part_cursor_set, [ :pointer, :string, :string ], :bool ],
         # EAPI const char *elm_layout_part_cursor_get(const Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_get, [ :evas_object, :string ], :string ],
+        [ :elm_layout_part_cursor_get, [ :pointer, :string ], :string ],
         # EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_unset, [ :evas_object, :string ], :bool ],
+        [ :elm_layout_part_cursor_unset, [ :pointer, :string ], :bool ],
         # EAPI Eina_Bool elm_layout_part_cursor_style_set(Evas_Object *obj, const char *part_name, const char *style);
-        [ :elm_layout_part_cursor_style_set, [ :evas_object, :string, :string ], :bool ],
+        [ :elm_layout_part_cursor_style_set, [ :pointer, :string, :string ], :bool ],
         # EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_style_get, [ :evas_object, :string ], :string ],
+        [ :elm_layout_part_cursor_style_get, [ :pointer, :string ], :string ],
         # EAPI Eina_Bool elm_layout_part_cursor_engine_only_set(Evas_Object *obj, const char *part_name, Eina_Bool engine_only);
-        [ :elm_layout_part_cursor_engine_only_set, [ :evas_object, :string, :bool ], :bool ],
+        [ :elm_layout_part_cursor_engine_only_set, [ :pointer, :string, :bool ], :bool ],
         # EAPI Eina_Bool elm_layout_edje_object_can_access_set(Evas_Object *obj, Eina_Bool can_access);
-        [ :elm_layout_edje_object_can_access_set, [ :evas_object, :bool ], :bool ],
+        [ :elm_layout_edje_object_can_access_set, [ :pointer, :bool ], :bool ],
         # EAPI Eina_Bool elm_layout_edje_object_can_access_get(Evas_Object *obj);
-        [ :elm_layout_edje_object_can_access_get, [ :evas_object ], :bool ],
+        [ :elm_layout_edje_object_can_access_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_layout_part_cursor_engine_only_get(const Evas_Object *obj, const char *part_name);
-        [ :elm_layout_part_cursor_engine_only_get, [ :evas_object, :string ], :bool ],
+        [ :elm_layout_part_cursor_engine_only_get, [ :pointer, :string ], :bool ],
         # EAPI Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
-        [ :elm_layout_content_set, [ :evas_object, :string, :evas_object ], :bool ],
+        [ :elm_layout_content_set, [ :pointer, :string, :pointer ], :bool ],
         # EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow);
-        [ :elm_layout_content_get, [ :evas_object, :string ], :evas_object ],
+        [ :elm_layout_content_get, [ :pointer, :string ], :pointer ],
         # EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow);
-        [ :elm_layout_content_unset, [ :evas_object, :string ], :evas_object ],
+        [ :elm_layout_content_unset, [ :pointer, :string ], :pointer ],
         # EAPI Eina_Bool elm_layout_text_set(Evas_Object *obj, const char *part, const char *text);
-        [ :elm_layout_text_set, [ :evas_object, :string, :string ], :bool ],
+        [ :elm_layout_text_set, [ :pointer, :string, :string ], :bool ],
         # EAPI const char *elm_layout_text_get(const Evas_Object *obj, const char *part);
-        [ :elm_layout_text_get, [ :evas_object, :string ], :string ],
+        [ :elm_layout_text_get, [ :pointer, :string ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_list.rb b/lib/efl/native/elm/elm_list.rb
index 2d23a47..e035051 100644
--- a/lib/efl/native/elm/elm_list.rb
+++ b/lib/efl/native/elm/elm_list.rb
@@ -28,69 +28,76 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_list_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
+        [ :elm_list_item_selected_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_item_selected_get(const Elm_Object_Item *it);
+        [ :elm_list_item_selected_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_list_item_separator_set(Elm_Object_Item *it, Eina_Bool setting);
+        [ :elm_list_item_separator_set, [ :elm_object_item, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_item_separator_get(const Elm_Object_Item *it);
+        [ :elm_list_item_separator_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_list_item_show(Elm_Object_Item *it);
+        [ :elm_list_item_show, [ :elm_object_item ], :void ],
+        # EAPI void elm_list_item_bring_in(Elm_Object_Item *it);
+        [ :elm_list_item_bring_in, [ :elm_object_item ], :void ],
+        # EAPI Evas_Object *elm_list_item_object_get(const Elm_Object_Item *it);
+        [ :elm_list_item_object_get, [ :elm_object_item ], :pointer ],
+        # EAPI Elm_Object_Item *elm_list_item_prev(const Elm_Object_Item *it);
+        [ :elm_list_item_prev, [ :elm_object_item ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_item_next(const Elm_Object_Item *it);
+        [ :elm_list_item_next, [ :elm_object_item ], :elm_object_item ],
         # EAPI Evas_Object *elm_list_add(Evas_Object *parent);
-        [ :elm_list_add, [ :evas_object ], :evas_object ],
+        [ :elm_list_add, [ :pointer ], :pointer ],
         # EAPI void elm_list_go(Evas_Object *obj);
-        [ :elm_list_go, [ :evas_object ], :void ],
+        [ :elm_list_go, [ :pointer ], :void ],
         # EAPI void elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi);
-        [ :elm_list_multi_select_set, [ :evas_object, :bool ], :void ],
+        [ :elm_list_multi_select_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_list_multi_select_get(const Evas_Object *obj);
-        [ :elm_list_multi_select_get, [ :evas_object ], :bool ],
+        [ :elm_list_multi_select_get, [ :pointer ], :bool ],
+        # EAPI void elm_list_multi_select_mode_set(Evas_Object *obj, Elm_Object_Multi_Select_Mode mode);
+        [ :elm_list_multi_select_mode_set, [ :pointer, :elm_object_multi_select_mode ], :void ],
+        # EAPI Elm_Object_Multi_Select_Mode elm_list_multi_select_mode_get(const Evas_Object *obj);
+        [ :elm_list_multi_select_mode_get, [ :pointer ], :elm_object_multi_select_mode ],
         # EAPI void elm_list_mode_set(Evas_Object *obj, Elm_List_Mode mode);
-        [ :elm_list_mode_set, [ :evas_object, :elm_list_mode ], :void ],
+        [ :elm_list_mode_set, [ :pointer, :elm_list_mode ], :void ],
         # EAPI Elm_List_Mode elm_list_mode_get(const Evas_Object *obj);
-        [ :elm_list_mode_get, [ :evas_object ], :elm_list_mode ],
+        [ :elm_list_mode_get, [ :pointer ], :elm_list_mode ],
         # EAPI void elm_list_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_list_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_list_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_list_horizontal_get(const Evas_Object *obj);
-        [ :elm_list_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_list_horizontal_get, [ :pointer ], :bool ],
         # EAPI void elm_list_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode);
-        [ :elm_list_select_mode_set, [ :evas_object, :elm_object_select_mode ], :void ],
+        [ :elm_list_select_mode_set, [ :pointer, :elm_object_select_mode ], :void ],
         # EAPI Elm_Object_Select_Mode elm_list_select_mode_get(const Evas_Object *obj);
-        [ :elm_list_select_mode_get, [ :evas_object ], :elm_object_select_mode ],
+        [ :elm_list_select_mode_get, [ :pointer ], :elm_object_select_mode ],
         # EAPI Elm_Object_Item *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_append, [ :evas_object, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_list_item_append, [ :pointer, :string, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_prepend, [ :evas_object, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_list_item_prepend, [ :pointer, :string, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_list_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_insert_before, [ :evas_object, :elm_object_item, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ],
-            :elm_object_item ],
+        [ :elm_list_item_insert_before, [ :pointer, :elm_object_item, :string, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
-        [ :elm_list_item_insert_after, [ :evas_object, :elm_object_item, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer ],
-            :elm_object_item ],
+        [ :elm_list_item_insert_after, [ :pointer, :elm_object_item, :string, :pointer, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_list_item_sorted_insert(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data, Eina_Compare_Cb cmp_func);
-        [ :elm_list_item_sorted_insert, [ :evas_object, :string, :evas_object, :evas_object, :evas_smart_cb, :pointer, :eina_compare_cb ],
-            :elm_object_item ],
+        [ :elm_list_item_sorted_insert, [ :pointer, :string, :pointer, :pointer, :evas_smart_cb, :pointer, :eina_compare_cb ], :elm_object_item ],
         # EAPI void elm_list_clear(Evas_Object *obj);
-        [ :elm_list_clear, [ :evas_object ], :void ],
+        [ :elm_list_clear, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_list_items_get(const Evas_Object *obj);
-        [ :elm_list_items_get, [ :evas_object ], :eina_list ],
+        [ :elm_list_items_get, [ :pointer ], :eina_list ],
         # EAPI Elm_Object_Item *elm_list_selected_item_get(const Evas_Object *obj);
-        [ :elm_list_selected_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_list_selected_item_get, [ :pointer ], :elm_object_item ],
         # EAPI const Eina_List *elm_list_selected_items_get(const Evas_Object *obj);
-        [ :elm_list_selected_items_get, [ :evas_object ], :eina_list ],
-        # EAPI void elm_list_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
-        [ :elm_list_item_selected_set, [ :elm_object_item, :bool ], :void ],
-        # EAPI Eina_Bool elm_list_item_selected_get(const Elm_Object_Item *it);
-        [ :elm_list_item_selected_get, [ :elm_object_item ], :bool ],
-        # EAPI void elm_list_item_separator_set(Elm_Object_Item *it, Eina_Bool setting);
-        [ :elm_list_item_separator_set, [ :elm_object_item, :bool ], :void ],
-        # EAPI Eina_Bool elm_list_item_separator_get(const Elm_Object_Item *it);
-        [ :elm_list_item_separator_get, [ :elm_object_item ], :bool ],
-        # EAPI void elm_list_item_show(Elm_Object_Item *it);
-        [ :elm_list_item_show, [ :elm_object_item ], :void ],
-        # EAPI void elm_list_item_bring_in(Elm_Object_Item *it);
-        [ :elm_list_item_bring_in, [ :elm_object_item ], :void ],
-        # EAPI Evas_Object *elm_list_item_object_get(const Elm_Object_Item *it);
-        [ :elm_list_item_object_get, [ :elm_object_item ], :evas_object ],
-        # EAPI Elm_Object_Item *elm_list_item_prev(const Elm_Object_Item *it);
-        [ :elm_list_item_prev, [ :elm_object_item ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_list_item_next(const Elm_Object_Item *it);
-        [ :elm_list_item_next, [ :elm_object_item ], :elm_object_item ],
+        [ :elm_list_selected_items_get, [ :pointer ], :eina_list ],
         # EAPI Elm_Object_Item *elm_list_first_item_get(const Evas_Object *obj);
-        [ :elm_list_first_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_list_first_item_get, [ :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_list_last_item_get(const Evas_Object *obj);
-        [ :elm_list_last_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_list_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_list_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret);
+        [ :elm_list_at_xy_item_get, [ :pointer, :int, :int, :pointer ], :elm_object_item ],
+        # EAPI void elm_list_focus_on_selection_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_list_focus_on_selection_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_list_focus_on_selection_get(const Evas_Object *obj);
+        [ :elm_list_focus_on_selection_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_mapbuf.rb b/lib/efl/native/elm/elm_mapbuf.rb
index ff06681..b1e6646 100644
--- a/lib/efl/native/elm/elm_mapbuf.rb
+++ b/lib/efl/native/elm/elm_mapbuf.rb
@@ -24,19 +24,23 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent);
-        [ :elm_mapbuf_add, [ :evas_object ], :evas_object ],
+        [ :elm_mapbuf_add, [ :pointer ], :pointer ],
         # EAPI void elm_mapbuf_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_mapbuf_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_mapbuf_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_mapbuf_enabled_get(const Evas_Object *obj);
-        [ :elm_mapbuf_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_mapbuf_enabled_get, [ :pointer ], :bool ],
         # EAPI void elm_mapbuf_smooth_set(Evas_Object *obj, Eina_Bool smooth);
-        [ :elm_mapbuf_smooth_set, [ :evas_object, :bool ], :void ],
+        [ :elm_mapbuf_smooth_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_mapbuf_smooth_get(const Evas_Object *obj);
-        [ :elm_mapbuf_smooth_get, [ :evas_object ], :bool ],
+        [ :elm_mapbuf_smooth_get, [ :pointer ], :bool ],
         # EAPI void elm_mapbuf_alpha_set(Evas_Object *obj, Eina_Bool alpha);
-        [ :elm_mapbuf_alpha_set, [ :evas_object, :bool ], :void ],
+        [ :elm_mapbuf_alpha_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_mapbuf_alpha_get(const Evas_Object *obj);
-        [ :elm_mapbuf_alpha_get, [ :evas_object ], :bool ],
+        [ :elm_mapbuf_alpha_get, [ :pointer ], :bool ],
+        # EAPI void elm_mapbuf_auto_set(Evas_Object *obj, Eina_Bool on);
+        [ :elm_mapbuf_auto_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_mapbuf_auto_get(const Evas_Object *obj);
+        [ :elm_mapbuf_auto_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_menu.rb b/lib/efl/native/elm/elm_menu.rb
index 1574aa4..3b7e08b 100644
--- a/lib/efl/native/elm/elm_menu.rb
+++ b/lib/efl/native/elm/elm_menu.rb
@@ -23,22 +23,8 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
-        # EAPI Evas_Object *elm_menu_add(Evas_Object *parent);
-        [ :elm_menu_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_menu_parent_set, [ :evas_object, :evas_object ], :void ],
-        # EAPI Evas_Object *elm_menu_parent_get(const Evas_Object *obj);
-        [ :elm_menu_parent_get, [ :evas_object ], :evas_object ],
-        # EAPI void elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :elm_menu_move, [ :evas_object, :int, :int ], :void ],
-        # EAPI void elm_menu_close(Evas_Object *obj);
-        [ :elm_menu_close, [ :evas_object ], :void ],
-        # EAPI const Eina_List *elm_menu_items_get(const Evas_Object *obj);
-        [ :elm_menu_items_get, [ :evas_object ], :eina_list ],
         # EAPI Evas_Object *elm_menu_item_object_get(const Elm_Object_Item *it);
-        [ :elm_menu_item_object_get, [ :elm_object_item ], :evas_object ],
-        # EAPI Elm_Object_Item *elm_menu_item_add(Evas_Object *obj, Elm_Object_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_menu_item_add, [ :evas_object, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_menu_item_object_get, [ :elm_object_item ], :pointer ],
         # EAPI void elm_menu_item_icon_name_set(Elm_Object_Item *it, const char *icon);
         [ :elm_menu_item_icon_name_set, [ :elm_object_item, :string ], :void ],
         # EAPI const char *elm_menu_item_icon_name_get(const Elm_Object_Item *it);
@@ -47,24 +33,40 @@ module Efl
         [ :elm_menu_item_selected_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it);
         [ :elm_menu_item_selected_get, [ :elm_object_item ], :bool ],
-        # EAPI Elm_Object_Item *elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent);
-        [ :elm_menu_item_separator_add, [ :evas_object, :elm_object_item ], :elm_object_item ],
         # EAPI Eina_Bool elm_menu_item_is_separator(Elm_Object_Item *it);
         [ :elm_menu_item_is_separator, [ :elm_object_item ], :bool ],
         # EAPI const Eina_List *elm_menu_item_subitems_get(const Elm_Object_Item *it);
         [ :elm_menu_item_subitems_get, [ :elm_object_item ], :eina_list ],
+        # EAPI void elm_menu_item_subitems_clear(Elm_Object_Item *it);
+        [ :elm_menu_item_subitems_clear, [ :elm_object_item ], :void ],
         # EAPI unsigned int elm_menu_item_index_get(const Elm_Object_Item *it);
         [ :elm_menu_item_index_get, [ :elm_object_item ], :uint ],
-        # EAPI Elm_Object_Item *elm_menu_selected_item_get(const Evas_Object *obj);
-        [ :elm_menu_selected_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_menu_last_item_get(const Evas_Object *obj);
-        [ :elm_menu_last_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_menu_first_item_get(const Evas_Object *obj);
-        [ :elm_menu_first_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_menu_item_next_get(const Elm_Object_Item *it);
         [ :elm_menu_item_next_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_menu_item_prev_get(const Elm_Object_Item *it);
         [ :elm_menu_item_prev_get, [ :elm_object_item ], :elm_object_item ],
+        # EAPI Evas_Object *elm_menu_add(Evas_Object *parent);
+        [ :elm_menu_add, [ :pointer ], :pointer ],
+        # EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
+        [ :elm_menu_parent_set, [ :pointer, :pointer ], :void ],
+        # EAPI Evas_Object *elm_menu_parent_get(const Evas_Object *obj);
+        [ :elm_menu_parent_get, [ :pointer ], :pointer ],
+        # EAPI void elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+        [ :elm_menu_move, [ :pointer, :int, :int ], :void ],
+        # EAPI void elm_menu_close(Evas_Object *obj);
+        [ :elm_menu_close, [ :pointer ], :void ],
+        # EAPI Elm_Object_Item *elm_menu_item_add(Evas_Object *obj, Elm_Object_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_menu_item_add, [ :pointer, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent);
+        [ :elm_menu_item_separator_add, [ :pointer, :elm_object_item ], :elm_object_item ],
+        # EAPI const Eina_List *elm_menu_items_get(const Evas_Object *obj);
+        [ :elm_menu_items_get, [ :pointer ], :eina_list ],
+        # EAPI Elm_Object_Item *elm_menu_first_item_get(const Evas_Object *obj);
+        [ :elm_menu_first_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_last_item_get(const Evas_Object *obj);
+        [ :elm_menu_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_menu_selected_item_get(const Evas_Object *obj);
+        [ :elm_menu_selected_item_get, [ :pointer ], :elm_object_item ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_mirroring.rb b/lib/efl/native/elm/elm_mirroring.rb
index f77dbed..6e658ef 100644
--- a/lib/efl/native/elm/elm_mirroring.rb
+++ b/lib/efl/native/elm/elm_mirroring.rb
@@ -24,13 +24,13 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Eina_Bool elm_object_mirrored_get(const Evas_Object *obj);
-        [ :elm_object_mirrored_get, [ :evas_object ], :bool ],
+        [ :elm_object_mirrored_get, [ :pointer ], :bool ],
         # EAPI void elm_object_mirrored_set(Evas_Object *obj, Eina_Bool mirrored);
-        [ :elm_object_mirrored_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_mirrored_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_object_mirrored_automatic_get(const Evas_Object *obj);
-        [ :elm_object_mirrored_automatic_get, [ :evas_object ], :bool ],
+        [ :elm_object_mirrored_automatic_get, [ :pointer ], :bool ],
         # EAPI void elm_object_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic);
-        [ :elm_object_mirrored_automatic_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_mirrored_automatic_set, [ :pointer, :bool ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_multibuttonentry.rb b/lib/efl/native/elm/elm_multibuttonentry.rb
index b86e5a5..76f7599 100644
--- a/lib/efl/native/elm/elm_multibuttonentry.rb
+++ b/lib/efl/native/elm/elm_multibuttonentry.rb
@@ -23,54 +23,54 @@ module Efl
         #
         # CALLBACKS
         # typedef Eina_Bool (*Elm_Multibuttonentry_Item_Filter_Cb) (Evas_Object *obj, const char *item_label, void *item_data, void *data);
-        callback :elm_multibuttonentry_item_filter_cb, [ :evas_object, :string, :pointer, :pointer ], :bool
+        callback :elm_multibuttonentry_item_filter_cb, [ :pointer, :string, :pointer, :pointer ], :bool
         #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent);
-        [ :elm_multibuttonentry_add, [ :evas_object ], :evas_object ],
+        [ :elm_multibuttonentry_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *elm_multibuttonentry_entry_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_entry_get, [ :evas_object ], :evas_object ],
+        [ :elm_multibuttonentry_entry_get, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_multibuttonentry_expanded_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_expanded_get, [ :evas_object ], :bool ],
+        [ :elm_multibuttonentry_expanded_get, [ :pointer ], :bool ],
         # EAPI void elm_multibuttonentry_expanded_set(Evas_Object *obj, Eina_Bool expanded);
-        [ :elm_multibuttonentry_expanded_set, [ :evas_object, :bool ], :void ],
+        [ :elm_multibuttonentry_expanded_set, [ :pointer, :bool ], :void ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_item_prepend(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_multibuttonentry_item_prepend, [ :evas_object, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_multibuttonentry_item_prepend, [ :pointer, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_item_append(Evas_Object *obj, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_multibuttonentry_item_append, [ :evas_object, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_multibuttonentry_item_append, [ :pointer, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_multibuttonentry_item_insert_before, [ :evas_object, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_multibuttonentry_item_insert_before, [ :pointer, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *label, Evas_Smart_Cb func, void *data);
-        [ :elm_multibuttonentry_item_insert_after, [ :evas_object, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_multibuttonentry_item_insert_after, [ :pointer, :elm_object_item, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
         # EAPI const Eina_List *elm_multibuttonentry_items_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_items_get, [ :evas_object ], :eina_list ],
+        [ :elm_multibuttonentry_items_get, [ :pointer ], :eina_list ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_first_item_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_first_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_multibuttonentry_first_item_get, [ :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_last_item_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_last_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_multibuttonentry_last_item_get, [ :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_selected_item_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_selected_item_get, [ :evas_object ], :elm_object_item ],
+        [ :elm_multibuttonentry_selected_item_get, [ :pointer ], :elm_object_item ],
         # EAPI void elm_multibuttonentry_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
         [ :elm_multibuttonentry_item_selected_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_multibuttonentry_item_selected_get(const Elm_Object_Item *it);
         [ :elm_multibuttonentry_item_selected_get, [ :elm_object_item ], :bool ],
         # EAPI void elm_multibuttonentry_clear(Evas_Object *obj);
-        [ :elm_multibuttonentry_clear, [ :evas_object ], :void ],
+        [ :elm_multibuttonentry_clear, [ :pointer ], :void ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_item_prev_get(const Elm_Object_Item *it);
         [ :elm_multibuttonentry_item_prev_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_multibuttonentry_item_next_get(const Elm_Object_Item *it);
         [ :elm_multibuttonentry_item_next_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI void elm_multibuttonentry_item_filter_append(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
-        [ :elm_multibuttonentry_item_filter_append, [ :evas_object, :elm_multibuttonentry_item_filter_cb, :pointer ], :void ],
+        [ :elm_multibuttonentry_item_filter_append, [ :pointer, :elm_multibuttonentry_item_filter_cb, :pointer ], :void ],
         # EAPI void elm_multibuttonentry_item_filter_prepend(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
-        [ :elm_multibuttonentry_item_filter_prepend, [ :evas_object, :elm_multibuttonentry_item_filter_cb, :pointer ], :void ],
+        [ :elm_multibuttonentry_item_filter_prepend, [ :pointer, :elm_multibuttonentry_item_filter_cb, :pointer ], :void ],
         # EAPI void elm_multibuttonentry_item_filter_remove(Evas_Object *obj, Elm_Multibuttonentry_Item_Filter_Cb func, void *data);
-        [ :elm_multibuttonentry_item_filter_remove, [ :evas_object, :elm_multibuttonentry_item_filter_cb, :pointer ], :void ],
+        [ :elm_multibuttonentry_item_filter_remove, [ :pointer, :elm_multibuttonentry_item_filter_cb, :pointer ], :void ],
         # EAPI void elm_multibuttonentry_editable_set(Evas_Object *obj, Eina_Bool editable);
-        [ :elm_multibuttonentry_editable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_multibuttonentry_editable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_multibuttonentry_editable_get(const Evas_Object *obj);
-        [ :elm_multibuttonentry_editable_get, [ :evas_object ], :bool ],
+        [ :elm_multibuttonentry_editable_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_naviframe.rb b/lib/efl/native/elm/elm_naviframe.rb
index 7b400a0..0c45038 100644
--- a/lib/efl/native/elm/elm_naviframe.rb
+++ b/lib/efl/native/elm/elm_naviframe.rb
@@ -21,32 +21,18 @@ module Efl
         #
         ffi_lib 'elementary.so.1'
         #
+        # CALLBACKS
+        # typedef Eina_Bool (*Elm_Naviframe_Item_Pop_Cb) (void *data, Elm_Object_Item *it);
+        callback :elm_naviframe_item_pop_cb, [ :pointer, :elm_object_item ], :bool
+        #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent);
-        [ :elm_naviframe_add, [ :evas_object ], :evas_object ],
-        # EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
-        [ :elm_naviframe_item_push, [ :evas_object, :string, :evas_object, :evas_object, :evas_object, :string ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_naviframe_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
-        [ :elm_naviframe_item_insert_before, [ :evas_object, :elm_object_item, :string, :evas_object, :evas_object, :evas_object, :string ],
-            :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_naviframe_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
-        [ :elm_naviframe_item_insert_after, [ :evas_object, :elm_object_item, :string, :evas_object, :evas_object, :evas_object, :string ],
-            :elm_object_item ],
-        # EAPI Evas_Object *elm_naviframe_item_pop(Evas_Object *obj);
-        [ :elm_naviframe_item_pop, [ :evas_object ], :evas_object ],
+        [ :elm_naviframe_add, [ :pointer ], :pointer ],
         # EAPI void elm_naviframe_item_pop_to(Elm_Object_Item *it);
         [ :elm_naviframe_item_pop_to, [ :elm_object_item ], :void ],
         # EAPI void elm_naviframe_item_promote(Elm_Object_Item *it);
         [ :elm_naviframe_item_promote, [ :elm_object_item ], :void ],
-        # EAPI void elm_naviframe_content_preserve_on_pop_set(Evas_Object *obj, Eina_Bool preserve);
-        [ :elm_naviframe_content_preserve_on_pop_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_naviframe_content_preserve_on_pop_get(const Evas_Object *obj);
-        [ :elm_naviframe_content_preserve_on_pop_get, [ :evas_object ], :bool ],
-        # EAPI Elm_Object_Item *elm_naviframe_top_item_get(const Evas_Object *obj);
-        [ :elm_naviframe_top_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_naviframe_bottom_item_get(const Evas_Object *obj);
-        [ :elm_naviframe_bottom_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style);
         [ :elm_naviframe_item_style_set, [ :elm_object_item, :string ], :void ],
         # EAPI const char *elm_naviframe_item_style_get(const Elm_Object_Item *it);
@@ -55,18 +41,36 @@ module Efl
         [ :elm_naviframe_item_title_visible_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_naviframe_item_title_visible_get(const Elm_Object_Item *it);
         [ :elm_naviframe_item_title_visible_get, [ :elm_object_item ], :bool ],
+        # EAPI void elm_naviframe_item_pop_cb_set(Elm_Object_Item *it, Elm_Naviframe_Item_Pop_Cb func, void *data);
+        [ :elm_naviframe_item_pop_cb_set, [ :elm_object_item, :elm_naviframe_item_pop_cb, :pointer ], :void ],
+        # EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
+        [ :elm_naviframe_item_push, [ :pointer, :string, :pointer, :pointer, :pointer, :string ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_naviframe_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
+        [ :elm_naviframe_item_insert_before, [ :pointer, :elm_object_item, :string, :pointer, :pointer, :pointer, :string ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_naviframe_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
+        [ :elm_naviframe_item_insert_after, [ :pointer, :elm_object_item, :string, :pointer, :pointer, :pointer, :string ], :elm_object_item ],
+        # EAPI Evas_Object *elm_naviframe_item_pop(Evas_Object *obj);
+        [ :elm_naviframe_item_pop, [ :pointer ], :pointer ],
+        # EAPI void elm_naviframe_item_simple_promote(Evas_Object *obj, Evas_Object *content);
+        [ :elm_naviframe_item_simple_promote, [ :pointer, :pointer ], :void ],
+        # EAPI void elm_naviframe_content_preserve_on_pop_set(Evas_Object *obj, Eina_Bool preserve);
+        [ :elm_naviframe_content_preserve_on_pop_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_naviframe_content_preserve_on_pop_get(const Evas_Object *obj);
+        [ :elm_naviframe_content_preserve_on_pop_get, [ :pointer ], :bool ],
+        # EAPI Elm_Object_Item *elm_naviframe_top_item_get(const Evas_Object *obj);
+        [ :elm_naviframe_top_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_naviframe_bottom_item_get(const Evas_Object *obj);
+        [ :elm_naviframe_bottom_item_get, [ :pointer ], :elm_object_item ],
         # EAPI void elm_naviframe_prev_btn_auto_pushed_set(Evas_Object *obj, Eina_Bool auto_pushed);
-        [ :elm_naviframe_prev_btn_auto_pushed_set, [ :evas_object, :bool ], :void ],
+        [ :elm_naviframe_prev_btn_auto_pushed_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_naviframe_prev_btn_auto_pushed_get(const Evas_Object *obj);
-        [ :elm_naviframe_prev_btn_auto_pushed_get, [ :evas_object ], :bool ],
+        [ :elm_naviframe_prev_btn_auto_pushed_get, [ :pointer ], :bool ],
         # EAPI Eina_List *elm_naviframe_items_get(const Evas_Object *obj);
-        [ :elm_naviframe_items_get, [ :evas_object ], :eina_list ],
+        [ :elm_naviframe_items_get, [ :pointer ], :eina_list ],
         # EAPI void elm_naviframe_event_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_naviframe_event_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_naviframe_event_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_naviframe_event_enabled_get(const Evas_Object *obj);
-        [ :elm_naviframe_event_enabled_get, [ :evas_object ], :bool ],
-        # EAPI void elm_naviframe_item_simple_promote(Evas_Object *obj, Evas_Object *content);
-        [ :elm_naviframe_item_simple_promote, [ :evas_object, :evas_object ], :void ],
+        [ :elm_naviframe_event_enabled_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_need.rb b/lib/efl/native/elm/elm_need.rb
index 74de0e4..8b80d25 100644
--- a/lib/efl/native/elm/elm_need.rb
+++ b/lib/efl/native/elm/elm_need.rb
@@ -25,8 +25,16 @@ module Efl
         fcts = [
         # EAPI Eina_Bool elm_need_efreet(void);
         [ :elm_need_efreet, [  ], :bool ],
+        # EAPI Eina_Bool elm_need_systray(void);
+        [ :elm_need_systray, [  ], :bool ],
+        # EAPI Eina_Bool elm_need_sys_notify(void);
+        [ :elm_need_sys_notify, [  ], :bool ],
         # EAPI Eina_Bool elm_need_e_dbus(void);
         [ :elm_need_e_dbus, [  ], :bool ],
+        # EAPI Eina_Bool elm_need_eldbus(void);
+        [ :elm_need_eldbus, [  ], :bool ],
+        # EAPI Eina_Bool elm_need_elocation(void);
+        [ :elm_need_elocation, [  ], :bool ],
         # EAPI Eina_Bool elm_need_ethumb(void);
         [ :elm_need_ethumb, [  ], :bool ],
         # EAPI Eina_Bool elm_need_web(void);
diff --git a/lib/efl/native/elm/elm_notify.rb b/lib/efl/native/elm/elm_notify.rb
index 0bf4f9f..7cfc8c4 100644
--- a/lib/efl/native/elm/elm_notify.rb
+++ b/lib/efl/native/elm/elm_notify.rb
@@ -21,32 +21,26 @@ module Efl
         #
         ffi_lib 'elementary.so.1'
         #
-        # ENUMS
-        # typedef enum {...} Elm_Notify_Orient;
-        enum :elm_notify_orient, [ :elm_notify_orient_top, :elm_notify_orient_center, :elm_notify_orient_bottom, :elm_notify_orient_left,
-            :elm_notify_orient_right, :elm_notify_orient_top_left, :elm_notify_orient_top_right, :elm_notify_orient_bottom_left, :elm_notify_orient_bottom_right,
-            :elm_notify_orient_last ]
-        #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_notify_add(Evas_Object *parent);
-        [ :elm_notify_add, [ :evas_object ], :evas_object ],
+        [ :elm_notify_add, [ :pointer ], :pointer ],
         # EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_notify_parent_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_notify_parent_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_notify_parent_get(const Evas_Object *obj);
-        [ :elm_notify_parent_get, [ :evas_object ], :evas_object ],
-        # EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient);
-        [ :elm_notify_orient_set, [ :evas_object, :elm_notify_orient ], :void ],
-        # EAPI Elm_Notify_Orient elm_notify_orient_get(const Evas_Object *obj);
-        [ :elm_notify_orient_get, [ :evas_object ], :elm_notify_orient ],
+        [ :elm_notify_parent_get, [ :pointer ], :pointer ],
         # EAPI void elm_notify_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_notify_timeout_set, [ :evas_object, :double ], :void ],
+        [ :elm_notify_timeout_set, [ :pointer, :double ], :void ],
         # EAPI double elm_notify_timeout_get(const Evas_Object *obj);
-        [ :elm_notify_timeout_get, [ :evas_object ], :double ],
+        [ :elm_notify_timeout_get, [ :pointer ], :double ],
         # EAPI void elm_notify_allow_events_set(Evas_Object *obj, Eina_Bool allow);
-        [ :elm_notify_allow_events_set, [ :evas_object, :bool ], :void ],
+        [ :elm_notify_allow_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_notify_allow_events_get(const Evas_Object *obj);
-        [ :elm_notify_allow_events_get, [ :evas_object ], :bool ],
+        [ :elm_notify_allow_events_get, [ :pointer ], :bool ],
+        # EAPI void elm_notify_align_set(Evas_Object *obj, double horizontal, double vertical);
+        [ :elm_notify_align_set, [ :pointer, :double, :double ], :void ],
+        # EAPI void elm_notify_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
+        [ :elm_notify_align_get, [ :pointer, :pointer, :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_object.rb b/lib/efl/native/elm/elm_object.rb
index 38d4a74..8e636ed 100644
--- a/lib/efl/native/elm/elm_object.rb
+++ b/lib/efl/native/elm/elm_object.rb
@@ -25,45 +25,55 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *text);
-        [ :elm_object_part_text_set, [ :evas_object, :string, :string ], :void ],
+        [ :elm_object_part_text_set, [ :pointer, :string, :string ], :void ],
         # EAPI const char *elm_object_part_text_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_part_text_get, [ :evas_object, :string ], :string ],
+        [ :elm_object_part_text_get, [ :pointer, :string ], :string ],
+        # EAPI void elm_object_domain_translatable_part_text_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
+        [ :elm_object_domain_translatable_part_text_set, [ :pointer, :string, :string, :string ], :void ],
+        # EAPI const char *elm_object_translatable_part_text_get(const Evas_Object *obj, const char *part);
+        [ :elm_object_translatable_part_text_get, [ :pointer, :string ], :string ],
+        # EAPI void elm_object_domain_part_text_translatable_set(Evas_Object *obj, const char *part, const char *domain, Eina_Bool translatable);
+        [ :elm_object_domain_part_text_translatable_set, [ :pointer, :string, :string, :bool ], :void ],
         # EAPI void elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content);
-        [ :elm_object_part_content_set, [ :evas_object, :string, :evas_object ], :void ],
+        [ :elm_object_part_content_set, [ :pointer, :string, :pointer ], :void ],
         # EAPI Evas_Object *elm_object_part_content_get(const Evas_Object *obj, const char *part);
-        [ :elm_object_part_content_get, [ :evas_object, :string ], :evas_object ],
+        [ :elm_object_part_content_get, [ :pointer, :string ], :pointer ],
         # EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj, const char *part);
-        [ :elm_object_part_content_unset, [ :evas_object, :string ], :evas_object ],
+        [ :elm_object_part_content_unset, [ :pointer, :string ], :pointer ],
         # EAPI void elm_object_access_info_set(Evas_Object *obj, const char *txt);
-        [ :elm_object_access_info_set, [ :evas_object, :string ], :void ],
+        [ :elm_object_access_info_set, [ :pointer, :string ], :void ],
         # EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, const char *name, int recurse);
-        [ :elm_object_name_find, [ :evas_object, :string, :int ], :evas_object ],
+        [ :elm_object_name_find, [ :pointer, :string, :int ], :pointer ],
         # EAPI Eina_Bool elm_object_style_set(Evas_Object *obj, const char *style);
-        [ :elm_object_style_set, [ :evas_object, :string ], :bool ],
+        [ :elm_object_style_set, [ :pointer, :string ], :bool ],
         # EAPI const char *elm_object_style_get(const Evas_Object *obj);
-        [ :elm_object_style_get, [ :evas_object ], :string ],
+        [ :elm_object_style_get, [ :pointer ], :string ],
         # EAPI void elm_object_disabled_set(Evas_Object *obj, Eina_Bool disabled);
-        [ :elm_object_disabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_disabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_object_disabled_get(const Evas_Object *obj);
-        [ :elm_object_disabled_get, [ :evas_object ], :bool ],
+        [ :elm_object_disabled_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_object_widget_check(const Evas_Object *obj);
-        [ :elm_object_widget_check, [ :evas_object ], :bool ],
+        [ :elm_object_widget_check, [ :pointer ], :bool ],
         # EAPI Evas_Object *elm_object_parent_widget_get(const Evas_Object *obj);
-        [ :elm_object_parent_widget_get, [ :evas_object ], :evas_object ],
+        [ :elm_object_parent_widget_get, [ :pointer ], :pointer ],
         # EAPI Evas_Object *elm_object_top_widget_get(const Evas_Object *obj);
-        [ :elm_object_top_widget_get, [ :evas_object ], :evas_object ],
+        [ :elm_object_top_widget_get, [ :pointer ], :pointer ],
         # EAPI const char *elm_object_widget_type_get(const Evas_Object *obj);
-        [ :elm_object_widget_type_get, [ :evas_object ], :string ],
+        [ :elm_object_widget_type_get, [ :pointer ], :string ],
         # EAPI void elm_object_signal_emit(Evas_Object *obj, const char *emission, const char *source);
-        [ :elm_object_signal_emit, [ :evas_object, :string, :string ], :void ],
+        [ :elm_object_signal_emit, [ :pointer, :string, :string ], :void ],
         # EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :elm_object_signal_callback_add, [ :evas_object, :string, :string, :edje_signal_cb, :pointer ], :void ],
+        [ :elm_object_signal_callback_add, [ :pointer, :string, :string, :edje_signal_cb, :pointer ], :void ],
         # EAPI void *elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
-        [ :elm_object_signal_callback_del, [ :evas_object, :string, :string, :edje_signal_cb ], :pointer ],
+        [ :elm_object_signal_callback_del, [ :pointer, :string, :string, :edje_signal_cb ], :pointer ],
         # EAPI void elm_object_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data);
-        [ :elm_object_event_callback_add, [ :evas_object, :elm_event_cb, :pointer ], :void ],
+        [ :elm_object_event_callback_add, [ :pointer, :elm_event_cb, :pointer ], :void ],
         # EAPI void *elm_object_event_callback_del(Evas_Object *obj, Elm_Event_Cb func, const void *data);
-        [ :elm_object_event_callback_del, [ :evas_object, :elm_event_cb, :pointer ], :pointer ],
+        [ :elm_object_event_callback_del, [ :pointer, :elm_event_cb, :pointer ], :pointer ],
+        # EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+        [ :elm_object_orientation_mode_disabled_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj);
+        [ :elm_object_orientation_mode_disabled_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_object_item.rb b/lib/efl/native/elm/elm_object_item.rb
index 4df32bf..10d6869 100644
--- a/lib/efl/native/elm/elm_object_item.rb
+++ b/lib/efl/native/elm/elm_object_item.rb
@@ -21,28 +21,58 @@ module Efl
         #
         ffi_lib 'elementary.so.1'
         #
+        # TYPEDEFS
+        # typedef struct _Elm_Object_Item Elm_Object_Item;
+        typedef :pointer, :elm_object_item
+        #
+        # CALLBACKS
+        # typedef void (*Elm_Object_Item_Signal_Cb) (void *data, Elm_Object_Item *it, const char *emission, const char *source);
+        callback :elm_object_item_signal_cb, [ :pointer, :elm_object_item, :string, :string ], :void
+        #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it);
-        [ :elm_object_item_widget_get, [ :elm_object_item ], :evas_object ],
+        [ :elm_object_item_widget_get, [ :elm_object_item ], :pointer ],
         # EAPI void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
-        [ :elm_object_item_part_content_set, [ :elm_object_item, :string, :evas_object ], :void ],
+        [ :elm_object_item_part_content_set, [ :elm_object_item, :string, :pointer ], :void ],
         # EAPI Evas_Object *elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_part_content_get, [ :elm_object_item, :string ], :evas_object ],
+        [ :elm_object_item_part_content_get, [ :elm_object_item, :string ], :pointer ],
         # EAPI Evas_Object *elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part);
-        [ :elm_object_item_part_content_unset, [ :elm_object_item, :string ], :evas_object ],
+        [ :elm_object_item_part_content_unset, [ :elm_object_item, :string ], :pointer ],
         # EAPI void elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label);
         [ :elm_object_item_part_text_set, [ :elm_object_item, :string, :string ], :void ],
         # EAPI const char *elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part);
         [ :elm_object_item_part_text_get, [ :elm_object_item, :string ], :string ],
+        # EAPI void elm_object_item_domain_translatable_part_text_set(Elm_Object_Item *it, const char *part, const char *domain, const char *text);
+        [ :elm_object_item_domain_translatable_part_text_set, [ :elm_object_item, :string, :string, :string ], :void ],
+        # EAPI const char *elm_object_item_translatable_part_text_get(const Elm_Object_Item *it, const char *part);
+        [ :elm_object_item_translatable_part_text_get, [ :elm_object_item, :string ], :string ],
+        # EAPI void elm_object_item_domain_part_text_translatable_set(Elm_Object_Item *it, const char *part, const char *domain, Eina_Bool translatable);
+        [ :elm_object_item_domain_part_text_translatable_set, [ :elm_object_item, :string, :string, :bool ], :void ],
         # EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt);
         [ :elm_object_item_access_info_set, [ :elm_object_item, :string ], :void ],
+        # EAPI Evas_Object *elm_object_item_access_register(Elm_Object_Item *item);
+        [ :elm_object_item_access_register, [ :elm_object_item ], :pointer ],
+        # EAPI void elm_object_item_access_unregister(Elm_Object_Item *item);
+        [ :elm_object_item_access_unregister, [ :elm_object_item ], :void ],
+        # EAPI Evas_Object *elm_object_item_access_object_get(const Elm_Object_Item *item);
+        [ :elm_object_item_access_object_get, [ :elm_object_item ], :pointer ],
+        # EAPI void elm_object_item_access_order_set(Elm_Object_Item *item, Eina_List *objs);
+        [ :elm_object_item_access_order_set, [ :elm_object_item, :eina_list ], :void ],
+        # EAPI const Eina_List *elm_object_item_access_order_get(const Elm_Object_Item *item);
+        [ :elm_object_item_access_order_get, [ :elm_object_item ], :eina_list ],
+        # EAPI void elm_object_item_access_order_unset(Elm_Object_Item *item);
+        [ :elm_object_item_access_order_unset, [ :elm_object_item ], :void ],
         # EAPI void *elm_object_item_data_get(const Elm_Object_Item *it);
         [ :elm_object_item_data_get, [ :elm_object_item ], :pointer ],
         # EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data);
         [ :elm_object_item_data_set, [ :elm_object_item, :pointer ], :void ],
         # EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source);
         [ :elm_object_item_signal_emit, [ :elm_object_item, :string, :string ], :void ],
+        # EAPI void elm_object_item_signal_callback_add(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func, void *data);
+        [ :elm_object_item_signal_callback_add, [ :elm_object_item, :string, :string, :elm_object_item_signal_cb, :pointer ], :void ],
+        # EAPI void *elm_object_item_signal_callback_del(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func);
+        [ :elm_object_item_signal_callback_del, [ :elm_object_item, :string, :string, :elm_object_item_signal_cb ], :pointer ],
         # EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
         [ :elm_object_item_disabled_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it);
@@ -79,6 +109,12 @@ module Efl
         [ :elm_object_item_cursor_engine_only_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it);
         [ :elm_object_item_cursor_engine_only_get, [ :elm_object_item ], :bool ],
+        # EAPI Evas_Object *elm_object_item_track(Elm_Object_Item *it);
+        [ :elm_object_item_track, [ :elm_object_item ], :pointer ],
+        # EAPI void elm_object_item_untrack(Elm_Object_Item *it);
+        [ :elm_object_item_untrack, [ :elm_object_item ], :void ],
+        # EAPI int elm_object_item_track_get(const Elm_Object_Item *it);
+        [ :elm_object_item_track_get, [ :elm_object_item ], :int ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_panel.rb b/lib/efl/native/elm/elm_panel.rb
index 4e12d28..989734e 100644
--- a/lib/efl/native/elm/elm_panel.rb
+++ b/lib/efl/native/elm/elm_panel.rb
@@ -28,17 +28,17 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_panel_add(Evas_Object *parent);
-        [ :elm_panel_add, [ :evas_object ], :evas_object ],
+        [ :elm_panel_add, [ :pointer ], :pointer ],
         # EAPI void elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient);
-        [ :elm_panel_orient_set, [ :evas_object, :elm_panel_orient ], :void ],
+        [ :elm_panel_orient_set, [ :pointer, :elm_panel_orient ], :void ],
         # EAPI Elm_Panel_Orient elm_panel_orient_get(const Evas_Object *obj);
-        [ :elm_panel_orient_get, [ :evas_object ], :elm_panel_orient ],
+        [ :elm_panel_orient_get, [ :pointer ], :elm_panel_orient ],
         # EAPI void elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden);
-        [ :elm_panel_hidden_set, [ :evas_object, :bool ], :void ],
+        [ :elm_panel_hidden_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_panel_hidden_get(const Evas_Object *obj);
-        [ :elm_panel_hidden_get, [ :evas_object ], :bool ],
+        [ :elm_panel_hidden_get, [ :pointer ], :bool ],
         # EAPI void elm_panel_toggle(Evas_Object *obj);
-        [ :elm_panel_toggle, [ :evas_object ], :void ],
+        [ :elm_panel_toggle, [ :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_panes.rb b/lib/efl/native/elm/elm_panes.rb
index db62db5..13d5d78 100644
--- a/lib/efl/native/elm/elm_panes.rb
+++ b/lib/efl/native/elm/elm_panes.rb
@@ -24,23 +24,23 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_panes_add(Evas_Object *parent);
-        [ :elm_panes_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_panes_fixed_set(Evas_Object *obj, Eina_Bool fixed);
-        [ :elm_panes_fixed_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_panes_fixed_get(const Evas_Object *obj);
-        [ :elm_panes_fixed_get, [ :evas_object ], :bool ],
+        [ :elm_panes_add, [ :pointer ], :pointer ],
         # EAPI double elm_panes_content_left_size_get(const Evas_Object *obj);
-        [ :elm_panes_content_left_size_get, [ :evas_object ], :double ],
+        [ :elm_panes_content_left_size_get, [ :pointer ], :double ],
         # EAPI void elm_panes_content_left_size_set(Evas_Object *obj, double size);
-        [ :elm_panes_content_left_size_set, [ :evas_object, :double ], :void ],
+        [ :elm_panes_content_left_size_set, [ :pointer, :double ], :void ],
         # EAPI double elm_panes_content_right_size_get(const Evas_Object *obj);
-        [ :elm_panes_content_right_size_get, [ :evas_object ], :double ],
+        [ :elm_panes_content_right_size_get, [ :pointer ], :double ],
         # EAPI void elm_panes_content_right_size_set(Evas_Object *obj, double size);
-        [ :elm_panes_content_right_size_set, [ :evas_object, :double ], :void ],
+        [ :elm_panes_content_right_size_set, [ :pointer, :double ], :void ],
         # EAPI void elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_panes_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_panes_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_panes_horizontal_get(const Evas_Object *obj);
-        [ :elm_panes_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_panes_horizontal_get, [ :pointer ], :bool ],
+        # EAPI void elm_panes_fixed_set(Evas_Object *obj, Eina_Bool fixed);
+        [ :elm_panes_fixed_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_panes_fixed_get(const Evas_Object *obj);
+        [ :elm_panes_fixed_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_photo.rb b/lib/efl/native/elm/elm_photo.rb
index b837d14..571b8c0 100644
--- a/lib/efl/native/elm/elm_photo.rb
+++ b/lib/efl/native/elm/elm_photo.rb
@@ -24,21 +24,21 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
-        [ :elm_photo_add, [ :evas_object ], :evas_object ],
+        [ :elm_photo_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_photo_file_set(Evas_Object *obj, const char *file);
-        [ :elm_photo_file_set, [ :evas_object, :string ], :bool ],
+        [ :elm_photo_file_set, [ :pointer, :string ], :bool ],
         # EAPI void elm_photo_thumb_set(const Evas_Object *obj, const char *file, const char *group);
-        [ :elm_photo_thumb_set, [ :evas_object, :string, :string ], :void ],
+        [ :elm_photo_thumb_set, [ :pointer, :string, :string ], :void ],
         # EAPI void elm_photo_size_set(Evas_Object *obj, int size);
-        [ :elm_photo_size_set, [ :evas_object, :int ], :void ],
+        [ :elm_photo_size_set, [ :pointer, :int ], :void ],
         # EAPI void elm_photo_fill_inside_set(Evas_Object *obj, Eina_Bool fill);
-        [ :elm_photo_fill_inside_set, [ :evas_object, :bool ], :void ],
+        [ :elm_photo_fill_inside_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_photo_editable_set(Evas_Object *obj, Eina_Bool set);
-        [ :elm_photo_editable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_photo_editable_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_photo_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
-        [ :elm_photo_aspect_fixed_set, [ :evas_object, :bool ], :void ],
+        [ :elm_photo_aspect_fixed_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_photo_aspect_fixed_get(const Evas_Object *obj);
-        [ :elm_photo_aspect_fixed_get, [ :evas_object ], :bool ],
+        [ :elm_photo_aspect_fixed_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_photocam.rb b/lib/efl/native/elm/elm_photocam.rb
index def4676..a537a06 100644
--- a/lib/efl/native/elm/elm_photocam.rb
+++ b/lib/efl/native/elm/elm_photocam.rb
@@ -26,40 +26,46 @@ module Efl
         enum :elm_photocam_zoom_mode, [ :elm_photocam_zoom_mode_manual, 0, :elm_photocam_zoom_mode_auto_fit, 1, :elm_photocam_zoom_mode_auto_fill, 2,
             :elm_photocam_zoom_mode_auto_fit_in, 3, :elm_photocam_zoom_mode_last, 4 ]
         #
+        # TYPEDEFS
+        # typedef struct _Elm_Photocam_Progress Elm_Photocam_Progress;
+        typedef :pointer, :elm_photocam_progress
+        # typedef struct _Elm_Photocam_Error Elm_Photocam_Error;
+        typedef :pointer, :elm_photocam_error
+        #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
-        [ :elm_photocam_add, [ :evas_object ], :evas_object ],
+        [ :elm_photocam_add, [ :pointer ], :pointer ],
         # EAPI Evas_Load_Error elm_photocam_file_set(Evas_Object *obj, const char *file);
-        [ :elm_photocam_file_set, [ :evas_object, :string ], :evas_load_error ],
+        [ :elm_photocam_file_set, [ :pointer, :string ], :evas_load_error ],
         # EAPI const char *elm_photocam_file_get(const Evas_Object *obj);
-        [ :elm_photocam_file_get, [ :evas_object ], :string ],
+        [ :elm_photocam_file_get, [ :pointer ], :string ],
         # EAPI void elm_photocam_zoom_set(Evas_Object *obj, double zoom);
-        [ :elm_photocam_zoom_set, [ :evas_object, :double ], :void ],
+        [ :elm_photocam_zoom_set, [ :pointer, :double ], :void ],
         # EAPI double elm_photocam_zoom_get(const Evas_Object *obj);
-        [ :elm_photocam_zoom_get, [ :evas_object ], :double ],
+        [ :elm_photocam_zoom_get, [ :pointer ], :double ],
         # EAPI void elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);
-        [ :elm_photocam_zoom_mode_set, [ :evas_object, :elm_photocam_zoom_mode ], :void ],
+        [ :elm_photocam_zoom_mode_set, [ :pointer, :elm_photocam_zoom_mode ], :void ],
         # EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(const Evas_Object *obj);
-        [ :elm_photocam_zoom_mode_get, [ :evas_object ], :elm_photocam_zoom_mode ],
+        [ :elm_photocam_zoom_mode_get, [ :pointer ], :elm_photocam_zoom_mode ],
         # EAPI void elm_photocam_image_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :elm_photocam_image_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_photocam_image_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_photocam_image_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :elm_photocam_image_region_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_photocam_image_region_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_photocam_image_region_show, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_photocam_image_region_show, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_photocam_image_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_photocam_image_region_bring_in, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_photocam_image_region_bring_in, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused);
-        [ :elm_photocam_paused_set, [ :evas_object, :bool ], :void ],
+        [ :elm_photocam_paused_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_photocam_paused_get(const Evas_Object *obj);
-        [ :elm_photocam_paused_get, [ :evas_object ], :bool ],
+        [ :elm_photocam_paused_get, [ :pointer ], :bool ],
         # EAPI Evas_Object *elm_photocam_internal_image_get(const Evas_Object *obj);
-        [ :elm_photocam_internal_image_get, [ :evas_object ], :evas_object ],
+        [ :elm_photocam_internal_image_get, [ :pointer ], :pointer ],
         # EAPI void elm_photocam_gesture_enabled_set(Evas_Object *obj, Eina_Bool gesture);
-        [ :elm_photocam_gesture_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_photocam_gesture_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_photocam_gesture_enabled_get(const Evas_Object *obj);
-        [ :elm_photocam_gesture_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_photocam_gesture_enabled_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_plug.rb b/lib/efl/native/elm/elm_plug.rb
index 780f29a..5511fda 100644
--- a/lib/efl/native/elm/elm_plug.rb
+++ b/lib/efl/native/elm/elm_plug.rb
@@ -24,11 +24,11 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_plug_add(Evas_Object *parent);
-        [ :elm_plug_add, [ :evas_object ], :evas_object ],
-        # EAPI Eina_Bool elm_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :elm_plug_connect, [ :evas_object, :string, :int, :bool ], :bool ],
+        [ :elm_plug_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *elm_plug_image_object_get(const Evas_Object *obj);
-        [ :elm_plug_image_object_get, [ :evas_object ], :evas_object ],
+        [ :elm_plug_image_object_get, [ :pointer ], :pointer ],
+        # EAPI Eina_Bool elm_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
+        [ :elm_plug_connect, [ :pointer, :string, :int, :bool ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_popup.rb b/lib/efl/native/elm/elm_popup.rb
index fa2f174..f62f97d 100644
--- a/lib/efl/native/elm/elm_popup.rb
+++ b/lib/efl/native/elm/elm_popup.rb
@@ -31,25 +31,29 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_popup_add(Evas_Object *parent);
-        [ :elm_popup_add, [ :evas_object ], :evas_object ],
-        # EAPI Elm_Object_Item *elm_popup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
-        [ :elm_popup_item_append, [ :evas_object, :string, :evas_object, :evas_smart_cb, :pointer ], :elm_object_item ],
+        [ :elm_popup_add, [ :pointer ], :pointer ],
         # EAPI void elm_popup_content_text_wrap_type_set(Evas_Object *obj, Elm_Wrap_Type wrap);
-        [ :elm_popup_content_text_wrap_type_set, [ :evas_object, :elm_wrap_type ], :void ],
+        [ :elm_popup_content_text_wrap_type_set, [ :pointer, :elm_wrap_type ], :void ],
         # EAPI Elm_Wrap_Type elm_popup_content_text_wrap_type_get(const Evas_Object *obj);
-        [ :elm_popup_content_text_wrap_type_get, [ :evas_object ], :elm_wrap_type ],
+        [ :elm_popup_content_text_wrap_type_get, [ :pointer ], :elm_wrap_type ],
         # EAPI void elm_popup_orient_set(Evas_Object *obj, Elm_Popup_Orient orient);
-        [ :elm_popup_orient_set, [ :evas_object, :elm_popup_orient ], :void ],
+        [ :elm_popup_orient_set, [ :pointer, :elm_popup_orient ], :void ],
         # EAPI Elm_Popup_Orient elm_popup_orient_get(const Evas_Object *obj);
-        [ :elm_popup_orient_get, [ :evas_object ], :elm_popup_orient ],
+        [ :elm_popup_orient_get, [ :pointer ], :elm_popup_orient ],
         # EAPI void elm_popup_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_popup_timeout_set, [ :evas_object, :double ], :void ],
+        [ :elm_popup_timeout_set, [ :pointer, :double ], :void ],
         # EAPI double elm_popup_timeout_get(const Evas_Object *obj);
-        [ :elm_popup_timeout_get, [ :evas_object ], :double ],
+        [ :elm_popup_timeout_get, [ :pointer ], :double ],
         # EAPI void elm_popup_allow_events_set(Evas_Object *obj, Eina_Bool allow);
-        [ :elm_popup_allow_events_set, [ :evas_object, :bool ], :void ],
+        [ :elm_popup_allow_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_popup_allow_events_get(const Evas_Object *obj);
-        [ :elm_popup_allow_events_get, [ :evas_object ], :bool ],
+        [ :elm_popup_allow_events_get, [ :pointer ], :bool ],
+        # EAPI Elm_Object_Item *elm_popup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
+        [ :elm_popup_item_append, [ :pointer, :string, :pointer, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI void elm_popup_align_set(Evas_Object *obj, double horizontal, double vertical);
+        [ :elm_popup_align_set, [ :pointer, :double, :double ], :void ],
+        # EAPI void elm_popup_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
+        [ :elm_popup_align_get, [ :pointer, :pointer, :pointer ], :void ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_progressbar.rb b/lib/efl/native/elm/elm_progressbar.rb
index b44d7d0..32dd44a 100644
--- a/lib/efl/native/elm/elm_progressbar.rb
+++ b/lib/efl/native/elm/elm_progressbar.rb
@@ -24,35 +24,39 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_progressbar_add(Evas_Object *parent);
-        [ :elm_progressbar_add, [ :evas_object ], :evas_object ],
+        [ :elm_progressbar_add, [ :pointer ], :pointer ],
         # EAPI void elm_progressbar_pulse_set(Evas_Object *obj, Eina_Bool pulse);
-        [ :elm_progressbar_pulse_set, [ :evas_object, :bool ], :void ],
+        [ :elm_progressbar_pulse_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_progressbar_pulse_get(const Evas_Object *obj);
-        [ :elm_progressbar_pulse_get, [ :evas_object ], :bool ],
+        [ :elm_progressbar_pulse_get, [ :pointer ], :bool ],
         # EAPI void elm_progressbar_pulse(Evas_Object *obj, Eina_Bool state);
-        [ :elm_progressbar_pulse, [ :evas_object, :bool ], :void ],
+        [ :elm_progressbar_pulse, [ :pointer, :bool ], :void ],
         # EAPI void elm_progressbar_value_set(Evas_Object *obj, double val);
-        [ :elm_progressbar_value_set, [ :evas_object, :double ], :void ],
+        [ :elm_progressbar_value_set, [ :pointer, :double ], :void ],
         # EAPI double elm_progressbar_value_get(const Evas_Object *obj);
-        [ :elm_progressbar_value_get, [ :evas_object ], :double ],
+        [ :elm_progressbar_value_get, [ :pointer ], :double ],
         # EAPI void elm_progressbar_span_size_set(Evas_Object *obj, Evas_Coord size);
-        [ :elm_progressbar_span_size_set, [ :evas_object, :int ], :void ],
+        [ :elm_progressbar_span_size_set, [ :pointer, :int ], :void ],
         # EAPI Evas_Coord elm_progressbar_span_size_get(const Evas_Object *obj);
-        [ :elm_progressbar_span_size_get, [ :evas_object ], :int ],
+        [ :elm_progressbar_span_size_get, [ :pointer ], :int ],
         # EAPI void elm_progressbar_unit_format_set(Evas_Object *obj, const char *format);
-        [ :elm_progressbar_unit_format_set, [ :evas_object, :string ], :void ],
+        [ :elm_progressbar_unit_format_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_progressbar_unit_format_get(const Evas_Object *obj);
-        [ :elm_progressbar_unit_format_get, [ :evas_object ], :string ],
+        [ :elm_progressbar_unit_format_get, [ :pointer ], :string ],
         # EAPI void elm_progressbar_unit_format_function_set(Evas_Object *obj, char *(func)(double), void (*free_func) (char *));
-        [ :elm_progressbar_unit_format_function_set, [ :evas_object, ( callback [:double], :string ), (callback [:string], :void) ], :void ],
+        # FIXME
         # EAPI void elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_progressbar_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_progressbar_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_progressbar_horizontal_get(const Evas_Object *obj);
-        [ :elm_progressbar_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_progressbar_horizontal_get, [ :pointer ], :bool ],
         # EAPI void elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted);
-        [ :elm_progressbar_inverted_set, [ :evas_object, :bool ], :void ],
+        [ :elm_progressbar_inverted_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_progressbar_inverted_get(const Evas_Object *obj);
-        [ :elm_progressbar_inverted_get, [ :evas_object ], :bool ],
+        [ :elm_progressbar_inverted_get, [ :pointer ], :bool ],
+        # EAPI void elm_progressbar_part_value_set(Evas_Object *obj, const char *part, double val);
+        [ :elm_progressbar_part_value_set, [ :pointer, :string, :double ], :void ],
+        # EAPI double elm_progressbar_part_value_get(const Evas_Object *obj, const char *part);
+        [ :elm_progressbar_part_value_get, [ :pointer, :string ], :double ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_radio.rb b/lib/efl/native/elm/elm_radio.rb
index 9e85084..5f47966 100644
--- a/lib/efl/native/elm/elm_radio.rb
+++ b/lib/efl/native/elm/elm_radio.rb
@@ -24,21 +24,21 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_radio_add(Evas_Object *parent);
-        [ :elm_radio_add, [ :evas_object ], :evas_object ],
+        [ :elm_radio_add, [ :pointer ], :pointer ],
         # EAPI void elm_radio_group_add(Evas_Object *obj, Evas_Object *group);
-        [ :elm_radio_group_add, [ :evas_object, :evas_object ], :void ],
+        [ :elm_radio_group_add, [ :pointer, :pointer ], :void ],
         # EAPI void elm_radio_state_value_set(Evas_Object *obj, int value);
-        [ :elm_radio_state_value_set, [ :evas_object, :int ], :void ],
+        [ :elm_radio_state_value_set, [ :pointer, :int ], :void ],
         # EAPI int elm_radio_state_value_get(const Evas_Object *obj);
-        [ :elm_radio_state_value_get, [ :evas_object ], :int ],
+        [ :elm_radio_state_value_get, [ :pointer ], :int ],
         # EAPI void elm_radio_value_set(Evas_Object *obj, int value);
-        [ :elm_radio_value_set, [ :evas_object, :int ], :void ],
+        [ :elm_radio_value_set, [ :pointer, :int ], :void ],
         # EAPI int elm_radio_value_get(const Evas_Object *obj);
-        [ :elm_radio_value_get, [ :evas_object ], :int ],
+        [ :elm_radio_value_get, [ :pointer ], :int ],
         # EAPI void elm_radio_value_pointer_set(Evas_Object *obj, int *valuep);
-        [ :elm_radio_value_pointer_set, [ :evas_object, :pointer ], :void ],
+        [ :elm_radio_value_pointer_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *elm_radio_selected_object_get(Evas_Object *obj);
-        [ :elm_radio_selected_object_get, [ :evas_object ], :evas_object ],
+        [ :elm_radio_selected_object_get, [ :pointer ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_scale.rb b/lib/efl/native/elm/elm_scale.rb
index dd9f86f..f299d1f 100644
--- a/lib/efl/native/elm/elm_scale.rb
+++ b/lib/efl/native/elm/elm_scale.rb
@@ -24,9 +24,9 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI void elm_object_scale_set(Evas_Object *obj, double scale);
-        [ :elm_object_scale_set, [ :evas_object, :double ], :void ],
+        [ :elm_object_scale_set, [ :pointer, :double ], :void ],
         # EAPI double elm_object_scale_get(const Evas_Object *obj);
-        [ :elm_object_scale_get, [ :evas_object ], :double ],
+        [ :elm_object_scale_get, [ :pointer ], :double ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_scroll.rb b/lib/efl/native/elm/elm_scroll.rb
index fd12c41..ed4f689 100644
--- a/lib/efl/native/elm/elm_scroll.rb
+++ b/lib/efl/native/elm/elm_scroll.rb
@@ -24,25 +24,25 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI void elm_object_scroll_hold_push(Evas_Object *obj);
-        [ :elm_object_scroll_hold_push, [ :evas_object ], :void ],
+        [ :elm_object_scroll_hold_push, [ :pointer ], :void ],
         # EAPI void elm_object_scroll_hold_pop(Evas_Object *obj);
-        [ :elm_object_scroll_hold_pop, [ :evas_object ], :void ],
+        [ :elm_object_scroll_hold_pop, [ :pointer ], :void ],
         # EAPI int elm_object_scroll_hold_get(const Evas_Object *obj);
-        [ :elm_object_scroll_hold_get, [ :evas_object ], :int ],
+        [ :elm_object_scroll_hold_get, [ :pointer ], :int ],
         # EAPI void elm_object_scroll_freeze_push(Evas_Object *obj);
-        [ :elm_object_scroll_freeze_push, [ :evas_object ], :void ],
+        [ :elm_object_scroll_freeze_push, [ :pointer ], :void ],
         # EAPI void elm_object_scroll_freeze_pop(Evas_Object *obj);
-        [ :elm_object_scroll_freeze_pop, [ :evas_object ], :void ],
+        [ :elm_object_scroll_freeze_pop, [ :pointer ], :void ],
         # EAPI int elm_object_scroll_freeze_get(const Evas_Object *obj);
-        [ :elm_object_scroll_freeze_get, [ :evas_object ], :int ],
+        [ :elm_object_scroll_freeze_get, [ :pointer ], :int ],
         # EAPI void elm_object_scroll_lock_x_set(Evas_Object *obj, Eina_Bool lock);
-        [ :elm_object_scroll_lock_x_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_scroll_lock_x_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_object_scroll_lock_y_set(Evas_Object *obj, Eina_Bool lock);
-        [ :elm_object_scroll_lock_y_set, [ :evas_object, :bool ], :void ],
+        [ :elm_object_scroll_lock_y_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_object_scroll_lock_x_get(const Evas_Object *obj);
-        [ :elm_object_scroll_lock_x_get, [ :evas_object ], :bool ],
+        [ :elm_object_scroll_lock_x_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_object_scroll_lock_y_get(const Evas_Object *obj);
-        [ :elm_object_scroll_lock_y_get, [ :evas_object ], :bool ],
+        [ :elm_object_scroll_lock_y_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_scroller.rb b/lib/efl/native/elm/elm_scroller.rb
index 18550a8..c5d0911 100644
--- a/lib/efl/native/elm/elm_scroller.rb
+++ b/lib/efl/native/elm/elm_scroller.rb
@@ -25,53 +25,75 @@ module Efl
         # typedef enum {...} Elm_Scroller_Policy;
         enum :elm_scroller_policy, [ :elm_scroller_policy_auto, 0, :elm_scroller_policy_on, 1, :elm_scroller_policy_off, 2, :elm_scroller_policy_last,
             3 ]
+        # typedef enum {...} Elm_Scroller_Single_Direction;
+        enum :elm_scroller_single_direction, [ :elm_scroller_single_direction_none, 0, :elm_scroller_single_direction_soft, 1,
+            :elm_scroller_single_direction_hard, 2, :elm_scroller_single_direction_last, 3 ]
+        # typedef enum {...} Elm_Scroller_Movement_Block;
+        enum :elm_scroller_movement_block, [ :elm_scroller_movement_no_block, 1<<0, :elm_scroller_movement_block_vertical, 1<<1,
+            :elm_scroller_movement_block_horizontal, 1<<2 ]
         #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
-        [ :elm_scroller_add, [ :evas_object ], :evas_object ],
+        [ :elm_scroller_add, [ :pointer ], :pointer ],
         # EAPI void elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h);
-        [ :elm_scroller_content_min_limit, [ :evas_object, :bool, :bool ], :void ],
+        [ :elm_scroller_content_min_limit, [ :pointer, :bool, :bool ], :void ],
         # EAPI void elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :elm_scroller_region_show, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_scroller_region_show, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
-        [ :elm_scroller_policy_set, [ :evas_object, :elm_scroller_policy, :elm_scroller_policy ], :void ],
+        [ :elm_scroller_policy_set, [ :pointer, :elm_scroller_policy, :elm_scroller_policy ], :void ],
         # EAPI void elm_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
-        [ :elm_scroller_policy_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_policy_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_single_direction_set(Evas_Object *obj, Elm_Scroller_Single_Direction single_dir);
+        [ :elm_scroller_single_direction_set, [ :pointer, :elm_scroller_single_direction ], :void ],
+        # EAPI Elm_Scroller_Single_Direction elm_scroller_single_direction_get(const Evas_Object *obj);
+        [ :elm_scroller_single_direction_get, [ :pointer ], :elm_scroller_single_direction ],
         # EAPI void elm_scroller_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_scroller_region_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_scroller_region_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_child_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_scroller_child_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_child_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_page_snap_set(Evas_Object *obj, Eina_Bool page_h_snap, Eina_Bool page_v_snap);
+        [ :elm_scroller_page_snap_set, [ :pointer, :bool, :bool ], :void ],
+        # EAPI void elm_scroller_page_snap_get(const Evas_Object *obj, Eina_Bool *page_h_snap, Eina_Bool *page_v_snap);
+        [ :elm_scroller_page_snap_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
-        [ :elm_scroller_bounce_set, [ :evas_object, :bool, :bool ], :void ],
+        [ :elm_scroller_bounce_set, [ :pointer, :bool, :bool ], :void ],
         # EAPI void elm_scroller_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        [ :elm_scroller_bounce_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_bounce_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
-        [ :elm_scroller_page_relative_set, [ :evas_object, :double, :double ], :void ],
+        [ :elm_scroller_page_relative_set, [ :pointer, :double, :double ], :void ],
         # EAPI void elm_scroller_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel);
-        [ :elm_scroller_page_relative_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_page_relative_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
-        [ :elm_scroller_page_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_scroller_page_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_scroller_page_size_get(const Evas_Object *obj, Evas_Coord *h_pagesize, Evas_Coord *v_pagesize);
-        [ :elm_scroller_page_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_page_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_page_scroll_limit_set(const Evas_Object *obj, Evas_Coord page_limit_h, Evas_Coord page_limit_v);
+        [ :elm_scroller_page_scroll_limit_set, [ :pointer, :int, :int ], :void ],
+        # EAPI void elm_scroller_page_scroll_limit_get(const Evas_Object *obj, Evas_Coord *page_limit_h, Evas_Coord *page_limit_v);
+        [ :elm_scroller_page_scroll_limit_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_scroller_current_page_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_current_page_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
-        [ :elm_scroller_last_page_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_last_page_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_scroller_page_show(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_scroller_page_show, [ :evas_object, :int, :int ], :void ],
+        [ :elm_scroller_page_show, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_scroller_page_bring_in(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
-        [ :elm_scroller_page_bring_in, [ :evas_object, :int, :int ], :void ],
+        [ :elm_scroller_page_bring_in, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :elm_scroller_region_bring_in, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_scroller_region_bring_in, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_scroller_propagate_events_set(Evas_Object *obj, Eina_Bool propagation);
-        [ :elm_scroller_propagate_events_set, [ :evas_object, :bool ], :void ],
+        [ :elm_scroller_propagate_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_scroller_propagate_events_get(const Evas_Object *obj);
-        [ :elm_scroller_propagate_events_get, [ :evas_object ], :bool ],
+        [ :elm_scroller_propagate_events_get, [ :pointer ], :bool ],
         # EAPI void elm_scroller_gravity_set(Evas_Object *obj, double x, double y);
-        [ :elm_scroller_gravity_set, [ :evas_object, :double, :double ], :void ],
+        [ :elm_scroller_gravity_set, [ :pointer, :double, :double ], :void ],
         # EAPI void elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y);
-        [ :elm_scroller_gravity_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_scroller_gravity_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_scroller_movement_block_set(Evas_Object *obj, Elm_Scroller_Movement_Block block);
+        [ :elm_scroller_movement_block_set, [ :pointer, :elm_scroller_movement_block ], :void ],
+        # EAPI Elm_Scroller_Movement_Block elm_scroller_movement_block_get(const Evas_Object *obj);
+        [ :elm_scroller_movement_block_get, [ :pointer ], :elm_scroller_movement_block ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_segment_control.rb b/lib/efl/native/elm/elm_segment_control.rb
index ce6c301..56e584d 100644
--- a/lib/efl/native/elm/elm_segment_control.rb
+++ b/lib/efl/native/elm/elm_segment_control.rb
@@ -23,30 +23,30 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI int elm_segment_control_item_index_get(const Elm_Object_Item *it);
+        [ :elm_segment_control_item_index_get, [ :elm_object_item ], :int ],
+        # EAPI Evas_Object *elm_segment_control_item_object_get(const Elm_Object_Item *it);
+        [ :elm_segment_control_item_object_get, [ :elm_object_item ], :pointer ],
+        # EAPI void elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool select);
+        [ :elm_segment_control_item_selected_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent);
-        [ :elm_segment_control_add, [ :evas_object ], :evas_object ],
+        [ :elm_segment_control_add, [ :pointer ], :pointer ],
         # EAPI Elm_Object_Item *elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label);
-        [ :elm_segment_control_item_add, [ :evas_object, :evas_object, :string ], :elm_object_item ],
+        [ :elm_segment_control_item_add, [ :pointer, :pointer, :string ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, int index);
-        [ :elm_segment_control_item_insert_at, [ :evas_object, :evas_object, :string, :int ], :elm_object_item ],
+        [ :elm_segment_control_item_insert_at, [ :pointer, :pointer, :string, :int ], :elm_object_item ],
         # EAPI void elm_segment_control_item_del_at(Evas_Object *obj, int index);
-        [ :elm_segment_control_item_del_at, [ :evas_object, :int ], :void ],
-        # EAPI int elm_segment_control_item_count_get(const Evas_Object *obj);
-        [ :elm_segment_control_item_count_get, [ :evas_object ], :int ],
-        # EAPI Elm_Object_Item *elm_segment_control_item_get(const Evas_Object *obj, int index);
-        [ :elm_segment_control_item_get, [ :evas_object, :int ], :elm_object_item ],
+        [ :elm_segment_control_item_del_at, [ :pointer, :int ], :void ],
         # EAPI const char *elm_segment_control_item_label_get(const Evas_Object *obj, int index);
-        [ :elm_segment_control_item_label_get, [ :evas_object, :int ], :string ],
+        [ :elm_segment_control_item_label_get, [ :pointer, :int ], :string ],
         # EAPI Evas_Object *elm_segment_control_item_icon_get(const Evas_Object *obj, int index);
-        [ :elm_segment_control_item_icon_get, [ :evas_object, :int ], :evas_object ],
-        # EAPI int elm_segment_control_item_index_get(const Elm_Object_Item *it);
-        [ :elm_segment_control_item_index_get, [ :elm_object_item ], :int ],
-        # EAPI Evas_Object *elm_segment_control_item_object_get(const Elm_Object_Item *it);
-        [ :elm_segment_control_item_object_get, [ :elm_object_item ], :evas_object ],
+        [ :elm_segment_control_item_icon_get, [ :pointer, :int ], :pointer ],
+        # EAPI int elm_segment_control_item_count_get(const Evas_Object *obj);
+        [ :elm_segment_control_item_count_get, [ :pointer ], :int ],
         # EAPI Elm_Object_Item *elm_segment_control_item_selected_get(const Evas_Object *obj);
-        [ :elm_segment_control_item_selected_get, [ :evas_object ], :elm_object_item ],
-        # EAPI void elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool select);
-        [ :elm_segment_control_item_selected_set, [ :elm_object_item, :bool ], :void ],
+        [ :elm_segment_control_item_selected_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_segment_control_item_get(const Evas_Object *obj, int index);
+        [ :elm_segment_control_item_get, [ :pointer, :int ], :elm_object_item ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_separator.rb b/lib/efl/native/elm/elm_separator.rb
index a22ecdd..bde2ce8 100644
--- a/lib/efl/native/elm/elm_separator.rb
+++ b/lib/efl/native/elm/elm_separator.rb
@@ -24,11 +24,11 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_separator_add(Evas_Object *parent);
-        [ :elm_separator_add, [ :evas_object ], :evas_object ],
+        [ :elm_separator_add, [ :pointer ], :pointer ],
         # EAPI void elm_separator_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_separator_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_separator_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_separator_horizontal_get(const Evas_Object *obj);
-        [ :elm_separator_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_separator_horizontal_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_slider.rb b/lib/efl/native/elm/elm_slider.rb
index 1dfa22c..2fda64a 100644
--- a/lib/efl/native/elm/elm_slider.rb
+++ b/lib/efl/native/elm/elm_slider.rb
@@ -24,43 +24,51 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_slider_add(Evas_Object *parent);
-        [ :elm_slider_add, [ :evas_object ], :evas_object ],
+        [ :elm_slider_add, [ :pointer ], :pointer ],
         # EAPI void elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size);
-        [ :elm_slider_span_size_set, [ :evas_object, :int ], :void ],
+        [ :elm_slider_span_size_set, [ :pointer, :int ], :void ],
         # EAPI Evas_Coord elm_slider_span_size_get(const Evas_Object *obj);
-        [ :elm_slider_span_size_get, [ :evas_object ], :int ],
+        [ :elm_slider_span_size_get, [ :pointer ], :int ],
         # EAPI void elm_slider_unit_format_set(Evas_Object *obj, const char *format);
-        [ :elm_slider_unit_format_set, [ :evas_object, :string ], :void ],
+        [ :elm_slider_unit_format_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_slider_unit_format_get(const Evas_Object *obj);
-        [ :elm_slider_unit_format_get, [ :evas_object ], :string ],
+        [ :elm_slider_unit_format_get, [ :pointer ], :string ],
         # EAPI void elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator);
-        [ :elm_slider_indicator_format_set, [ :evas_object, :string ], :void ],
+        [ :elm_slider_indicator_format_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_slider_indicator_format_get(const Evas_Object *obj);
-        [ :elm_slider_indicator_format_get, [ :evas_object ], :string ],
-        # EAPI void elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str));
-        [ :elm_slider_indicator_format_function_set, [ :evas_object, ( callback [:double], :string ), (callback [:string], :void) ], :void ],
-        # EAPI void elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str));
-        [ :elm_slider_units_format_function_set, [ :evas_object, (callback [:double], :string), (callback [:string], :void) ], :void ],
+        [ :elm_slider_indicator_format_get, [ :pointer ], :string ],
         # EAPI void elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_slider_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_slider_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_slider_horizontal_get(const Evas_Object *obj);
-        [ :elm_slider_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_slider_horizontal_get, [ :pointer ], :bool ],
         # EAPI void elm_slider_min_max_set(Evas_Object *obj, double min, double max);
-        [ :elm_slider_min_max_set, [ :evas_object, :double, :double ], :void ],
+        [ :elm_slider_min_max_set, [ :pointer, :double, :double ], :void ],
         # EAPI void elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max);
-        [ :elm_slider_min_max_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_slider_min_max_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_slider_value_set(Evas_Object *obj, double val);
-        [ :elm_slider_value_set, [ :evas_object, :double ], :void ],
+        [ :elm_slider_value_set, [ :pointer, :double ], :void ],
         # EAPI double elm_slider_value_get(const Evas_Object *obj);
-        [ :elm_slider_value_get, [ :evas_object ], :double ],
+        [ :elm_slider_value_get, [ :pointer ], :double ],
         # EAPI void elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted);
-        [ :elm_slider_inverted_set, [ :evas_object, :bool ], :void ],
+        [ :elm_slider_inverted_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_slider_inverted_get(const Evas_Object *obj);
-        [ :elm_slider_inverted_get, [ :evas_object ], :bool ],
+        [ :elm_slider_inverted_get, [ :pointer ], :bool ],
+        # EAPI void elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str));
+        # FIXME
+        # EAPI void elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str));
+        # FIXME
         # EAPI void elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show);
-        [ :elm_slider_indicator_show_set, [ :evas_object, :bool ], :void ],
+        [ :elm_slider_indicator_show_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_slider_indicator_show_get(const Evas_Object *obj);
-        [ :elm_slider_indicator_show_get, [ :evas_object ], :bool ],
+        [ :elm_slider_indicator_show_get, [ :pointer ], :bool ],
+        # EAPI void elm_slider_step_set(Evas_Object *obj, double step);
+        [ :elm_slider_step_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_slider_step_get(const Evas_Object *obj);
+        [ :elm_slider_step_get, [ :pointer ], :double ],
+        # EAPI void elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag);
+        [ :elm_slider_indicator_show_on_focus_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_slider_indicator_show_on_focus_get(const Evas_Object *obj);
+        [ :elm_slider_indicator_show_on_focus_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_slideshow.rb b/lib/efl/native/elm/elm_slideshow.rb
index 62261d6..1fc0f5d 100644
--- a/lib/efl/native/elm/elm_slideshow.rb
+++ b/lib/efl/native/elm/elm_slideshow.rb
@@ -29,64 +29,64 @@ module Efl
         #
         # CALLBACKS
         # typedef Evas_Object *(*SlideshowItemGetFunc) (void *data, Evas_Object *obj);
-        callback :slideshowitemgetfunc_cb, [ :pointer, :evas_object ], :evas_object
+        callback :slideshowitemgetfunc_cb, [ :pointer, :pointer ], :pointer
         # typedef void (*SlideshowItemDelFunc) (void *data, Evas_Object *obj);
-        callback :slideshowitemdelfunc_cb, [ :pointer, :evas_object ], :void
+        callback :slideshowitemdelfunc_cb, [ :pointer, :pointer ], :void
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_slideshow_item_show(Elm_Object_Item *it);
+        [ :elm_slideshow_item_show, [ :elm_object_item ], :void ],
+        # EAPI Evas_Object *elm_slideshow_item_object_get(const Elm_Object_Item *it);
+        [ :elm_slideshow_item_object_get, [ :elm_object_item ], :pointer ],
         # EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent);
-        [ :elm_slideshow_add, [ :evas_object ], :evas_object ],
+        [ :elm_slideshow_add, [ :pointer ], :pointer ],
         # EAPI Elm_Object_Item *elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data);
-        [ :elm_slideshow_item_add, [ :evas_object, :elm_slideshow_item_class, :pointer ], :elm_object_item ],
+        [ :elm_slideshow_item_add, [ :pointer, :elm_slideshow_item_class, :pointer ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_slideshow_item_sorted_insert(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data, Eina_Compare_Cb func);
-        [ :elm_slideshow_item_sorted_insert, [ :evas_object, :elm_slideshow_item_class, :pointer, :eina_compare_cb ], :elm_object_item ],
-        # EAPI void elm_slideshow_item_show(Elm_Object_Item *it);
-        [ :elm_slideshow_item_show, [ :elm_object_item ], :void ],
+        [ :elm_slideshow_item_sorted_insert, [ :pointer, :elm_slideshow_item_class, :pointer, :eina_compare_cb ], :elm_object_item ],
         # EAPI void elm_slideshow_next(Evas_Object *obj);
-        [ :elm_slideshow_next, [ :evas_object ], :void ],
+        [ :elm_slideshow_next, [ :pointer ], :void ],
         # EAPI void elm_slideshow_previous(Evas_Object *obj);
-        [ :elm_slideshow_previous, [ :evas_object ], :void ],
+        [ :elm_slideshow_previous, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_slideshow_transitions_get(const Evas_Object *obj);
-        [ :elm_slideshow_transitions_get, [ :evas_object ], :eina_list ],
+        [ :elm_slideshow_transitions_get, [ :pointer ], :eina_list ],
+        # EAPI const Eina_List *elm_slideshow_layouts_get(const Evas_Object *obj);
+        [ :elm_slideshow_layouts_get, [ :pointer ], :eina_list ],
         # EAPI void elm_slideshow_transition_set(Evas_Object *obj, const char *transition);
-        [ :elm_slideshow_transition_set, [ :evas_object, :string ], :void ],
+        [ :elm_slideshow_transition_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_slideshow_transition_get(const Evas_Object *obj);
-        [ :elm_slideshow_transition_get, [ :evas_object ], :string ],
+        [ :elm_slideshow_transition_get, [ :pointer ], :string ],
         # EAPI void elm_slideshow_timeout_set(Evas_Object *obj, double timeout);
-        [ :elm_slideshow_timeout_set, [ :evas_object, :double ], :void ],
+        [ :elm_slideshow_timeout_set, [ :pointer, :double ], :void ],
         # EAPI double elm_slideshow_timeout_get(const Evas_Object *obj);
-        [ :elm_slideshow_timeout_get, [ :evas_object ], :double ],
+        [ :elm_slideshow_timeout_get, [ :pointer ], :double ],
         # EAPI void elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop);
-        [ :elm_slideshow_loop_set, [ :evas_object, :bool ], :void ],
+        [ :elm_slideshow_loop_set, [ :pointer, :bool ], :void ],
+        # EAPI const char *elm_slideshow_layout_get(const Evas_Object *obj);
+        [ :elm_slideshow_layout_get, [ :pointer ], :string ],
+        # EAPI void elm_slideshow_layout_set(Evas_Object *obj, const char *layout);
+        [ :elm_slideshow_layout_set, [ :pointer, :string ], :void ],
         # EAPI Eina_Bool elm_slideshow_loop_get(const Evas_Object *obj);
-        [ :elm_slideshow_loop_get, [ :evas_object ], :bool ],
+        [ :elm_slideshow_loop_get, [ :pointer ], :bool ],
         # EAPI void elm_slideshow_clear(Evas_Object *obj);
-        [ :elm_slideshow_clear, [ :evas_object ], :void ],
+        [ :elm_slideshow_clear, [ :pointer ], :void ],
         # EAPI const Eina_List *elm_slideshow_items_get(const Evas_Object *obj);
-        [ :elm_slideshow_items_get, [ :evas_object ], :eina_list ],
+        [ :elm_slideshow_items_get, [ :pointer ], :eina_list ],
         # EAPI Elm_Object_Item *elm_slideshow_item_current_get(const Evas_Object *obj);
-        [ :elm_slideshow_item_current_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Evas_Object *elm_slideshow_item_object_get(const Elm_Object_Item *it);
-        [ :elm_slideshow_item_object_get, [ :elm_object_item ], :evas_object ],
-        # EAPI Elm_Object_Item *elm_slideshow_item_nth_get(const Evas_Object *obj, unsigned int nth);
-        [ :elm_slideshow_item_nth_get, [ :evas_object, :uint ], :elm_object_item ],
-        # EAPI void elm_slideshow_layout_set(Evas_Object *obj, const char *layout);
-        [ :elm_slideshow_layout_set, [ :evas_object, :string ], :void ],
-        # EAPI const char *elm_slideshow_layout_get(const Evas_Object *obj);
-        [ :elm_slideshow_layout_get, [ :evas_object ], :string ],
-        # EAPI const Eina_List *elm_slideshow_layouts_get(const Evas_Object *obj);
-        [ :elm_slideshow_layouts_get, [ :evas_object ], :eina_list ],
-        # EAPI void elm_slideshow_cache_before_set(Evas_Object *obj, int count);
-        [ :elm_slideshow_cache_before_set, [ :evas_object, :int ], :void ],
+        [ :elm_slideshow_item_current_get, [ :pointer ], :elm_object_item ],
         # EAPI int elm_slideshow_cache_before_get(const Evas_Object *obj);
-        [ :elm_slideshow_cache_before_get, [ :evas_object ], :int ],
-        # EAPI void elm_slideshow_cache_after_set(Evas_Object *obj, int count);
-        [ :elm_slideshow_cache_after_set, [ :evas_object, :int ], :void ],
+        [ :elm_slideshow_cache_before_get, [ :pointer ], :int ],
+        # EAPI void elm_slideshow_cache_before_set(Evas_Object *obj, int count);
+        [ :elm_slideshow_cache_before_set, [ :pointer, :int ], :void ],
         # EAPI int elm_slideshow_cache_after_get(const Evas_Object *obj);
-        [ :elm_slideshow_cache_after_get, [ :evas_object ], :int ],
+        [ :elm_slideshow_cache_after_get, [ :pointer ], :int ],
+        # EAPI void elm_slideshow_cache_after_set(Evas_Object *obj, int count);
+        [ :elm_slideshow_cache_after_set, [ :pointer, :int ], :void ],
+        # EAPI Elm_Object_Item *elm_slideshow_item_nth_get(const Evas_Object *obj, unsigned int nth);
+        [ :elm_slideshow_item_nth_get, [ :pointer, :uint ], :elm_object_item ],
         # EAPI unsigned int elm_slideshow_count_get(const Evas_Object *obj);
-        [ :elm_slideshow_count_get, [ :evas_object ], :uint ],
+        [ :elm_slideshow_count_get, [ :pointer ], :uint ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_spinner.rb b/lib/efl/native/elm/elm_spinner.rb
index 9877f01..08b0502 100644
--- a/lib/efl/native/elm/elm_spinner.rb
+++ b/lib/efl/native/elm/elm_spinner.rb
@@ -24,45 +24,49 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
-        [ :elm_spinner_add, [ :evas_object ], :evas_object ],
+        [ :elm_spinner_add, [ :pointer ], :pointer ],
+        # EAPI void elm_spinner_special_value_del(Evas_Object *obj, double value);
+        [ :elm_spinner_special_value_del, [ :pointer, :double ], :void ],
+        # EAPI const char *elm_spinner_special_value_get(Evas_Object *obj, double value);
+        [ :elm_spinner_special_value_get, [ :pointer, :double ], :string ],
         # EAPI void elm_spinner_label_format_set(Evas_Object *obj, const char *fmt);
-        [ :elm_spinner_label_format_set, [ :evas_object, :string ], :void ],
+        [ :elm_spinner_label_format_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_spinner_label_format_get(const Evas_Object *obj);
-        [ :elm_spinner_label_format_get, [ :evas_object ], :string ],
+        [ :elm_spinner_label_format_get, [ :pointer ], :string ],
         # EAPI void elm_spinner_min_max_set(Evas_Object *obj, double min, double max);
-        [ :elm_spinner_min_max_set, [ :evas_object, :double, :double ], :void ],
+        [ :elm_spinner_min_max_set, [ :pointer, :double, :double ], :void ],
         # EAPI void elm_spinner_min_max_get(const Evas_Object *obj, double *min, double *max);
-        [ :elm_spinner_min_max_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_spinner_min_max_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_spinner_step_set(Evas_Object *obj, double step);
-        [ :elm_spinner_step_set, [ :evas_object, :double ], :void ],
+        [ :elm_spinner_step_set, [ :pointer, :double ], :void ],
         # EAPI double elm_spinner_step_get(const Evas_Object *obj);
-        [ :elm_spinner_step_get, [ :evas_object ], :double ],
+        [ :elm_spinner_step_get, [ :pointer ], :double ],
         # EAPI void elm_spinner_value_set(Evas_Object *obj, double val);
-        [ :elm_spinner_value_set, [ :evas_object, :double ], :void ],
+        [ :elm_spinner_value_set, [ :pointer, :double ], :void ],
         # EAPI double elm_spinner_value_get(const Evas_Object *obj);
-        [ :elm_spinner_value_get, [ :evas_object ], :double ],
+        [ :elm_spinner_value_get, [ :pointer ], :double ],
         # EAPI void elm_spinner_wrap_set(Evas_Object *obj, Eina_Bool wrap);
-        [ :elm_spinner_wrap_set, [ :evas_object, :bool ], :void ],
+        [ :elm_spinner_wrap_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_spinner_wrap_get(const Evas_Object *obj);
-        [ :elm_spinner_wrap_get, [ :evas_object ], :bool ],
+        [ :elm_spinner_wrap_get, [ :pointer ], :bool ],
+        # EAPI void elm_spinner_special_value_add(Evas_Object *obj, double value, const char *label);
+        [ :elm_spinner_special_value_add, [ :pointer, :double, :string ], :void ],
         # EAPI void elm_spinner_editable_set(Evas_Object *obj, Eina_Bool editable);
-        [ :elm_spinner_editable_set, [ :evas_object, :bool ], :void ],
+        [ :elm_spinner_editable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_spinner_editable_get(const Evas_Object *obj);
-        [ :elm_spinner_editable_get, [ :evas_object ], :bool ],
-        # EAPI void elm_spinner_special_value_add(Evas_Object *obj, double value, const char *label);
-        [ :elm_spinner_special_value_add, [ :evas_object, :double, :string ], :void ],
+        [ :elm_spinner_editable_get, [ :pointer ], :bool ],
         # EAPI void elm_spinner_interval_set(Evas_Object *obj, double interval);
-        [ :elm_spinner_interval_set, [ :evas_object, :double ], :void ],
+        [ :elm_spinner_interval_set, [ :pointer, :double ], :void ],
         # EAPI double elm_spinner_interval_get(const Evas_Object *obj);
-        [ :elm_spinner_interval_get, [ :evas_object ], :double ],
+        [ :elm_spinner_interval_get, [ :pointer ], :double ],
         # EAPI void elm_spinner_base_set(Evas_Object *obj, double base);
-        [ :elm_spinner_base_set, [ :evas_object, :double ], :void ],
+        [ :elm_spinner_base_set, [ :pointer, :double ], :void ],
         # EAPI double elm_spinner_base_get(const Evas_Object *obj);
-        [ :elm_spinner_base_get, [ :evas_object ], :double ],
+        [ :elm_spinner_base_get, [ :pointer ], :double ],
         # EAPI void elm_spinner_round_set(Evas_Object *obj, int rnd);
-        [ :elm_spinner_round_set, [ :evas_object, :int ], :void ],
+        [ :elm_spinner_round_set, [ :pointer, :int ], :void ],
         # EAPI int elm_spinner_round_get(const Evas_Object *obj);
-        [ :elm_spinner_round_get, [ :evas_object ], :int ],
+        [ :elm_spinner_round_get, [ :pointer ], :int ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_store.rb b/lib/efl/native/elm/elm_store.rb
index 3dce9b9..ac3dcc5 100644
--- a/lib/efl/native/elm/elm_store.rb
+++ b/lib/efl/native/elm/elm_store.rb
@@ -47,6 +47,8 @@ module Efl
         typedef :pointer, :elm_store_item_mapping_custom
         #
         # CALLBACKS
+        # typedef struct _Elm_Store_Item_Mapping Elm_Store_Item_Mapping; /**< A basic way of telling Store how to take your return data (string, or something else from your struct) and convert it into something genlist can use */typedef struct _Elm_Store_Item_Mapping_Empty Elm_Store_Item_Mapping_Empty; /**< An empty piece of mapping information. Useful for String labels as they get used directly */
+        # FIXME
         # typedef Eina_Bool (*Elm_Store_Item_List_Cb) (void *data, Elm_Store_Item_Info *info);
         callback :elm_store_item_list_cb, [ :pointer, :elm_store_item_info ], :bool
         # typedef void (*Elm_Store_Item_Fetch_Cb) (void *data, Elm_Store_Item *sti);
@@ -69,7 +71,7 @@ module Efl
         # EAPI const char *elm_store_item_filesystem_path_get(const Elm_Store_Item *sti);
         [ :elm_store_item_filesystem_path_get, [ :elm_store_item ], :string ],
         # EAPI void elm_store_target_genlist_set(Elm_Store *st, Evas_Object *obj);
-        [ :elm_store_target_genlist_set, [ :elm_store, :evas_object ], :void ],
+        [ :elm_store_target_genlist_set, [ :elm_store, :pointer ], :void ],
         # EAPI void elm_store_cache_set(Elm_Store *st, int max);
         [ :elm_store_cache_set, [ :elm_store, :int ], :void ],
         # EAPI int elm_store_cache_get(const Elm_Store *st);
diff --git a/lib/efl/native/elm/elm_table.rb b/lib/efl/native/elm/elm_table.rb
index 63ed900..3b2a456 100644
--- a/lib/efl/native/elm/elm_table.rb
+++ b/lib/efl/native/elm/elm_table.rb
@@ -24,25 +24,27 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_table_add(Evas_Object *parent);
-        [ :elm_table_add, [ :evas_object ], :evas_object ],
+        [ :elm_table_add, [ :pointer ], :pointer ],
         # EAPI void elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_table_homogeneous_set, [ :evas_object, :bool ], :void ],
+        [ :elm_table_homogeneous_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_table_homogeneous_get(const Evas_Object *obj);
-        [ :elm_table_homogeneous_get, [ :evas_object ], :bool ],
+        [ :elm_table_homogeneous_get, [ :pointer ], :bool ],
         # EAPI void elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :elm_table_padding_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_table_padding_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_table_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :elm_table_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
-        # EAPI void elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
-        [ :elm_table_pack, [ :evas_object, :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_table_padding_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int col, int row, int colspan, int rowspan);
+        [ :elm_table_pack, [ :pointer, :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_table_unpack(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_table_unpack, [ :evas_object, :evas_object ], :void ],
+        [ :elm_table_unpack, [ :pointer, :pointer ], :void ],
+        # EAPI void elm_table_pack_set(Evas_Object *subobj, int col, int row, int colspan, int rowspan);
+        [ :elm_table_pack_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        # EAPI void elm_table_pack_get(Evas_Object *subobj, int *col, int *row, int *colspan, int *rowspan);
+        [ :elm_table_pack_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_table_clear(Evas_Object *obj, Eina_Bool clear);
-        [ :elm_table_clear, [ :evas_object, :bool ], :void ],
-        # EAPI void elm_table_pack_set(Evas_Object *subobj, int x, int y, int w, int h);
-        [ :elm_table_pack_set, [ :evas_object, :int, :int, :int, :int ], :void ],
-        # EAPI void elm_table_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h);
-        [ :elm_table_pack_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_table_clear, [ :pointer, :bool ], :void ],
+        # EAPI Evas_Object *elm_table_child_get(const Evas_Object *obj, int col, int row);
+        [ :elm_table_child_get, [ :pointer, :int, :int ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_theme.rb b/lib/efl/native/elm/elm_theme.rb
index fc35d72..c68f21d 100644
--- a/lib/efl/native/elm/elm_theme.rb
+++ b/lib/efl/native/elm/elm_theme.rb
@@ -43,12 +43,20 @@ module Efl
         [ :elm_theme_overlay_add, [ :elm_theme, :string ], :void ],
         # EAPI void elm_theme_overlay_del(Elm_Theme *th, const char *item);
         [ :elm_theme_overlay_del, [ :elm_theme, :string ], :void ],
+        # EAPI void elm_theme_overlay_mmap_add(Elm_Theme *th, const Eina_File *f);
+        [ :elm_theme_overlay_mmap_add, [ :elm_theme, :eina_file ], :void ],
+        # EAPI void elm_theme_overlay_mmap_del(Elm_Theme *th, const Eina_File *f);
+        [ :elm_theme_overlay_mmap_del, [ :elm_theme, :eina_file ], :void ],
         # EAPI const Eina_List *elm_theme_overlay_list_get(const Elm_Theme *th);
         [ :elm_theme_overlay_list_get, [ :elm_theme ], :eina_list ],
         # EAPI void elm_theme_extension_add(Elm_Theme *th, const char *item);
         [ :elm_theme_extension_add, [ :elm_theme, :string ], :void ],
         # EAPI void elm_theme_extension_del(Elm_Theme *th, const char *item);
         [ :elm_theme_extension_del, [ :elm_theme, :string ], :void ],
+        # EAPI void elm_theme_extension_mmap_add(Elm_Theme *th, const Eina_File *f);
+        [ :elm_theme_extension_mmap_add, [ :elm_theme, :eina_file ], :void ],
+        # EAPI void elm_theme_extension_mmap_del(Elm_Theme *th, const Eina_File *f);
+        [ :elm_theme_extension_mmap_del, [ :elm_theme, :eina_file ], :void ],
         # EAPI const Eina_List *elm_theme_extension_list_get(const Elm_Theme *th);
         [ :elm_theme_extension_list_get, [ :elm_theme ], :eina_list ],
         # EAPI void elm_theme_set(Elm_Theme *th, const char *theme);
@@ -68,11 +76,19 @@ module Efl
         # EAPI void elm_theme_name_available_list_free(Eina_List *list);
         [ :elm_theme_name_available_list_free, [ :eina_list ], :void ],
         # EAPI void elm_object_theme_set(Evas_Object *obj, Elm_Theme *th);
-        [ :elm_object_theme_set, [ :evas_object, :elm_theme ], :void ],
+        [ :elm_object_theme_set, [ :pointer, :elm_theme ], :void ],
         # EAPI Elm_Theme *elm_object_theme_get(const Evas_Object *obj);
-        [ :elm_object_theme_get, [ :evas_object ], :elm_theme ],
+        [ :elm_object_theme_get, [ :pointer ], :elm_theme ],
         # EAPI const char *elm_theme_data_get(Elm_Theme *th, const char *key);
         [ :elm_theme_data_get, [ :elm_theme, :string ], :string ],
+        # EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group);
+        [ :elm_theme_group_path_find, [ :elm_theme, :string ], :string ],
+        # EAPI Eina_List *elm_theme_group_base_list(Elm_Theme *th, const char *base);
+        [ :elm_theme_group_base_list, [ :elm_theme, :string ], :eina_list ],
+        # EAPI const char *elm_theme_system_dir_get(void);
+        [ :elm_theme_system_dir_get, [  ], :string ],
+        # EAPI const char *elm_theme_user_dir_get(void);
+        [ :elm_theme_user_dir_get, [  ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_thumb.rb b/lib/efl/native/elm/elm_thumb.rb
index ee5483a..441fb29 100644
--- a/lib/efl/native/elm/elm_thumb.rb
+++ b/lib/efl/native/elm/elm_thumb.rb
@@ -28,28 +28,60 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void *elm_thumb_ethumb_client_get(void);
+        [ :elm_thumb_ethumb_client_get, [  ], :pointer ],
+        # EAPI Eina_Bool elm_thumb_ethumb_client_connected_get(void);
+        [ :elm_thumb_ethumb_client_connected_get, [  ], :bool ],
         # EAPI Evas_Object *elm_thumb_add(Evas_Object *parent);
-        [ :elm_thumb_add, [ :evas_object ], :evas_object ],
+        [ :elm_thumb_add, [ :pointer ], :pointer ],
         # EAPI void elm_thumb_reload(Evas_Object *obj);
-        [ :elm_thumb_reload, [ :evas_object ], :void ],
+        [ :elm_thumb_reload, [ :pointer ], :void ],
         # EAPI void elm_thumb_file_set(Evas_Object *obj, const char *file, const char *key);
-        [ :elm_thumb_file_set, [ :evas_object, :string, :string ], :void ],
+        [ :elm_thumb_file_set, [ :pointer, :string, :string ], :void ],
         # EAPI void elm_thumb_file_get(const Evas_Object *obj, const char **file, const char **key);
-        [ :elm_thumb_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_thumb_file_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_thumb_path_get(const Evas_Object *obj, const char **file, const char **key);
-        [ :elm_thumb_path_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_thumb_path_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_thumb_aspect_set(Evas_Object *obj, Ethumb_Thumb_Aspect aspect);
+        [ :elm_thumb_aspect_set, [ :pointer, :ethumb_thumb_aspect ], :void ],
+        # EAPI Ethumb_Thumb_Aspect elm_thumb_aspect_get(const Evas_Object *obj);
+        [ :elm_thumb_aspect_get, [ :pointer ], :ethumb_thumb_aspect ],
+        # EAPI void elm_thumb_fdo_size_set(Evas_Object *obj, Ethumb_Thumb_FDO_Size size);
+        [ :elm_thumb_fdo_size_set, [ :pointer, :ethumb_thumb_fdo_size ], :void ],
+        # EAPI Ethumb_Thumb_FDO_Size elm_thumb_fdo_size_get(const Evas_Object *obj);
+        [ :elm_thumb_fdo_size_get, [ :pointer ], :ethumb_thumb_fdo_size ],
+        # EAPI void elm_thumb_format_set(Evas_Object *obj, Ethumb_Thumb_Format format);
+        [ :elm_thumb_format_set, [ :pointer, :ethumb_thumb_format ], :void ],
+        # EAPI Ethumb_Thumb_Format elm_thumb_format_get(const Evas_Object *obj);
+        [ :elm_thumb_format_get, [ :pointer ], :ethumb_thumb_format ],
+        # EAPI void elm_thumb_orientation_set(Evas_Object *obj, Ethumb_Thumb_Orientation orient);
+        [ :elm_thumb_orientation_set, [ :pointer, :ethumb_thumb_orientation ], :void ],
+        # EAPI Ethumb_Thumb_Orientation elm_thumb_orientation_get(const Evas_Object *obj);
+        [ :elm_thumb_orientation_get, [ :pointer ], :ethumb_thumb_orientation ],
+        # EAPI void elm_thumb_size_set(Evas_Object *obj, int tw, int th);
+        [ :elm_thumb_size_set, [ :pointer, :int, :int ], :void ],
+        # EAPI void elm_thumb_size_get(const Evas_Object *obj, int *tw, int *th);
+        [ :elm_thumb_size_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_thumb_crop_align_set(Evas_Object *obj, double cropx, double cropy);
+        [ :elm_thumb_crop_align_set, [ :pointer, :double, :double ], :void ],
+        # EAPI void elm_thumb_crop_align_get(const Evas_Object *obj, double *cropx, double *cropy);
+        [ :elm_thumb_crop_align_get, [ :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_thumb_compress_set(Evas_Object *obj, int compress);
+        [ :elm_thumb_compress_set, [ :pointer, :int ], :void ],
+        # EAPI void elm_thumb_compress_get(const Evas_Object *obj, int *compress);
+        [ :elm_thumb_compress_get, [ :pointer, :pointer ], :void ],
+        # EAPI void elm_thumb_quality_set(Evas_Object *obj, int quality);
+        [ :elm_thumb_quality_set, [ :pointer, :int ], :void ],
+        # EAPI void elm_thumb_quality_get(const Evas_Object *obj, int *quality);
+        [ :elm_thumb_quality_get, [ :pointer, :pointer ], :void ],
         # EAPI void elm_thumb_animate_set(Evas_Object *obj, Elm_Thumb_Animation_Setting s);
-        [ :elm_thumb_animate_set, [ :evas_object, :elm_thumb_animation_setting ], :void ],
+        [ :elm_thumb_animate_set, [ :pointer, :elm_thumb_animation_setting ], :void ],
         # EAPI Elm_Thumb_Animation_Setting elm_thumb_animate_get(const Evas_Object *obj);
-        [ :elm_thumb_animate_get, [ :evas_object ], :elm_thumb_animation_setting ],
-        # EAPI void *elm_thumb_ethumb_client_get(void);
-        [ :elm_thumb_ethumb_client_get, [  ], :pointer ],
-        # EAPI Eina_Bool elm_thumb_ethumb_client_connected_get(void);
-        [ :elm_thumb_ethumb_client_connected_get, [  ], :bool ],
+        [ :elm_thumb_animate_get, [ :pointer ], :elm_thumb_animation_setting ],
         # EAPI Eina_Bool elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit);
-        [ :elm_thumb_editable_set, [ :evas_object, :bool ], :bool ],
+        [ :elm_thumb_editable_set, [ :pointer, :bool ], :bool ],
         # EAPI Eina_Bool elm_thumb_editable_get(const Evas_Object *obj);
-        [ :elm_thumb_editable_get, [ :evas_object ], :bool ],
+        [ :elm_thumb_editable_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_toolbar.rb b/lib/efl/native/elm/elm_toolbar.rb
index cf3b710..205fda8 100644
--- a/lib/efl/native/elm/elm_toolbar.rb
+++ b/lib/efl/native/elm/elm_toolbar.rb
@@ -26,6 +26,9 @@ module Efl
         # typedef enum {...} Elm_Toolbar_Shrink_Mode;
         enum :elm_toolbar_shrink_mode, [ :elm_toolbar_shrink_none, :elm_toolbar_shrink_hide, :elm_toolbar_shrink_scroll, :elm_toolbar_shrink_menu,
             :elm_toolbar_shrink_expand, :elm_toolbar_shrink_last ]
+        # typedef enum {...} Elm_Toolbar_Item_Scrollto_Type;
+        enum :elm_toolbar_item_scrollto_type, [ :elm_toolbar_item_scrollto_none, 0, :elm_toolbar_item_scrollto_in, (1<<0),
+            :elm_toolbar_item_scrollto_first, (1<<1), :elm_toolbar_item_scrollto_middle, (1<<2), :elm_toolbar_item_scrollto_last, (1<<3) ]
         #
         # TYPEDEFS
         # typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State;
@@ -33,28 +36,6 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
-        # EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
-        [ :elm_toolbar_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
-        [ :elm_toolbar_icon_size_set, [ :evas_object, :int ], :void ],
-        # EAPI int elm_toolbar_icon_size_get(const Evas_Object *obj);
-        [ :elm_toolbar_icon_size_get, [ :evas_object ], :int ],
-        # EAPI void elm_toolbar_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
-        [ :elm_toolbar_icon_order_lookup_set, [ :evas_object, :elm_icon_lookup_order ], :void ],
-        # EAPI Elm_Icon_Lookup_Order elm_toolbar_icon_order_lookup_get(const Evas_Object *obj);
-        [ :elm_toolbar_icon_order_lookup_get, [ :evas_object ], :elm_icon_lookup_order ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_append, [ :evas_object, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_prepend, [ :evas_object, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_insert_before, [ :evas_object, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
-        [ :elm_toolbar_item_insert_after, [ :evas_object, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_toolbar_first_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_first_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_toolbar_last_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_last_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_toolbar_item_next_get(const Elm_Object_Item *it);
         [ :elm_toolbar_item_next_get, [ :elm_object_item ], :elm_object_item ],
         # EAPI Elm_Object_Item *elm_toolbar_item_prev_get(const Elm_Object_Item *it);
@@ -63,24 +44,18 @@ module Efl
         [ :elm_toolbar_item_priority_set, [ :elm_object_item, :int ], :void ],
         # EAPI int elm_toolbar_item_priority_get(const Elm_Object_Item *it);
         [ :elm_toolbar_item_priority_get, [ :elm_object_item ], :int ],
-        # EAPI Elm_Object_Item *elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label);
-        [ :elm_toolbar_item_find_by_label, [ :evas_object, :string ], :elm_object_item ],
         # EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Object_Item *it);
         [ :elm_toolbar_item_selected_get, [ :elm_object_item ], :bool ],
         # EAPI void elm_toolbar_item_selected_set(Elm_Object_Item *it, Eina_Bool selected);
         [ :elm_toolbar_item_selected_set, [ :elm_object_item, :bool ], :void ],
-        # EAPI Elm_Object_Item *elm_toolbar_selected_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_selected_item_get, [ :evas_object ], :elm_object_item ],
-        # EAPI Elm_Object_Item *elm_toolbar_more_item_get(const Evas_Object *obj);
-        [ :elm_toolbar_more_item_get, [ :evas_object ], :elm_object_item ],
         # EAPI void elm_toolbar_item_icon_set(Elm_Object_Item *it, const char *icon);
         [ :elm_toolbar_item_icon_set, [ :elm_object_item, :string ], :void ],
         # EAPI const char *elm_toolbar_item_icon_get(const Elm_Object_Item *it);
         [ :elm_toolbar_item_icon_get, [ :elm_object_item ], :string ],
         # EAPI Evas_Object *elm_toolbar_item_object_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_object_get, [ :elm_object_item ], :evas_object ],
+        [ :elm_toolbar_item_object_get, [ :elm_object_item ], :pointer ],
         # EAPI Evas_Object *elm_toolbar_item_icon_object_get(Elm_Object_Item *it);
-        [ :elm_toolbar_item_icon_object_get, [ :elm_object_item ], :evas_object ],
+        [ :elm_toolbar_item_icon_object_get, [ :elm_object_item ], :pointer ],
         # EAPI Eina_Bool elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t size, const char *format, const char *key);
         [ :elm_toolbar_item_icon_memfile_set, [ :elm_object_item, :pointer, :ulong, :string, :string ], :bool ],
         # EAPI Eina_Bool elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char *key);
@@ -89,26 +64,10 @@ module Efl
         [ :elm_toolbar_item_separator_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Object_Item *it);
         [ :elm_toolbar_item_separator_get, [ :elm_object_item ], :bool ],
-        # EAPI void elm_toolbar_shrink_mode_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
-        [ :elm_toolbar_shrink_mode_set, [ :evas_object, :elm_toolbar_shrink_mode ], :void ],
-        # EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_shrink_mode_get(const Evas_Object *obj);
-        [ :elm_toolbar_shrink_mode_get, [ :evas_object ], :elm_toolbar_shrink_mode ],
-        # EAPI void elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
-        [ :elm_toolbar_homogeneous_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_toolbar_homogeneous_get(const Evas_Object *obj);
-        [ :elm_toolbar_homogeneous_get, [ :evas_object ], :bool ],
-        # EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
-        [ :elm_toolbar_menu_parent_set, [ :evas_object, :evas_object ], :void ],
-        # EAPI Evas_Object *elm_toolbar_menu_parent_get(const Evas_Object *obj);
-        [ :elm_toolbar_menu_parent_get, [ :evas_object ], :evas_object ],
-        # EAPI void elm_toolbar_align_set(Evas_Object *obj, double align);
-        [ :elm_toolbar_align_set, [ :evas_object, :double ], :void ],
-        # EAPI double elm_toolbar_align_get(const Evas_Object *obj);
-        [ :elm_toolbar_align_get, [ :evas_object ], :double ],
         # EAPI void elm_toolbar_item_menu_set(Elm_Object_Item *it, Eina_Bool menu);
         [ :elm_toolbar_item_menu_set, [ :elm_object_item, :bool ], :void ],
         # EAPI Evas_Object *elm_toolbar_item_menu_get(const Elm_Object_Item *it);
-        [ :elm_toolbar_item_menu_get, [ :elm_object_item ], :evas_object ],
+        [ :elm_toolbar_item_menu_get, [ :elm_object_item ], :pointer ],
         # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
         [ :elm_toolbar_item_state_add, [ :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_toolbar_item_state ],
         # EAPI Eina_Bool elm_toolbar_item_state_del(Elm_Object_Item *it, Elm_Toolbar_Item_State *state);
@@ -123,20 +82,76 @@ module Efl
         [ :elm_toolbar_item_state_next, [ :elm_object_item ], :elm_toolbar_item_state ],
         # EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_prev(Elm_Object_Item *it);
         [ :elm_toolbar_item_state_prev, [ :elm_object_item ], :elm_toolbar_item_state ],
+        # EAPI void elm_toolbar_item_show(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type type);
+        [ :elm_toolbar_item_show, [ :elm_object_item, :elm_toolbar_item_scrollto_type ], :void ],
+        # EAPI void elm_toolbar_item_bring_in(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type type);
+        [ :elm_toolbar_item_bring_in, [ :elm_object_item, :elm_toolbar_item_scrollto_type ], :void ],
+        # EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
+        [ :elm_toolbar_add, [ :pointer ], :pointer ],
+        # EAPI void elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
+        [ :elm_toolbar_icon_size_set, [ :pointer, :int ], :void ],
+        # EAPI int elm_toolbar_icon_size_get(const Evas_Object *obj);
+        [ :elm_toolbar_icon_size_get, [ :pointer ], :int ],
+        # EAPI void elm_toolbar_icon_order_lookup_set(Evas_Object *obj, Elm_Icon_Lookup_Order order);
+        [ :elm_toolbar_icon_order_lookup_set, [ :pointer, :elm_icon_lookup_order ], :void ],
+        # EAPI Elm_Icon_Lookup_Order elm_toolbar_icon_order_lookup_get(const Evas_Object *obj);
+        [ :elm_toolbar_icon_order_lookup_get, [ :pointer ], :elm_icon_lookup_order ],
+        # EAPI Elm_Object_Item *elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_toolbar_item_append, [ :pointer, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_toolbar_item_prepend, [ :pointer, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_toolbar_item_insert_before, [ :pointer, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char *icon, const char *label, Evas_Smart_Cb func, const void *data);
+        [ :elm_toolbar_item_insert_after, [ :pointer, :elm_object_item, :string, :string, :evas_smart_cb, :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_first_item_get(const Evas_Object *obj);
+        [ :elm_toolbar_first_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_last_item_get(const Evas_Object *obj);
+        [ :elm_toolbar_last_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label);
+        [ :elm_toolbar_item_find_by_label, [ :pointer, :string ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_selected_item_get(const Evas_Object *obj);
+        [ :elm_toolbar_selected_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI Elm_Object_Item *elm_toolbar_more_item_get(const Evas_Object *obj);
+        [ :elm_toolbar_more_item_get, [ :pointer ], :elm_object_item ],
+        # EAPI void elm_toolbar_shrink_mode_set(Evas_Object *obj, Elm_Toolbar_Shrink_Mode shrink_mode);
+        [ :elm_toolbar_shrink_mode_set, [ :pointer, :elm_toolbar_shrink_mode ], :void ],
+        # EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_shrink_mode_get(const Evas_Object *obj);
+        [ :elm_toolbar_shrink_mode_get, [ :pointer ], :elm_toolbar_shrink_mode ],
+        # EAPI void elm_toolbar_transverse_expanded_set(Evas_Object *obj, Eina_Bool transverse_expanded);
+        [ :elm_toolbar_transverse_expanded_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_toolbar_transverse_expanded_get(const Evas_Object *obj);
+        [ :elm_toolbar_transverse_expanded_get, [ :pointer ], :bool ],
+        # EAPI void elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous);
+        [ :elm_toolbar_homogeneous_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_toolbar_homogeneous_get(const Evas_Object *obj);
+        [ :elm_toolbar_homogeneous_get, [ :pointer ], :bool ],
+        # EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
+        [ :elm_toolbar_menu_parent_set, [ :pointer, :pointer ], :void ],
+        # EAPI Evas_Object *elm_toolbar_menu_parent_get(const Evas_Object *obj);
+        [ :elm_toolbar_menu_parent_get, [ :pointer ], :pointer ],
+        # EAPI void elm_toolbar_align_set(Evas_Object *obj, double align);
+        [ :elm_toolbar_align_set, [ :pointer, :double ], :void ],
+        # EAPI double elm_toolbar_align_get(const Evas_Object *obj);
+        [ :elm_toolbar_align_get, [ :pointer ], :double ],
         # EAPI void elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
-        [ :elm_toolbar_horizontal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_toolbar_horizontal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_toolbar_horizontal_get(const Evas_Object *obj);
-        [ :elm_toolbar_horizontal_get, [ :evas_object ], :bool ],
+        [ :elm_toolbar_horizontal_get, [ :pointer ], :bool ],
         # EAPI unsigned int elm_toolbar_items_count(const Evas_Object *obj);
-        [ :elm_toolbar_items_count, [ :evas_object ], :uint ],
+        [ :elm_toolbar_items_count, [ :pointer ], :uint ],
         # EAPI void elm_toolbar_standard_priority_set(Evas_Object *obj, int priority);
-        [ :elm_toolbar_standard_priority_set, [ :evas_object, :int ], :void ],
+        [ :elm_toolbar_standard_priority_set, [ :pointer, :int ], :void ],
         # EAPI int elm_toolbar_standard_priority_get(const Evas_Object *obj);
-        [ :elm_toolbar_standard_priority_get, [ :evas_object ], :int ],
+        [ :elm_toolbar_standard_priority_get, [ :pointer ], :int ],
         # EAPI void elm_toolbar_select_mode_set(Evas_Object *obj, Elm_Object_Select_Mode mode);
-        [ :elm_toolbar_select_mode_set, [ :evas_object, :elm_object_select_mode ], :void ],
+        [ :elm_toolbar_select_mode_set, [ :pointer, :elm_object_select_mode ], :void ],
         # EAPI Elm_Object_Select_Mode elm_toolbar_select_mode_get(const Evas_Object *obj);
-        [ :elm_toolbar_select_mode_get, [ :evas_object ], :elm_object_select_mode ],
+        [ :elm_toolbar_select_mode_get, [ :pointer ], :elm_object_select_mode ],
+        # EAPI void elm_toolbar_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
+        [ :elm_toolbar_reorder_mode_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_toolbar_reorder_mode_get(const Evas_Object *obj);
+        [ :elm_toolbar_reorder_mode_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_tooltip.rb b/lib/efl/native/elm/elm_tooltip.rb
index e349905..a555993 100644
--- a/lib/efl/native/elm/elm_tooltip.rb
+++ b/lib/efl/native/elm/elm_tooltip.rb
@@ -21,34 +21,44 @@ module Efl
         #
         ffi_lib 'elementary.so.1'
         #
+        # ENUMS
+        # typedef enum {...} Elm_Tooltip_Orient;
+        enum :elm_tooltip_orient, [ :elm_tooltip_orient_none, 0, :elm_tooltip_orient_top_left, 1, :elm_tooltip_orient_top, 2,
+            :elm_tooltip_orient_top_right, 3, :elm_tooltip_orient_left, 4, :elm_tooltip_orient_center, 5, :elm_tooltip_orient_right, 6,
+            :elm_tooltip_orient_bottom_left, 7, :elm_tooltip_orient_bottom, 8, :elm_tooltip_orient_bottom_right, 9, :elm_tooltip_orient_last, 10 ]
+        #
         # CALLBACKS
         # typedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip);
-        callback :elm_tooltip_content_cb, [ :pointer, :evas_object, :evas_object ], :evas_object
+        callback :elm_tooltip_content_cb, [ :pointer, :pointer, :pointer ], :pointer
         # typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item);
-        callback :elm_tooltip_item_content_cb, [ :pointer, :evas_object, :evas_object, :pointer ], :evas_object
+        callback :elm_tooltip_item_content_cb, [ :pointer, :pointer, :pointer, :pointer ], :pointer
         #
         # FUNCTIONS
         fcts = [
+        # EAPI void elm_object_tooltip_orient_set(Evas_Object *obj, Elm_Tooltip_Orient orient);
+        [ :elm_object_tooltip_orient_set, [ :pointer, :elm_tooltip_orient ], :void ],
+        # EAPI Elm_Tooltip_Orient elm_object_tooltip_orient_get(const Evas_Object *obj);
+        [ :elm_object_tooltip_orient_get, [ :pointer ], :elm_tooltip_orient ],
         # EAPI void elm_object_tooltip_show(Evas_Object *obj);
-        [ :elm_object_tooltip_show, [ :evas_object ], :void ],
+        [ :elm_object_tooltip_show, [ :pointer ], :void ],
         # EAPI void elm_object_tooltip_hide(Evas_Object *obj);
-        [ :elm_object_tooltip_hide, [ :evas_object ], :void ],
+        [ :elm_object_tooltip_hide, [ :pointer ], :void ],
         # EAPI void elm_object_tooltip_text_set(Evas_Object *obj, const char *text);
-        [ :elm_object_tooltip_text_set, [ :evas_object, :string ], :void ],
+        [ :elm_object_tooltip_text_set, [ :pointer, :string ], :void ],
         # EAPI void elm_object_tooltip_domain_translatable_text_set(Evas_Object *obj, const char *domain, const char *text);
-        [ :elm_object_tooltip_domain_translatable_text_set, [ :evas_object, :string, :string ], :void ],
+        [ :elm_object_tooltip_domain_translatable_text_set, [ :pointer, :string, :string ], :void ],
         # EAPI void elm_object_tooltip_content_cb_set(Evas_Object *obj, Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
-        [ :elm_object_tooltip_content_cb_set, [ :evas_object, :elm_tooltip_content_cb, :pointer, :evas_smart_cb ], :void ],
+        [ :elm_object_tooltip_content_cb_set, [ :pointer, :elm_tooltip_content_cb, :pointer, :evas_smart_cb ], :void ],
         # EAPI void elm_object_tooltip_unset(Evas_Object *obj);
-        [ :elm_object_tooltip_unset, [ :evas_object ], :void ],
+        [ :elm_object_tooltip_unset, [ :pointer ], :void ],
         # EAPI void elm_object_tooltip_style_set(Evas_Object *obj, const char *style);
-        [ :elm_object_tooltip_style_set, [ :evas_object, :string ], :void ],
+        [ :elm_object_tooltip_style_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj);
-        [ :elm_object_tooltip_style_get, [ :evas_object ], :string ],
+        [ :elm_object_tooltip_style_get, [ :pointer ], :string ],
         # EAPI Eina_Bool elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool disable);
-        [ :elm_object_tooltip_window_mode_set, [ :evas_object, :bool ], :bool ],
+        [ :elm_object_tooltip_window_mode_set, [ :pointer, :bool ], :bool ],
         # EAPI Eina_Bool elm_object_tooltip_window_mode_get(const Evas_Object *obj);
-        [ :elm_object_tooltip_window_mode_get, [ :evas_object ], :bool ],
+        [ :elm_object_tooltip_window_mode_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_transit.rb b/lib/efl/native/elm/elm_transit.rb
index 1b7fdc8..66ff8f1 100644
--- a/lib/efl/native/elm/elm_transit.rb
+++ b/lib/efl/native/elm/elm_transit.rb
@@ -24,7 +24,7 @@ module Efl
         # ENUMS
         # typedef enum {...} Elm_Transit_Tween_Mode;
         enum :elm_transit_tween_mode, [ :elm_transit_tween_mode_linear, :elm_transit_tween_mode_sinusoidal, :elm_transit_tween_mode_decelerate,
-            :elm_transit_tween_mode_accelerate ]
+            :elm_transit_tween_mode_accelerate, :elm_transit_tween_mode_divisor_interp, :elm_transit_tween_mode_bounce, :elm_transit_tween_mode_spring ]
         # typedef enum {...} Elm_Transit_Effect_Flip_Axis;
         enum :elm_transit_effect_flip_axis, [ :elm_transit_effect_flip_axis_x, :elm_transit_effect_flip_axis_y ]
         # typedef enum {...} Elm_Transit_Effect_Wipe_Dir;
@@ -58,9 +58,9 @@ module Efl
         # EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect);
         [ :elm_transit_effect_del, [ :elm_transit, :elm_transit_effect_transition_cb, :pointer ], :void ],
         # EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj);
-        [ :elm_transit_object_add, [ :elm_transit, :evas_object ], :void ],
+        [ :elm_transit_object_add, [ :elm_transit, :pointer ], :void ],
         # EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj);
-        [ :elm_transit_object_remove, [ :elm_transit, :evas_object ], :void ],
+        [ :elm_transit_object_remove, [ :elm_transit, :pointer ], :void ],
         # EAPI const Eina_List *elm_transit_objects_get(const Elm_Transit *transit);
         [ :elm_transit_objects_get, [ :elm_transit ], :eina_list ],
         # EAPI void elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_keep);
@@ -85,6 +85,10 @@ module Efl
         [ :elm_transit_tween_mode_set, [ :elm_transit, :elm_transit_tween_mode ], :void ],
         # EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit);
         [ :elm_transit_tween_mode_get, [ :elm_transit ], :elm_transit_tween_mode ],
+        # EAPI void elm_transit_tween_mode_factor_set(Elm_Transit *transit, double v1, double v2);
+        [ :elm_transit_tween_mode_factor_set, [ :elm_transit, :double, :double ], :void ],
+        # EAPI void elm_transit_tween_mode_factor_get(const Elm_Transit *transit, double *v1, double *v2);
+        [ :elm_transit_tween_mode_factor_get, [ :elm_transit, :pointer, :pointer ], :void ],
         # EAPI void elm_transit_duration_set(Elm_Transit *transit, double duration);
         [ :elm_transit_duration_set, [ :elm_transit, :double ], :void ],
         # EAPI double elm_transit_duration_get(const Elm_Transit *transit);
@@ -103,6 +107,8 @@ module Efl
         [ :elm_transit_chain_transit_del, [ :elm_transit, :elm_transit ], :void ],
         # EAPI Eina_List *elm_transit_chain_transits_get(const Elm_Transit *transit);
         [ :elm_transit_chain_transits_get, [ :elm_transit ], :eina_list ],
+        # EAPI void elm_transit_smooth_set(Elm_Transit *transit, Eina_Bool smooth);
+        [ :elm_transit_smooth_set, [ :elm_transit, :bool ], :void ],
         # EAPI Elm_Transit_Effect *elm_transit_effect_resizing_add(Elm_Transit *transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
         [ :elm_transit_effect_resizing_add, [ :elm_transit, :int, :int, :int, :int ], :pointer ],
         # EAPI Elm_Transit_Effect *elm_transit_effect_translation_add(Elm_Transit *transit, Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy);
diff --git a/lib/efl/native/elm/elm_video.rb b/lib/efl/native/elm/elm_video.rb
index d803b70..94f6dd2 100644
--- a/lib/efl/native/elm/elm_video.rb
+++ b/lib/efl/native/elm/elm_video.rb
@@ -24,43 +24,43 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_player_add(Evas_Object *parent);
-        [ :elm_player_add, [ :evas_object ], :evas_object ],
+        [ :elm_player_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *elm_video_add(Evas_Object *parent);
-        [ :elm_video_add, [ :evas_object ], :evas_object ],
+        [ :elm_video_add, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_video_file_set(Evas_Object *video, const char *filename);
-        [ :elm_video_file_set, [ :evas_object, :string ], :bool ],
+        [ :elm_video_file_set, [ :pointer, :string ], :bool ],
         # EAPI Evas_Object *elm_video_emotion_get(const Evas_Object *video);
-        [ :elm_video_emotion_get, [ :evas_object ], :evas_object ],
+        [ :elm_video_emotion_get, [ :pointer ], :pointer ],
         # EAPI void elm_video_play(Evas_Object *video);
-        [ :elm_video_play, [ :evas_object ], :void ],
+        [ :elm_video_play, [ :pointer ], :void ],
         # EAPI void elm_video_pause(Evas_Object *video);
-        [ :elm_video_pause, [ :evas_object ], :void ],
+        [ :elm_video_pause, [ :pointer ], :void ],
         # EAPI void elm_video_stop(Evas_Object *video);
-        [ :elm_video_stop, [ :evas_object ], :void ],
+        [ :elm_video_stop, [ :pointer ], :void ],
         # EAPI Eina_Bool elm_video_is_playing_get(const Evas_Object *video);
-        [ :elm_video_is_playing_get, [ :evas_object ], :bool ],
+        [ :elm_video_is_playing_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_video_is_seekable_get(const Evas_Object *video);
-        [ :elm_video_is_seekable_get, [ :evas_object ], :bool ],
+        [ :elm_video_is_seekable_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_video_audio_mute_get(const Evas_Object *video);
-        [ :elm_video_audio_mute_get, [ :evas_object ], :bool ],
+        [ :elm_video_audio_mute_get, [ :pointer ], :bool ],
         # EAPI void elm_video_audio_mute_set(Evas_Object *video, Eina_Bool mute);
-        [ :elm_video_audio_mute_set, [ :evas_object, :bool ], :void ],
+        [ :elm_video_audio_mute_set, [ :pointer, :bool ], :void ],
         # EAPI double elm_video_audio_level_get(const Evas_Object *video);
-        [ :elm_video_audio_level_get, [ :evas_object ], :double ],
+        [ :elm_video_audio_level_get, [ :pointer ], :double ],
         # EAPI void elm_video_audio_level_set(Evas_Object *video, double volume);
-        [ :elm_video_audio_level_set, [ :evas_object, :double ], :void ],
+        [ :elm_video_audio_level_set, [ :pointer, :double ], :void ],
         # EAPI double elm_video_play_position_get(const Evas_Object *video);
-        [ :elm_video_play_position_get, [ :evas_object ], :double ],
+        [ :elm_video_play_position_get, [ :pointer ], :double ],
         # EAPI void elm_video_play_position_set(Evas_Object *video, double position);
-        [ :elm_video_play_position_set, [ :evas_object, :double ], :void ],
+        [ :elm_video_play_position_set, [ :pointer, :double ], :void ],
         # EAPI double elm_video_play_length_get(const Evas_Object *video);
-        [ :elm_video_play_length_get, [ :evas_object ], :double ],
+        [ :elm_video_play_length_get, [ :pointer ], :double ],
         # EAPI void elm_video_remember_position_set(Evas_Object *video, Eina_Bool remember);
-        [ :elm_video_remember_position_set, [ :evas_object, :bool ], :void ],
+        [ :elm_video_remember_position_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_video_remember_position_get(const Evas_Object *video);
-        [ :elm_video_remember_position_get, [ :evas_object ], :bool ],
+        [ :elm_video_remember_position_get, [ :pointer ], :bool ],
         # EAPI const char *elm_video_title_get(const Evas_Object *video);
-        [ :elm_video_title_get, [ :evas_object ], :string ],
+        [ :elm_video_title_get, [ :pointer ], :string ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_web.rb b/lib/efl/native/elm/elm_web.rb
index 858e77f..5a80cdb 100644
--- a/lib/efl/native/elm/elm_web.rb
+++ b/lib/efl/native/elm/elm_web.rb
@@ -45,118 +45,118 @@ module Efl
         #
         # CALLBACKS
         # typedef Evas_Object *(*Elm_Web_Window_Open) (void *data, Evas_Object *obj, Eina_Bool js, const Elm_Web_Window_Features *window_features);
-        callback :elm_web_window_open_cb, [ :pointer, :evas_object, :bool, :elm_web_window_features ], :evas_object
+        callback :elm_web_window_open_cb, [ :pointer, :pointer, :bool, :elm_web_window_features ], :pointer
         # typedef Evas_Object *(*Elm_Web_Dialog_Alert) (void *data, Evas_Object *obj, const char *message);
-        callback :elm_web_dialog_alert_cb, [ :pointer, :evas_object, :string ], :evas_object
+        callback :elm_web_dialog_alert_cb, [ :pointer, :pointer, :string ], :pointer
         # typedef Evas_Object *(*Elm_Web_Dialog_Confirm) (void *data, Evas_Object *obj, const char *message, Eina_Bool *ret);
-        callback :elm_web_dialog_confirm_cb, [ :pointer, :evas_object, :string, :pointer ], :evas_object
+        callback :elm_web_dialog_confirm_cb, [ :pointer, :pointer, :string, :pointer ], :pointer
         # typedef Evas_Object *(*Elm_Web_Dialog_Prompt) (void *data, Evas_Object *obj, const char *message, const char *def_value, const char **value, Eina_Bool *ret);
-        callback :elm_web_dialog_prompt_cb, [ :pointer, :evas_object, :string, :string, :pointer, :pointer ], :evas_object
+        callback :elm_web_dialog_prompt_cb, [ :pointer, :pointer, :string, :string, :pointer, :pointer ], :pointer
         # typedef Evas_Object *(*Elm_Web_Dialog_File_Selector) (void *data, Evas_Object *obj, Eina_Bool allows_multiple, Eina_List *accept_types, Eina_List **selected, Eina_Bool *ret);
-        callback :elm_web_dialog_file_selector_cb, [ :pointer, :evas_object, :bool, :eina_list, :eina_list, :pointer ], :evas_object
+        callback :elm_web_dialog_file_selector_cb, [ :pointer, :pointer, :bool, :eina_list, :eina_list, :pointer ], :pointer
         # typedef void (*Elm_Web_Console_Message) (void *data, Evas_Object *obj, const char *message, unsigned int line_number, const char *source_id);
-        callback :elm_web_console_message_cb, [ :pointer, :evas_object, :string, :uint, :string ], :void
+        callback :elm_web_console_message_cb, [ :pointer, :pointer, :string, :uint, :string ], :void
         #
         # FUNCTIONS
         fcts = [
         # EAPI Evas_Object *elm_web_add(Evas_Object *parent);
-        [ :elm_web_add, [ :evas_object ], :evas_object ],
-        # EAPI void elm_web_useragent_set(Evas_Object *obj, const char *user_agent);
-        [ :elm_web_useragent_set, [ :evas_object, :string ], :void ],
-        # EAPI const char* elm_web_useragent_get(const Evas_Object *obj);
-        [ :elm_web_useragent_get, [ :evas_object ], :pointer ],
+        [ :elm_web_add, [ :pointer ], :pointer ],
+        # EAPI void elm_web_zoom_mode_set(Evas_Object *obj, Elm_Web_Zoom_Mode mode);
+        [ :elm_web_zoom_mode_set, [ :pointer, :elm_web_zoom_mode ], :void ],
+        # EAPI Elm_Web_Zoom_Mode elm_web_zoom_mode_get(const Evas_Object *obj);
+        [ :elm_web_zoom_mode_get, [ :pointer ], :elm_web_zoom_mode ],
+        # EAPI Eina_Bool elm_web_window_features_property_get(const Elm_Web_Window_Features *wf, Elm_Web_Window_Feature_Flag flag);
+        [ :elm_web_window_features_property_get, [ :elm_web_window_features, :elm_web_window_feature_flag ], :bool ],
+        # EAPI void elm_web_window_features_region_get(const Elm_Web_Window_Features *wf, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+        [ :elm_web_window_features_region_get, [ :elm_web_window_features, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void elm_web_window_features_ref(Elm_Web_Window_Features *wf);
+        [ :elm_web_window_features_ref, [ :elm_web_window_features ], :void ],
+        # EAPI void elm_web_window_features_unref(Elm_Web_Window_Features *wf);
+        [ :elm_web_window_features_unref, [ :elm_web_window_features ], :void ],
         # EAPI Evas_Object *elm_web_webkit_view_get(const Evas_Object *obj);
-        [ :elm_web_webkit_view_get, [ :evas_object ], :evas_object ],
+        [ :elm_web_webkit_view_get, [ :pointer ], :pointer ],
         # EAPI void elm_web_window_create_hook_set(Evas_Object *obj, Elm_Web_Window_Open func, void *data);
-        [ :elm_web_window_create_hook_set, [ :evas_object, :elm_web_window_open_cb, :pointer ], :void ],
+        [ :elm_web_window_create_hook_set, [ :pointer, :elm_web_window_open_cb, :pointer ], :void ],
         # EAPI void elm_web_dialog_alert_hook_set(Evas_Object *obj, Elm_Web_Dialog_Alert func, void *data);
-        [ :elm_web_dialog_alert_hook_set, [ :evas_object, :elm_web_dialog_alert_cb, :pointer ], :void ],
+        [ :elm_web_dialog_alert_hook_set, [ :pointer, :elm_web_dialog_alert_cb, :pointer ], :void ],
         # EAPI void elm_web_dialog_confirm_hook_set(Evas_Object *obj, Elm_Web_Dialog_Confirm func, void *data);
-        [ :elm_web_dialog_confirm_hook_set, [ :evas_object, :elm_web_dialog_confirm_cb, :pointer ], :void ],
+        [ :elm_web_dialog_confirm_hook_set, [ :pointer, :elm_web_dialog_confirm_cb, :pointer ], :void ],
         # EAPI void elm_web_dialog_prompt_hook_set(Evas_Object *obj, Elm_Web_Dialog_Prompt func, void *data);
-        [ :elm_web_dialog_prompt_hook_set, [ :evas_object, :elm_web_dialog_prompt_cb, :pointer ], :void ],
+        [ :elm_web_dialog_prompt_hook_set, [ :pointer, :elm_web_dialog_prompt_cb, :pointer ], :void ],
         # EAPI void elm_web_dialog_file_selector_hook_set(Evas_Object *obj, Elm_Web_Dialog_File_Selector func, void *data);
-        [ :elm_web_dialog_file_selector_hook_set, [ :evas_object, :elm_web_dialog_file_selector_cb, :pointer ], :void ],
+        [ :elm_web_dialog_file_selector_hook_set, [ :pointer, :elm_web_dialog_file_selector_cb, :pointer ], :void ],
         # EAPI void elm_web_console_message_hook_set(Evas_Object *obj, Elm_Web_Console_Message func, void *data);
-        [ :elm_web_console_message_hook_set, [ :evas_object, :elm_web_console_message_cb, :pointer ], :void ],
+        [ :elm_web_console_message_hook_set, [ :pointer, :elm_web_console_message_cb, :pointer ], :void ],
+        # EAPI void elm_web_useragent_set(Evas_Object *obj, const char *user_agent);
+        [ :elm_web_useragent_set, [ :pointer, :string ], :void ],
+        # EAPI const char* elm_web_useragent_get(const Evas_Object *obj);
+        [ :elm_web_useragent_get, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_web_tab_propagate_get(const Evas_Object *obj);
-        [ :elm_web_tab_propagate_get, [ :evas_object ], :bool ],
+        [ :elm_web_tab_propagate_get, [ :pointer ], :bool ],
         # EAPI void elm_web_tab_propagate_set(Evas_Object *obj, Eina_Bool propagate);
-        [ :elm_web_tab_propagate_set, [ :evas_object, :bool ], :void ],
-        # EAPI Eina_Bool elm_web_uri_set(Evas_Object *obj, const char *uri);
-        [ :elm_web_uri_set, [ :evas_object, :string ], :bool ],
-        # EAPI const char *elm_web_uri_get(const Evas_Object *obj);
-        [ :elm_web_uri_get, [ :evas_object ], :string ],
+        [ :elm_web_tab_propagate_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_web_url_set(Evas_Object *obj, const char *url);
+        [ :elm_web_url_set, [ :pointer, :string ], :bool ],
+        # EAPI const char *elm_web_url_get(const Evas_Object *obj);
+        [ :elm_web_url_get, [ :pointer ], :string ],
         # EAPI const char *elm_web_title_get(const Evas_Object *obj);
-        [ :elm_web_title_get, [ :evas_object ], :string ],
+        [ :elm_web_title_get, [ :pointer ], :string ],
         # EAPI void elm_web_bg_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :elm_web_bg_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_web_bg_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_web_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :elm_web_bg_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_web_bg_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI const char *elm_web_selection_get(const Evas_Object *obj);
-        [ :elm_web_selection_get, [ :evas_object ], :string ],
+        [ :elm_web_selection_get, [ :pointer ], :string ],
         # EAPI void elm_web_popup_selected_set(Evas_Object *obj, int index);
-        [ :elm_web_popup_selected_set, [ :evas_object, :int ], :void ],
+        [ :elm_web_popup_selected_set, [ :pointer, :int ], :void ],
         # EAPI Eina_Bool elm_web_popup_destroy(Evas_Object *obj);
-        [ :elm_web_popup_destroy, [ :evas_object ], :bool ],
+        [ :elm_web_popup_destroy, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_text_search(const Evas_Object *obj, const char *string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap);
-        [ :elm_web_text_search, [ :evas_object, :string, :bool, :bool, :bool ], :bool ],
+        [ :elm_web_text_search, [ :pointer, :string, :bool, :bool, :bool ], :bool ],
         # EAPI unsigned int elm_web_text_matches_mark(Evas_Object *obj, const char *string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit);
-        [ :elm_web_text_matches_mark, [ :evas_object, :string, :bool, :bool, :uint ], :uint ],
+        [ :elm_web_text_matches_mark, [ :pointer, :string, :bool, :bool, :uint ], :uint ],
         # EAPI Eina_Bool elm_web_text_matches_unmark_all(Evas_Object *obj);
-        [ :elm_web_text_matches_unmark_all, [ :evas_object ], :bool ],
+        [ :elm_web_text_matches_unmark_all, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_text_matches_highlight_set(Evas_Object *obj, Eina_Bool highlight);
-        [ :elm_web_text_matches_highlight_set, [ :evas_object, :bool ], :bool ],
+        [ :elm_web_text_matches_highlight_set, [ :pointer, :bool ], :bool ],
         # EAPI Eina_Bool elm_web_text_matches_highlight_get(const Evas_Object *obj);
-        [ :elm_web_text_matches_highlight_get, [ :evas_object ], :bool ],
+        [ :elm_web_text_matches_highlight_get, [ :pointer ], :bool ],
         # EAPI double elm_web_load_progress_get(const Evas_Object *obj);
-        [ :elm_web_load_progress_get, [ :evas_object ], :double ],
+        [ :elm_web_load_progress_get, [ :pointer ], :double ],
         # EAPI Eina_Bool elm_web_stop(Evas_Object *obj);
-        [ :elm_web_stop, [ :evas_object ], :bool ],
+        [ :elm_web_stop, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_reload(Evas_Object *obj);
-        [ :elm_web_reload, [ :evas_object ], :bool ],
+        [ :elm_web_reload, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_reload_full(Evas_Object *obj);
-        [ :elm_web_reload_full, [ :evas_object ], :bool ],
+        [ :elm_web_reload_full, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_back(Evas_Object *obj);
-        [ :elm_web_back, [ :evas_object ], :bool ],
+        [ :elm_web_back, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_forward(Evas_Object *obj);
-        [ :elm_web_forward, [ :evas_object ], :bool ],
+        [ :elm_web_forward, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_navigate(Evas_Object *obj, int steps);
-        [ :elm_web_navigate, [ :evas_object, :int ], :bool ],
+        [ :elm_web_navigate, [ :pointer, :int ], :bool ],
         # EAPI Eina_Bool elm_web_back_possible_get(Evas_Object *obj);
-        [ :elm_web_back_possible_get, [ :evas_object ], :bool ],
+        [ :elm_web_back_possible_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_forward_possible_get(Evas_Object *obj);
-        [ :elm_web_forward_possible_get, [ :evas_object ], :bool ],
+        [ :elm_web_forward_possible_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool elm_web_navigate_possible_get(Evas_Object *obj, int steps);
-        [ :elm_web_navigate_possible_get, [ :evas_object, :int ], :bool ],
+        [ :elm_web_navigate_possible_get, [ :pointer, :int ], :bool ],
         # EAPI Eina_Bool elm_web_history_enabled_get(const Evas_Object *obj);
-        [ :elm_web_history_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_web_history_enabled_get, [ :pointer ], :bool ],
         # EAPI void elm_web_history_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_web_history_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_web_history_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_web_zoom_set(Evas_Object *obj, double zoom);
-        [ :elm_web_zoom_set, [ :evas_object, :double ], :void ],
+        [ :elm_web_zoom_set, [ :pointer, :double ], :void ],
         # EAPI double elm_web_zoom_get(const Evas_Object *obj);
-        [ :elm_web_zoom_get, [ :evas_object ], :double ],
-        # EAPI void elm_web_zoom_mode_set(Evas_Object *obj, Elm_Web_Zoom_Mode mode);
-        [ :elm_web_zoom_mode_set, [ :evas_object, :elm_web_zoom_mode ], :void ],
-        # EAPI Elm_Web_Zoom_Mode elm_web_zoom_mode_get(const Evas_Object *obj);
-        [ :elm_web_zoom_mode_get, [ :evas_object ], :elm_web_zoom_mode ],
+        [ :elm_web_zoom_get, [ :pointer ], :double ],
         # EAPI void elm_web_region_show(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_web_region_show, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_web_region_show, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_web_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
-        [ :elm_web_region_bring_in, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :elm_web_region_bring_in, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void elm_web_inwin_mode_set(Evas_Object *obj, Eina_Bool value);
-        [ :elm_web_inwin_mode_set, [ :evas_object, :bool ], :void ],
+        [ :elm_web_inwin_mode_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_web_inwin_mode_get(const Evas_Object *obj);
-        [ :elm_web_inwin_mode_get, [ :evas_object ], :bool ],
-        # EAPI void elm_web_window_features_ref(Elm_Web_Window_Features *wf);
-        [ :elm_web_window_features_ref, [ :elm_web_window_features ], :void ],
-        # EAPI void elm_web_window_features_unref(Elm_Web_Window_Features *wf);
-        [ :elm_web_window_features_unref, [ :elm_web_window_features ], :void ],
-        # EAPI Eina_Bool elm_web_window_features_property_get(const Elm_Web_Window_Features *wf, Elm_Web_Window_Feature_Flag flag);
-        [ :elm_web_window_features_property_get, [ :elm_web_window_features, :elm_web_window_feature_flag ], :bool ],
-        # EAPI void elm_web_window_features_region_get(const Elm_Web_Window_Features *wf, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :elm_web_window_features_region_get, [ :elm_web_window_features, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_web_inwin_mode_get, [ :pointer ], :bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/elm/elm_win.rb b/lib/efl/native/elm/elm_win.rb
index 67d6cb8..aa67c08 100644
--- a/lib/efl/native/elm/elm_win.rb
+++ b/lib/efl/native/elm/elm_win.rb
@@ -47,190 +47,210 @@ module Efl
         #
         # FUNCTIONS
         fcts = [
+        # EAPI Eina_Bool elm_win_trap_set(const Elm_Win_Trap *trap);
+        [ :elm_win_trap_set, [ :elm_win_trap ], :bool ],
         # EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
-        [ :elm_win_add, [ :evas_object, :string, :elm_win_type ], :evas_object ],
+        [ :elm_win_add, [ :pointer, :string, :elm_win_type ], :pointer ],
         # EAPI Evas_Object *elm_win_util_standard_add(const char *name, const char *title);
-        [ :elm_win_util_standard_add, [ :string, :string ], :evas_object ],
+        [ :elm_win_util_standard_add, [ :string, :string ], :pointer ],
         # EAPI void elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_win_resize_object_add, [ :evas_object, :evas_object ], :void ],
+        [ :elm_win_resize_object_add, [ :pointer, :pointer ], :void ],
         # EAPI void elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);
-        [ :elm_win_resize_object_del, [ :evas_object, :evas_object ], :void ],
+        [ :elm_win_resize_object_del, [ :pointer, :pointer ], :void ],
         # EAPI void elm_win_title_set(Evas_Object *obj, const char *title);
-        [ :elm_win_title_set, [ :evas_object, :string ], :void ],
+        [ :elm_win_title_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_win_title_get(const Evas_Object *obj);
-        [ :elm_win_title_get, [ :evas_object ], :string ],
+        [ :elm_win_title_get, [ :pointer ], :string ],
         # EAPI void elm_win_icon_name_set(Evas_Object *obj, const char *icon_name);
-        [ :elm_win_icon_name_set, [ :evas_object, :string ], :void ],
+        [ :elm_win_icon_name_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_win_icon_name_get(const Evas_Object *obj);
-        [ :elm_win_icon_name_get, [ :evas_object ], :string ],
+        [ :elm_win_icon_name_get, [ :pointer ], :string ],
         # EAPI void elm_win_role_set(Evas_Object *obj, const char *role);
-        [ :elm_win_role_set, [ :evas_object, :string ], :void ],
+        [ :elm_win_role_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_win_role_get(const Evas_Object *obj);
-        [ :elm_win_role_get, [ :evas_object ], :string ],
+        [ :elm_win_role_get, [ :pointer ], :string ],
         # EAPI void elm_win_icon_object_set(Evas_Object *obj, Evas_Object *icon);
-        [ :elm_win_icon_object_set, [ :evas_object, :evas_object ], :void ],
+        [ :elm_win_icon_object_set, [ :pointer, :pointer ], :void ],
         # EAPI const Evas_Object *elm_win_icon_object_get(const Evas_Object *obj);
-        [ :elm_win_icon_object_get, [ :evas_object ], :evas_object ],
+        [ :elm_win_icon_object_get, [ :pointer ], :pointer ],
         # EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
-        [ :elm_win_autodel_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_autodel_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_autodel_get(const Evas_Object *obj);
-        [ :elm_win_autodel_get, [ :evas_object ], :bool ],
+        [ :elm_win_autodel_get, [ :pointer ], :bool ],
         # EAPI void elm_win_activate(Evas_Object *obj);
-        [ :elm_win_activate, [ :evas_object ], :void ],
+        [ :elm_win_activate, [ :pointer ], :void ],
         # EAPI void elm_win_lower(Evas_Object *obj);
-        [ :elm_win_lower, [ :evas_object ], :void ],
+        [ :elm_win_lower, [ :pointer ], :void ],
         # EAPI void elm_win_raise(Evas_Object *obj);
-        [ :elm_win_raise, [ :evas_object ], :void ],
+        [ :elm_win_raise, [ :pointer ], :void ],
         # EAPI void elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v);
-        [ :elm_win_center, [ :evas_object, :bool, :bool ], :void ],
+        [ :elm_win_center, [ :pointer, :bool, :bool ], :void ],
         # EAPI void elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless);
-        [ :elm_win_borderless_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_borderless_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_borderless_get(const Evas_Object *obj);
-        [ :elm_win_borderless_get, [ :evas_object ], :bool ],
+        [ :elm_win_borderless_get, [ :pointer ], :bool ],
         # EAPI void elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped);
-        [ :elm_win_shaped_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_shaped_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_shaped_get(const Evas_Object *obj);
-        [ :elm_win_shaped_get, [ :evas_object ], :bool ],
-        # EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha);
-        [ :elm_win_alpha_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_shaped_get, [ :pointer ], :bool ],
+        # EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_win_alpha_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_alpha_get(const Evas_Object *obj);
-        [ :elm_win_alpha_get, [ :evas_object ], :bool ],
+        [ :elm_win_alpha_get, [ :pointer ], :bool ],
         # EAPI void elm_win_override_set(Evas_Object *obj, Eina_Bool override);
-        [ :elm_win_override_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_override_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_override_get(const Evas_Object *obj);
-        [ :elm_win_override_get, [ :evas_object ], :bool ],
+        [ :elm_win_override_get, [ :pointer ], :bool ],
         # EAPI void elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen);
-        [ :elm_win_fullscreen_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_fullscreen_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_fullscreen_get(const Evas_Object *obj);
-        [ :elm_win_fullscreen_get, [ :evas_object ], :bool ],
+        [ :elm_win_fullscreen_get, [ :pointer ], :bool ],
+        # EAPI Evas_Object *elm_win_main_menu_get(const Evas_Object *obj);
+        [ :elm_win_main_menu_get, [ :pointer ], :pointer ],
         # EAPI void elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized);
-        [ :elm_win_maximized_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_maximized_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_maximized_get(const Evas_Object *obj);
-        [ :elm_win_maximized_get, [ :evas_object ], :bool ],
+        [ :elm_win_maximized_get, [ :pointer ], :bool ],
         # EAPI void elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified);
-        [ :elm_win_iconified_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_iconified_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_iconified_get(const Evas_Object *obj);
-        [ :elm_win_iconified_get, [ :evas_object ], :bool ],
+        [ :elm_win_iconified_get, [ :pointer ], :bool ],
         # EAPI void elm_win_withdrawn_set(Evas_Object *obj, Eina_Bool withdrawn);
-        [ :elm_win_withdrawn_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_withdrawn_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_withdrawn_get(const Evas_Object *obj);
-        [ :elm_win_withdrawn_get, [ :evas_object ], :bool ],
+        [ :elm_win_withdrawn_get, [ :pointer ], :bool ],
+        # EAPI void elm_win_available_profiles_set(Evas_Object *obj, const char **profiles, unsigned int count);
+        [ :elm_win_available_profiles_set, [ :pointer, :pointer, :uint ], :void ],
+        # EAPI Eina_Bool elm_win_available_profiles_get(Evas_Object *obj, char ***profiles, unsigned int *count);
+        [ :elm_win_available_profiles_get, [ :pointer, :pointer, :pointer ], :bool ],
+        # EAPI void elm_win_profile_set(Evas_Object *obj, const char *profile);
+        [ :elm_win_profile_set, [ :pointer, :string ], :void ],
+        # EAPI const char *elm_win_profile_get(const Evas_Object *obj);
+        [ :elm_win_profile_get, [ :pointer ], :string ],
         # EAPI void elm_win_urgent_set(Evas_Object *obj, Eina_Bool urgent);
-        [ :elm_win_urgent_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_urgent_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_urgent_get(const Evas_Object *obj);
-        [ :elm_win_urgent_get, [ :evas_object ], :bool ],
+        [ :elm_win_urgent_get, [ :pointer ], :bool ],
         # EAPI void elm_win_demand_attention_set(Evas_Object *obj, Eina_Bool demand_attention);
-        [ :elm_win_demand_attention_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_demand_attention_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_demand_attention_get(const Evas_Object *obj);
-        [ :elm_win_demand_attention_get, [ :evas_object ], :bool ],
+        [ :elm_win_demand_attention_get, [ :pointer ], :bool ],
         # EAPI void elm_win_modal_set(Evas_Object *obj, Eina_Bool modal);
-        [ :elm_win_modal_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_modal_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_modal_get(const Evas_Object *obj);
-        [ :elm_win_modal_get, [ :evas_object ], :bool ],
+        [ :elm_win_modal_get, [ :pointer ], :bool ],
         # EAPI void elm_win_aspect_set(Evas_Object *obj, double aspect);
-        [ :elm_win_aspect_set, [ :evas_object, :double ], :void ],
+        [ :elm_win_aspect_set, [ :pointer, :double ], :void ],
         # EAPI double elm_win_aspect_get(const Evas_Object *obj);
-        [ :elm_win_aspect_get, [ :evas_object ], :double ],
+        [ :elm_win_aspect_get, [ :pointer ], :double ],
         # EAPI void elm_win_size_base_set(Evas_Object *obj, int w, int h);
-        [ :elm_win_size_base_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_win_size_base_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_win_size_base_get(Evas_Object *obj, int *w, int *h);
-        [ :elm_win_size_base_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_win_size_base_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_win_size_step_set(Evas_Object *obj, int w, int h);
-        [ :elm_win_size_step_set, [ :evas_object, :int, :int ], :void ],
+        [ :elm_win_size_step_set, [ :pointer, :int, :int ], :void ],
         # EAPI void elm_win_size_step_get(Evas_Object *obj, int *w, int *h);
-        [ :elm_win_size_step_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_win_size_step_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_win_layer_set(Evas_Object *obj, int layer);
-        [ :elm_win_layer_set, [ :evas_object, :int ], :void ],
+        [ :elm_win_layer_set, [ :pointer, :int ], :void ],
         # EAPI int elm_win_layer_get(const Evas_Object *obj);
-        [ :elm_win_layer_get, [ :evas_object ], :int ],
+        [ :elm_win_layer_get, [ :pointer ], :int ],
         # EAPI void elm_win_norender_push(Evas_Object *obj);
-        [ :elm_win_norender_push, [ :evas_object ], :void ],
+        [ :elm_win_norender_push, [ :pointer ], :void ],
         # EAPI void elm_win_norender_pop(Evas_Object *obj);
-        [ :elm_win_norender_pop, [ :evas_object ], :void ],
+        [ :elm_win_norender_pop, [ :pointer ], :void ],
         # EAPI int elm_win_norender_get(Evas_Object *obj);
-        [ :elm_win_norender_get, [ :evas_object ], :int ],
+        [ :elm_win_norender_get, [ :pointer ], :int ],
         # EAPI void elm_win_render(Evas_Object *obj);
-        [ :elm_win_render, [ :evas_object ], :void ],
+        [ :elm_win_render, [ :pointer ], :void ],
         # EAPI void elm_win_rotation_set(Evas_Object *obj, int rotation);
-        [ :elm_win_rotation_set, [ :evas_object, :int ], :void ],
+        [ :elm_win_rotation_set, [ :pointer, :int ], :void ],
         # EAPI void elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation);
-        [ :elm_win_rotation_with_resize_set, [ :evas_object, :int ], :void ],
+        [ :elm_win_rotation_with_resize_set, [ :pointer, :int ], :void ],
         # EAPI int elm_win_rotation_get(const Evas_Object *obj);
-        [ :elm_win_rotation_get, [ :evas_object ], :int ],
+        [ :elm_win_rotation_get, [ :pointer ], :int ],
         # EAPI void elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
-        [ :elm_win_sticky_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_sticky_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_sticky_get(const Evas_Object *obj);
-        [ :elm_win_sticky_get, [ :evas_object ], :bool ],
+        [ :elm_win_sticky_get, [ :pointer ], :bool ],
         # EAPI void elm_win_conformant_set(Evas_Object *obj, Eina_Bool conformant);
-        [ :elm_win_conformant_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_conformant_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_conformant_get(const Evas_Object *obj);
-        [ :elm_win_conformant_get, [ :evas_object ], :bool ],
+        [ :elm_win_conformant_get, [ :pointer ], :bool ],
         # EAPI void elm_win_quickpanel_set(Evas_Object *obj, Eina_Bool quickpanel);
-        [ :elm_win_quickpanel_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_quickpanel_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_quickpanel_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_get, [ :evas_object ], :bool ],
+        [ :elm_win_quickpanel_get, [ :pointer ], :bool ],
         # EAPI void elm_win_quickpanel_priority_major_set(Evas_Object *obj, int priority);
-        [ :elm_win_quickpanel_priority_major_set, [ :evas_object, :int ], :void ],
+        [ :elm_win_quickpanel_priority_major_set, [ :pointer, :int ], :void ],
         # EAPI int elm_win_quickpanel_priority_major_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_priority_major_get, [ :evas_object ], :int ],
+        [ :elm_win_quickpanel_priority_major_get, [ :pointer ], :int ],
         # EAPI void elm_win_quickpanel_priority_minor_set(Evas_Object *obj, int priority);
-        [ :elm_win_quickpanel_priority_minor_set, [ :evas_object, :int ], :void ],
+        [ :elm_win_quickpanel_priority_minor_set, [ :pointer, :int ], :void ],
         # EAPI int elm_win_quickpanel_priority_minor_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_priority_minor_get, [ :evas_object ], :int ],
+        [ :elm_win_quickpanel_priority_minor_get, [ :pointer ], :int ],
         # EAPI void elm_win_quickpanel_zone_set(Evas_Object *obj, int zone);
-        [ :elm_win_quickpanel_zone_set, [ :evas_object, :int ], :void ],
+        [ :elm_win_quickpanel_zone_set, [ :pointer, :int ], :void ],
         # EAPI int elm_win_quickpanel_zone_get(const Evas_Object *obj);
-        [ :elm_win_quickpanel_zone_get, [ :evas_object ], :int ],
+        [ :elm_win_quickpanel_zone_get, [ :pointer ], :int ],
         # EAPI void elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip);
-        [ :elm_win_prop_focus_skip_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_prop_focus_skip_set, [ :pointer, :bool ], :void ],
         # EAPI void elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *params);
-        [ :elm_win_illume_command_send, [ :evas_object, :elm_illume_command, :pointer ], :void ],
+        [ :elm_win_illume_command_send, [ :pointer, :elm_illume_command, :pointer ], :void ],
         # EAPI Evas_Object *elm_win_inlined_image_object_get(Evas_Object *obj);
-        [ :elm_win_inlined_image_object_get, [ :evas_object ], :evas_object ],
+        [ :elm_win_inlined_image_object_get, [ :pointer ], :pointer ],
         # EAPI Eina_Bool elm_win_focus_get(const Evas_Object *obj);
-        [ :elm_win_focus_get, [ :evas_object ], :bool ],
+        [ :elm_win_focus_get, [ :pointer ], :bool ],
         # EAPI void elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain);
-        [ :elm_win_screen_constrain_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_screen_constrain_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_screen_constrain_get(Evas_Object *obj);
-        [ :elm_win_screen_constrain_get, [ :evas_object ], :bool ],
+        [ :elm_win_screen_constrain_get, [ :pointer ], :bool ],
         # EAPI void elm_win_screen_size_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :elm_win_screen_size_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :elm_win_screen_size_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_win_screen_dpi_get(const Evas_Object *obj, int *xdpi, int *ydpi);
-        [ :elm_win_screen_dpi_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_win_screen_dpi_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void elm_win_focus_highlight_enabled_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :elm_win_focus_highlight_enabled_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_focus_highlight_enabled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_focus_highlight_enabled_get(const Evas_Object *obj);
-        [ :elm_win_focus_highlight_enabled_get, [ :evas_object ], :bool ],
+        [ :elm_win_focus_highlight_enabled_get, [ :pointer ], :bool ],
         # EAPI void elm_win_focus_highlight_style_set(Evas_Object *obj, const char *style);
-        [ :elm_win_focus_highlight_style_set, [ :evas_object, :string ], :void ],
+        [ :elm_win_focus_highlight_style_set, [ :pointer, :string ], :void ],
         # EAPI const char *elm_win_focus_highlight_style_get(const Evas_Object *obj);
-        [ :elm_win_focus_highlight_style_get, [ :evas_object ], :string ],
+        [ :elm_win_focus_highlight_style_get, [ :pointer ], :string ],
+        # EAPI void elm_win_focus_highlight_animate_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_win_focus_highlight_animate_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_focus_highlight_animate_get(const Evas_Object *obj);
+        [ :elm_win_focus_highlight_animate_get, [ :pointer ], :bool ],
         # EAPI void elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode);
-        [ :elm_win_keyboard_mode_set, [ :evas_object, :elm_win_keyboard_mode ], :void ],
+        [ :elm_win_keyboard_mode_set, [ :pointer, :elm_win_keyboard_mode ], :void ],
         # EAPI Elm_Win_Keyboard_Mode elm_win_keyboard_mode_get(const Evas_Object *obj);
-        [ :elm_win_keyboard_mode_get, [ :evas_object ], :elm_win_keyboard_mode ],
+        [ :elm_win_keyboard_mode_get, [ :pointer ], :elm_win_keyboard_mode ],
         # EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard);
-        [ :elm_win_keyboard_win_set, [ :evas_object, :bool ], :void ],
+        [ :elm_win_keyboard_win_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool elm_win_keyboard_win_get(const Evas_Object *obj);
-        [ :elm_win_keyboard_win_get, [ :evas_object ], :bool ],
+        [ :elm_win_keyboard_win_get, [ :pointer ], :bool ],
         # EAPI void elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode);
-        [ :elm_win_indicator_mode_set, [ :evas_object, :elm_win_indicator_mode ], :void ],
+        [ :elm_win_indicator_mode_set, [ :pointer, :elm_win_indicator_mode ], :void ],
         # EAPI Elm_Win_Indicator_Mode elm_win_indicator_mode_get(const Evas_Object *obj);
-        [ :elm_win_indicator_mode_get, [ :evas_object ], :elm_win_indicator_mode ],
+        [ :elm_win_indicator_mode_get, [ :pointer ], :elm_win_indicator_mode ],
         # EAPI void elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opacity_Mode mode);
-        [ :elm_win_indicator_opacity_set, [ :evas_object, :elm_win_indicator_opacity_mode ], :void ],
+        [ :elm_win_indicator_opacity_set, [ :pointer, :elm_win_indicator_opacity_mode ], :void ],
         # EAPI Elm_Win_Indicator_Opacity_Mode elm_win_indicator_opacity_get(const Evas_Object *obj);
-        [ :elm_win_indicator_opacity_get, [ :evas_object ], :elm_win_indicator_opacity_mode ],
+        [ :elm_win_indicator_opacity_get, [ :pointer ], :elm_win_indicator_opacity_mode ],
         # EAPI void elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y);
-        [ :elm_win_screen_position_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :elm_win_screen_position_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI Eina_Bool elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :elm_win_socket_listen, [ :evas_object, :string, :int, :bool ], :bool ],
+        [ :elm_win_socket_listen, [ :pointer, :string, :int, :bool ], :bool ],
         # EAPI Ecore_X_Window elm_win_xwindow_get(const Evas_Object *obj);
-        [ :elm_win_xwindow_get, [ :evas_object ], :uint ],
+        [ :elm_win_xwindow_get, [ :pointer ], :uint ],
         # EAPI Ecore_Wl_Window *elm_win_wl_window_get(const Evas_Object *obj);
-        [ :elm_win_wl_window_get, [ :evas_object ], :ecore_wl_window ],
-        # EAPI Eina_Bool elm_win_trap_set(const Elm_Win_Trap *trap);
-        [ :elm_win_trap_set, [ :elm_win_trap ], :bool ],
+        [ :elm_win_wl_window_get, [ :pointer ], :ecore_wl_window ],
+        # EAPI void elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating);
+        [ :elm_win_floating_mode_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool elm_win_floating_mode_get(const Evas_Object *obj);
+        [ :elm_win_floating_mode_get, [ :pointer ], :bool ],
+        # EAPI Ecore_Window elm_win_window_id_get(const Evas_Object *obj);
+        [ :elm_win_window_id_get, [ :pointer ], :pointer ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/embryo.rb b/lib/efl/native/embryo.rb
index 753dc5b..6baf143 100644
--- a/lib/efl/native/embryo.rb
+++ b/lib/efl/native/embryo.rb
@@ -62,7 +62,7 @@ module Efl
         # EAPI void embryo_program_free(Embryo_Program *ep);
         [ :embryo_program_free, [ :embryo_program ], :void ],
         # EAPI void embryo_program_native_call_add(Embryo_Program *ep, const char *name, Embryo_Cell (*func) (Embryo_Program *ep, Embryo_Cell *params));
-        [ :embryo_program_native_call_add, [ :embryo_program, :string,(callback [:embryo_program,:embryo_cell], :embryo_cell)], :void ],
+        # FIXME
         # EAPI void embryo_program_vm_reset(Embryo_Program *ep);
         [ :embryo_program_vm_reset, [ :embryo_program ], :void ],
         # EAPI void embryo_program_vm_push(Embryo_Program *ep);
diff --git a/lib/efl/native/emotion.rb b/lib/efl/native/emotion.rb
index ec79fdb..68f223d 100644
--- a/lib/efl/native/emotion.rb
+++ b/lib/efl/native/emotion.rb
@@ -22,29 +22,27 @@ module Efl
         ffi_lib 'emotion.so.1'
         #
         # ENUMS
-        # typedef enum _Emotion_Module {...} Emotion_Module;
-        enum :emotion_module, [ :emotion_module_xine, :emotion_module_gstreamer ]
+        # typedef enum {...} Emotion_Suspend;
+        enum :emotion_suspend, [ :emotion_wakeup, :emotion_sleep, :emotion_deep_sleep, :emotion_hibernate ]
+        # enum _Emotion_Aspect {...} Emotion_Aspect;
+        enum :emotion_aspect, [ :emotion_aspect_keep_none, :emotion_aspect_keep_width, :emotion_aspect_keep_height, :emotion_aspect_keep_both,
+            :emotion_aspect_crop, :emotion_aspect_custom ]
         # enum _Emotion_Event {...} Emotion_Event;
         enum :emotion_event, [ :emotion_event_menu1, :emotion_event_menu2, :emotion_event_menu3, :emotion_event_menu4, :emotion_event_menu5,
             :emotion_event_menu6, :emotion_event_menu7, :emotion_event_up, :emotion_event_down, :emotion_event_left, :emotion_event_right, :emotion_event_select,
             :emotion_event_next, :emotion_event_prev, :emotion_event_angle_next, :emotion_event_angle_prev, :emotion_event_force, :emotion_event_0,
             :emotion_event_1, :emotion_event_2, :emotion_event_3, :emotion_event_4, :emotion_event_5, :emotion_event_6, :emotion_event_7, :emotion_event_8,
             :emotion_event_9, :emotion_event_10 ]
-        # enum _Emotion_Meta_Info {...} Emotion_Meta_Info;
+        # typedef enum _Emotion_Meta_Info {...} Emotion_Meta_Info;
         enum :emotion_meta_info, [ :emotion_meta_info_track_title, :emotion_meta_info_track_artist, :emotion_meta_info_track_album,
             :emotion_meta_info_track_year, :emotion_meta_info_track_genre, :emotion_meta_info_track_comment, :emotion_meta_info_track_disc_id,
             :emotion_meta_info_track_count ]
-        # enum _Emotion_Vis {...} Emotion_Vis;
+        # typedef enum _Emotion_Vis {...} Emotion_Vis;
         enum :emotion_vis, [ :emotion_vis_none, :emotion_vis_goom, :emotion_vis_libvisual_bumpscope, :emotion_vis_libvisual_corona,
             :emotion_vis_libvisual_dancing_particles, :emotion_vis_libvisual_gdkpixbuf, :emotion_vis_libvisual_g_force, :emotion_vis_libvisual_goom,
             :emotion_vis_libvisual_infinite, :emotion_vis_libvisual_jakdaw, :emotion_vis_libvisual_jess, :emotion_vis_libvisual_lv_analyser,
             :emotion_vis_libvisual_lv_flower, :emotion_vis_libvisual_lv_gltest, :emotion_vis_libvisual_lv_scope, :emotion_vis_libvisual_madspin,
             :emotion_vis_libvisual_nebulus, :emotion_vis_libvisual_oinksie, :emotion_vis_libvisual_plasma, :emotion_vis_last ]
-        # typedef enum _Emotion_Suspend {...} Emotion_Suspend;
-        enum :emotion_suspend, [ :emotion_wakeup, :emotion_sleep, :emotion_deep_sleep, :emotion_hibernate ]
-        # enum _Emotion_Aspect {...} Emotion_Aspect;
-        enum :emotion_aspect, [ :emotion_aspect_keep_none, :emotion_aspect_keep_width, :emotion_aspect_keep_height, :emotion_aspect_keep_both,
-            :emotion_aspect_crop, :emotion_aspect_custom ]
         #
         # TYPEDEFS
         # typedef struct _Emotion_Version Emotion_Version;
@@ -57,6 +55,10 @@ module Efl
         attach_variable :emotion_version, :emotion_version
         # EAPI extern int EMOTION_WEBCAM_UPDATE;
         attach_variable :EMOTION_WEBCAM_UPDATE, :int
+        # EAPI extern int EMOTION_WEBCAM_ADD;
+        attach_variable :EMOTION_WEBCAM_ADD, :int
+        # EAPI extern int EMOTION_WEBCAM_DEL;
+        attach_variable :EMOTION_WEBCAM_DEL, :int
         #
         # FUNCTIONS
         fcts = [
@@ -65,149 +67,153 @@ module Efl
         # EAPI Eina_Bool emotion_shutdown(void);
         [ :emotion_shutdown, [  ], :bool ],
         # EAPI Evas_Object *emotion_object_add (Evas *evas);
-        [ :emotion_object_add, [ :evas ], :evas_object ],
+        [ :emotion_object_add, [ :pointer ], :pointer ],
         # EAPI void emotion_object_module_option_set (Evas_Object *obj, const char *opt, const char *val);
-        [ :emotion_object_module_option_set, [ :evas_object, :string, :string ], :void ],
+        [ :emotion_object_module_option_set, [ :pointer, :string, :string ], :void ],
         # EAPI Eina_Bool emotion_object_init (Evas_Object *obj, const char *module_filename);
-        [ :emotion_object_init, [ :evas_object, :string ], :bool ],
+        [ :emotion_object_init, [ :pointer, :string ], :bool ],
         # EAPI void emotion_object_border_set(Evas_Object *obj, int l, int r, int t, int b);
-        [ :emotion_object_border_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :emotion_object_border_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void emotion_object_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :emotion_object_border_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :emotion_object_border_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void emotion_object_bg_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :emotion_object_bg_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :emotion_object_bg_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void emotion_object_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :emotion_object_bg_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :emotion_object_bg_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void emotion_object_keep_aspect_set(Evas_Object *obj, Emotion_Aspect a);
-        [ :emotion_object_keep_aspect_set, [ :evas_object, :emotion_aspect ], :void ],
+        [ :emotion_object_keep_aspect_set, [ :pointer, :emotion_aspect ], :void ],
         # EAPI Emotion_Aspect emotion_object_keep_aspect_get(const Evas_Object *obj);
-        [ :emotion_object_keep_aspect_get, [ :evas_object ], :emotion_aspect ],
+        [ :emotion_object_keep_aspect_get, [ :pointer ], :emotion_aspect ],
         # EAPI Eina_Bool emotion_object_file_set (Evas_Object *obj, const char *filename);
-        [ :emotion_object_file_set, [ :evas_object, :string ], :bool ],
+        [ :emotion_object_file_set, [ :pointer, :string ], :bool ],
         # EAPI const char *emotion_object_file_get (const Evas_Object *obj);
-        [ :emotion_object_file_get, [ :evas_object ], :string ],
+        [ :emotion_object_file_get, [ :pointer ], :string ],
         # EAPI void emotion_object_play_set (Evas_Object *obj, Eina_Bool play);
-        [ :emotion_object_play_set, [ :evas_object, :bool ], :void ],
+        [ :emotion_object_play_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool emotion_object_play_get (const Evas_Object *obj);
-        [ :emotion_object_play_get, [ :evas_object ], :bool ],
+        [ :emotion_object_play_get, [ :pointer ], :bool ],
         # EAPI void emotion_object_position_set (Evas_Object *obj, double sec);
-        [ :emotion_object_position_set, [ :evas_object, :double ], :void ],
+        [ :emotion_object_position_set, [ :pointer, :double ], :void ],
         # EAPI double emotion_object_position_get (const Evas_Object *obj);
-        [ :emotion_object_position_get, [ :evas_object ], :double ],
+        [ :emotion_object_position_get, [ :pointer ], :double ],
         # EAPI double emotion_object_buffer_size_get (const Evas_Object *obj);
-        [ :emotion_object_buffer_size_get, [ :evas_object ], :double ],
+        [ :emotion_object_buffer_size_get, [ :pointer ], :double ],
         # EAPI Eina_Bool emotion_object_seekable_get (const Evas_Object *obj);
-        [ :emotion_object_seekable_get, [ :evas_object ], :bool ],
+        [ :emotion_object_seekable_get, [ :pointer ], :bool ],
         # EAPI double emotion_object_play_length_get (const Evas_Object *obj);
-        [ :emotion_object_play_length_get, [ :evas_object ], :double ],
+        [ :emotion_object_play_length_get, [ :pointer ], :double ],
         # EAPI void emotion_object_play_speed_set (Evas_Object *obj, double speed);
-        [ :emotion_object_play_speed_set, [ :evas_object, :double ], :void ],
+        [ :emotion_object_play_speed_set, [ :pointer, :double ], :void ],
         # EAPI double emotion_object_play_speed_get (const Evas_Object *obj);
-        [ :emotion_object_play_speed_get, [ :evas_object ], :double ],
+        [ :emotion_object_play_speed_get, [ :pointer ], :double ],
         # EAPI const char *emotion_object_progress_info_get (const Evas_Object *obj);
-        [ :emotion_object_progress_info_get, [ :evas_object ], :string ],
+        [ :emotion_object_progress_info_get, [ :pointer ], :string ],
         # EAPI double emotion_object_progress_status_get (const Evas_Object *obj);
-        [ :emotion_object_progress_status_get, [ :evas_object ], :double ],
+        [ :emotion_object_progress_status_get, [ :pointer ], :double ],
         # EAPI Eina_Bool emotion_object_video_handled_get (const Evas_Object *obj);
-        [ :emotion_object_video_handled_get, [ :evas_object ], :bool ],
+        [ :emotion_object_video_handled_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool emotion_object_audio_handled_get (const Evas_Object *obj);
-        [ :emotion_object_audio_handled_get, [ :evas_object ], :bool ],
+        [ :emotion_object_audio_handled_get, [ :pointer ], :bool ],
         # EAPI double emotion_object_ratio_get (const Evas_Object *obj);
-        [ :emotion_object_ratio_get, [ :evas_object ], :double ],
+        [ :emotion_object_ratio_get, [ :pointer ], :double ],
         # EAPI void emotion_object_size_get (const Evas_Object *obj, int *iw, int *ih);
-        [ :emotion_object_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :emotion_object_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void emotion_object_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth);
-        [ :emotion_object_smooth_scale_set, [ :evas_object, :bool ], :void ],
+        [ :emotion_object_smooth_scale_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool emotion_object_smooth_scale_get (const Evas_Object *obj);
-        [ :emotion_object_smooth_scale_get, [ :evas_object ], :bool ],
+        [ :emotion_object_smooth_scale_get, [ :pointer ], :bool ],
         # EAPI void emotion_object_event_simple_send (Evas_Object *obj, Emotion_Event ev);
-        [ :emotion_object_event_simple_send, [ :evas_object, :emotion_event ], :void ],
+        [ :emotion_object_event_simple_send, [ :pointer, :emotion_event ], :void ],
         # EAPI void emotion_object_audio_volume_set (Evas_Object *obj, double vol);
-        [ :emotion_object_audio_volume_set, [ :evas_object, :double ], :void ],
+        [ :emotion_object_audio_volume_set, [ :pointer, :double ], :void ],
         # EAPI double emotion_object_audio_volume_get (const Evas_Object *obj);
-        [ :emotion_object_audio_volume_get, [ :evas_object ], :double ],
+        [ :emotion_object_audio_volume_get, [ :pointer ], :double ],
         # EAPI void emotion_object_audio_mute_set (Evas_Object *obj, Eina_Bool mute);
-        [ :emotion_object_audio_mute_set, [ :evas_object, :bool ], :void ],
+        [ :emotion_object_audio_mute_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool emotion_object_audio_mute_get (const Evas_Object *obj);
-        [ :emotion_object_audio_mute_get, [ :evas_object ], :bool ],
+        [ :emotion_object_audio_mute_get, [ :pointer ], :bool ],
         # EAPI int emotion_object_audio_channel_count (const Evas_Object *obj);
-        [ :emotion_object_audio_channel_count, [ :evas_object ], :int ],
+        [ :emotion_object_audio_channel_count, [ :pointer ], :int ],
         # EAPI const char *emotion_object_audio_channel_name_get(const Evas_Object *obj, int channel);
-        [ :emotion_object_audio_channel_name_get, [ :evas_object, :int ], :string ],
+        [ :emotion_object_audio_channel_name_get, [ :pointer, :int ], :string ],
         # EAPI void emotion_object_audio_channel_set (Evas_Object *obj, int channel);
-        [ :emotion_object_audio_channel_set, [ :evas_object, :int ], :void ],
+        [ :emotion_object_audio_channel_set, [ :pointer, :int ], :void ],
         # EAPI int emotion_object_audio_channel_get (const Evas_Object *obj);
-        [ :emotion_object_audio_channel_get, [ :evas_object ], :int ],
+        [ :emotion_object_audio_channel_get, [ :pointer ], :int ],
         # EAPI void emotion_object_video_mute_set (Evas_Object *obj, Eina_Bool mute);
-        [ :emotion_object_video_mute_set, [ :evas_object, :bool ], :void ],
+        [ :emotion_object_video_mute_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool emotion_object_video_mute_get (const Evas_Object *obj);
-        [ :emotion_object_video_mute_get, [ :evas_object ], :bool ],
+        [ :emotion_object_video_mute_get, [ :pointer ], :bool ],
+        # EAPI void emotion_object_video_subtitle_file_set (Evas_Object *obj, const char *filepath);
+        [ :emotion_object_video_subtitle_file_set, [ :pointer, :string ], :void ],
+        # EAPI const char *emotion_object_video_subtitle_file_get (const Evas_Object *obj);
+        [ :emotion_object_video_subtitle_file_get, [ :pointer ], :string ],
         # EAPI int emotion_object_video_channel_count (const Evas_Object *obj);
-        [ :emotion_object_video_channel_count, [ :evas_object ], :int ],
+        [ :emotion_object_video_channel_count, [ :pointer ], :int ],
         # EAPI const char *emotion_object_video_channel_name_get(const Evas_Object *obj, int channel);
-        [ :emotion_object_video_channel_name_get, [ :evas_object, :int ], :string ],
+        [ :emotion_object_video_channel_name_get, [ :pointer, :int ], :string ],
         # EAPI void emotion_object_video_channel_set (Evas_Object *obj, int channel);
-        [ :emotion_object_video_channel_set, [ :evas_object, :int ], :void ],
+        [ :emotion_object_video_channel_set, [ :pointer, :int ], :void ],
         # EAPI int emotion_object_video_channel_get (const Evas_Object *obj);
-        [ :emotion_object_video_channel_get, [ :evas_object ], :int ],
+        [ :emotion_object_video_channel_get, [ :pointer ], :int ],
         # EAPI void emotion_object_spu_mute_set (Evas_Object *obj, Eina_Bool mute);
-        [ :emotion_object_spu_mute_set, [ :evas_object, :bool ], :void ],
+        [ :emotion_object_spu_mute_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool emotion_object_spu_mute_get (const Evas_Object *obj);
-        [ :emotion_object_spu_mute_get, [ :evas_object ], :bool ],
+        [ :emotion_object_spu_mute_get, [ :pointer ], :bool ],
         # EAPI int emotion_object_spu_channel_count (const Evas_Object *obj);
-        [ :emotion_object_spu_channel_count, [ :evas_object ], :int ],
+        [ :emotion_object_spu_channel_count, [ :pointer ], :int ],
         # EAPI const char *emotion_object_spu_channel_name_get (const Evas_Object *obj, int channel);
-        [ :emotion_object_spu_channel_name_get, [ :evas_object, :int ], :string ],
+        [ :emotion_object_spu_channel_name_get, [ :pointer, :int ], :string ],
         # EAPI void emotion_object_spu_channel_set (Evas_Object *obj, int channel);
-        [ :emotion_object_spu_channel_set, [ :evas_object, :int ], :void ],
+        [ :emotion_object_spu_channel_set, [ :pointer, :int ], :void ],
         # EAPI int emotion_object_spu_channel_get (const Evas_Object *obj);
-        [ :emotion_object_spu_channel_get, [ :evas_object ], :int ],
+        [ :emotion_object_spu_channel_get, [ :pointer ], :int ],
         # EAPI int emotion_object_chapter_count (const Evas_Object *obj);
-        [ :emotion_object_chapter_count, [ :evas_object ], :int ],
+        [ :emotion_object_chapter_count, [ :pointer ], :int ],
         # EAPI void emotion_object_chapter_set (Evas_Object *obj, int chapter);
-        [ :emotion_object_chapter_set, [ :evas_object, :int ], :void ],
+        [ :emotion_object_chapter_set, [ :pointer, :int ], :void ],
         # EAPI int emotion_object_chapter_get (const Evas_Object *obj);
-        [ :emotion_object_chapter_get, [ :evas_object ], :int ],
+        [ :emotion_object_chapter_get, [ :pointer ], :int ],
         # EAPI const char *emotion_object_chapter_name_get (const Evas_Object *obj, int chapter);
-        [ :emotion_object_chapter_name_get, [ :evas_object, :int ], :string ],
+        [ :emotion_object_chapter_name_get, [ :pointer, :int ], :string ],
         # EAPI void emotion_object_eject (Evas_Object *obj);
-        [ :emotion_object_eject, [ :evas_object ], :void ],
+        [ :emotion_object_eject, [ :pointer ], :void ],
         # EAPI const char *emotion_object_title_get (const Evas_Object *obj);
-        [ :emotion_object_title_get, [ :evas_object ], :string ],
+        [ :emotion_object_title_get, [ :pointer ], :string ],
         # EAPI const char *emotion_object_ref_file_get (const Evas_Object *obj);
-        [ :emotion_object_ref_file_get, [ :evas_object ], :string ],
+        [ :emotion_object_ref_file_get, [ :pointer ], :string ],
         # EAPI int emotion_object_ref_num_get (const Evas_Object *obj);
-        [ :emotion_object_ref_num_get, [ :evas_object ], :int ],
+        [ :emotion_object_ref_num_get, [ :pointer ], :int ],
         # EAPI int emotion_object_spu_button_count_get (const Evas_Object *obj);
-        [ :emotion_object_spu_button_count_get, [ :evas_object ], :int ],
+        [ :emotion_object_spu_button_count_get, [ :pointer ], :int ],
         # EAPI int emotion_object_spu_button_get (const Evas_Object *obj);
-        [ :emotion_object_spu_button_get, [ :evas_object ], :int ],
+        [ :emotion_object_spu_button_get, [ :pointer ], :int ],
         # EAPI const char *emotion_object_meta_info_get (const Evas_Object *obj, Emotion_Meta_Info meta);
-        [ :emotion_object_meta_info_get, [ :evas_object, :emotion_meta_info ], :string ],
+        [ :emotion_object_meta_info_get, [ :pointer, :emotion_meta_info ], :string ],
         # EAPI void emotion_object_vis_set (Evas_Object *obj, Emotion_Vis visualization);
-        [ :emotion_object_vis_set, [ :evas_object, :emotion_vis ], :void ],
+        [ :emotion_object_vis_set, [ :pointer, :emotion_vis ], :void ],
         # EAPI Emotion_Vis emotion_object_vis_get (const Evas_Object *obj);
-        [ :emotion_object_vis_get, [ :evas_object ], :emotion_vis ],
+        [ :emotion_object_vis_get, [ :pointer ], :emotion_vis ],
         # EAPI Eina_Bool emotion_object_vis_supported (const Evas_Object *obj, Emotion_Vis visualization);
-        [ :emotion_object_vis_supported, [ :evas_object, :emotion_vis ], :bool ],
+        [ :emotion_object_vis_supported, [ :pointer, :emotion_vis ], :bool ],
         # EAPI void emotion_object_priority_set(Evas_Object *obj, Eina_Bool priority);
-        [ :emotion_object_priority_set, [ :evas_object, :bool ], :void ],
+        [ :emotion_object_priority_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool emotion_object_priority_get(const Evas_Object *obj);
-        [ :emotion_object_priority_get, [ :evas_object ], :bool ],
+        [ :emotion_object_priority_get, [ :pointer ], :bool ],
         # EAPI void emotion_object_suspend_set(Evas_Object *obj, Emotion_Suspend state);
-        [ :emotion_object_suspend_set, [ :evas_object, :emotion_suspend ], :void ],
+        [ :emotion_object_suspend_set, [ :pointer, :emotion_suspend ], :void ],
         # EAPI Emotion_Suspend emotion_object_suspend_get(Evas_Object *obj);
-        [ :emotion_object_suspend_get, [ :evas_object ], :emotion_suspend ],
+        [ :emotion_object_suspend_get, [ :pointer ], :emotion_suspend ],
         # EAPI void emotion_object_last_position_load(Evas_Object *obj);
-        [ :emotion_object_last_position_load, [ :evas_object ], :void ],
+        [ :emotion_object_last_position_load, [ :pointer ], :void ],
         # EAPI void emotion_object_last_position_save(Evas_Object *obj);
-        [ :emotion_object_last_position_save, [ :evas_object ], :void ],
+        [ :emotion_object_last_position_save, [ :pointer ], :void ],
         # EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file);
         [ :emotion_object_extension_may_play_fast_get, [ :string ], :bool ],
         # EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file);
         [ :emotion_object_extension_may_play_get, [ :string ], :bool ],
         # EAPI Evas_Object *emotion_object_image_get(const Evas_Object *obj);
-        [ :emotion_object_image_get, [ :evas_object ], :evas_object ],
+        [ :emotion_object_image_get, [ :pointer ], :pointer ],
         # EAPI const Eina_List *emotion_webcams_get(void);
         [ :emotion_webcams_get, [  ], :eina_list ],
         # EAPI const char *emotion_webcam_name_get(const Emotion_Webcam *ew);
diff --git a/lib/efl/native/ethumb_client.rb b/lib/efl/native/ethumb_client.rb
index 672f5c3..862d52f 100644
--- a/lib/efl/native/ethumb_client.rb
+++ b/lib/efl/native/ethumb_client.rb
@@ -51,7 +51,7 @@ module Efl
         [ :ethumb_client_init, [  ], :int ],
         # EAPI int ethumb_client_shutdown(void);
         [ :ethumb_client_shutdown, [  ], :int ],
-        # EAPI Ethumb_Client * ethumb_client_connect(Ethumb_Client_Connect_Cb connect_cb, const void *data, Eina_Free_Cb free_data);
+        # EAPI Ethumb_Client *ethumb_client_connect(Ethumb_Client_Connect_Cb connect_cb, const void *data, Eina_Free_Cb free_data);
         [ :ethumb_client_connect, [ :ethumb_client_connect_cb, :pointer, :eina_free_cb ], :ethumb_client ],
         # EAPI void ethumb_client_disconnect(Ethumb_Client *client);
         [ :ethumb_client_disconnect, [ :ethumb_client ], :void ],
diff --git a/lib/efl/native/evas.rb b/lib/efl/native/evas.rb
index 5832d57..9c2b501 100644
--- a/lib/efl/native/evas.rb
+++ b/lib/efl/native/evas.rb
@@ -3,6 +3,8 @@
 #
 require 'efl/native'
 require 'efl/native/eina_list'
+require 'efl/native/eina_file'
+require 'efl/native/evas_loader'
 #
 module Efl
     #
@@ -36,7 +38,8 @@ module Efl
             :evas_callback_hide, :evas_callback_move, :evas_callback_resize, :evas_callback_restack, :evas_callback_del, :evas_callback_hold,
             :evas_callback_changed_size_hints, :evas_callback_image_preloaded, :evas_callback_canvas_focus_in, :evas_callback_canvas_focus_out,
             :evas_callback_render_flush_pre, :evas_callback_render_flush_post, :evas_callback_canvas_object_focus_in, :evas_callback_canvas_object_focus_out,
-            :evas_callback_image_unloaded, :evas_callback_render_pre, :evas_callback_render_post, :evas_callback_last ]
+            :evas_callback_image_unloaded, :evas_callback_render_pre, :evas_callback_render_post, :evas_callback_image_resize, :evas_callback_device_changed,
+            :evas_callback_last ]
         # typedef enum _Evas_Button_Flags {...} Evas_Button_Flags;
         enum :evas_button_flags, [ :evas_button_none, 0, :evas_button_double_click, (1<<0), :evas_button_triple_click, (1<<1) ]
         # typedef enum _Evas_Event_Flags {...} Evas_Event_Flags;
@@ -56,10 +59,9 @@ module Efl
         # typedef enum _Evas_Aspect_Control {...} Evas_Aspect_Control;
         enum :evas_aspect_control, [ :evas_aspect_control_none, 0, :evas_aspect_control_neither, 1, :evas_aspect_control_horizontal, 2,
             :evas_aspect_control_vertical, 3, :evas_aspect_control_both, 4 ]
-        # typedef enum _Evas_Load_Error {...} Evas_Load_Error;
-        enum :evas_load_error, [ :evas_load_error_none, 0, :evas_load_error_generic, 1, :evas_load_error_does_not_exist, 2,
-            :evas_load_error_permission_denied, 3, :evas_load_error_resource_allocation_failed, 4, :evas_load_error_corrupt_file, 5,
-            :evas_load_error_unknown_format, 6 ]
+        # typedef enum _Evas_Display_Mode {...} Evas_Display_Mode;
+        enum :evas_display_mode, [ :evas_display_mode_none, 0, :evas_display_mode_compress, 1, :evas_display_mode_expand, 2,
+            :evas_display_mode_dont_change, 3 ]
         # typedef enum _Evas_Alloc_Error {...} Evas_Alloc_Error;
         enum :evas_alloc_error, [ :evas_alloc_error_none, 0, :evas_alloc_error_fatal, 1, :evas_alloc_error_recovered, 2 ]
         # typedef enum _Evas_Fill_Spread {...} Evas_Fill_Spread;
@@ -69,21 +71,26 @@ module Efl
         enum :evas_pixel_import_pixel_format, [ :evas_pixel_format_none, 0, :evas_pixel_format_argb32, 1, :evas_pixel_format_yuv420p_601, 2 ]
         # typedef enum _Evas_Native_Surface_Type {...} Evas_Native_Surface_Type;
         enum :evas_native_surface_type, [ :evas_native_surface_none, :evas_native_surface_x11, :evas_native_surface_opengl ]
+        # typedef enum _Evas_Video_Surface_Caps {...} Evas_Video_Surface_Caps;
+        enum :evas_video_surface_caps, [ :evas_video_surface_move, 1, :evas_video_surface_resize, 2, :evas_video_surface_clip, 4,
+            :evas_video_surface_below, 8, :evas_video_surface_stacking_check, 16, :evas_video_surface_ignore_window, 32 ]
         # typedef enum _Evas_Render_Op {...} Evas_Render_Op;
         enum :evas_render_op, [ :evas_render_blend, 0, :evas_render_blend_rel, 1, :evas_render_copy, 2, :evas_render_copy_rel, 3, :evas_render_add, 4,
             :evas_render_add_rel, 5, :evas_render_sub, 6, :evas_render_sub_rel, 7, :evas_render_tint, 8, :evas_render_tint_rel, 9, :evas_render_mask, 10,
             :evas_render_mul, 11 ]
         # typedef enum _Evas_Border_Fill_Mode {...} Evas_Border_Fill_Mode;
         enum :evas_border_fill_mode, [ :evas_border_fill_none, 0, :evas_border_fill_default, 1, :evas_border_fill_solid, 2 ]
-        # typedef enum _Evas_Image_Scale_Hint {...} Evas_Image_Scale_Hint;
-        enum :evas_image_scale_hint, [ :evas_image_scale_hint_none, 0, :evas_image_scale_hint_dynamic, 1, :evas_image_scale_hint_static, 2 ]
-        # typedef enum _Evas_Image_Animated_Loop_Hint {...} Evas_Image_Animated_Loop_Hint;
-        enum :evas_image_animated_loop_hint, [ :evas_image_animated_hint_none, 0, :evas_image_animated_hint_loop, 1,
-            :evas_image_animated_hint_pingpong, 2 ]
         # typedef enum _Evas_Engine_Render_Mode {...} Evas_Engine_Render_Mode;
         enum :evas_engine_render_mode, [ :evas_render_mode_blocking, 0, :evas_render_mode_nonblocking, 1 ]
         # typedef enum _Evas_Image_Content_Hint {...} Evas_Image_Content_Hint;
         enum :evas_image_content_hint, [ :evas_image_content_hint_none, 0, :evas_image_content_hint_dynamic, 1, :evas_image_content_hint_static, 2 ]
+        # typedef enum _Evas_Device_Class {...} Evas_Device_Class;
+        enum :evas_device_class, [ :evas_device_class_none, :evas_device_class_seat, :evas_device_class_keyboard, :evas_device_class_mouse,
+            :evas_device_class_touch, :evas_device_class_pen, :evas_device_class_pointer, :evas_device_class_gamepad ]
+        # typedef enum _Evas_Device_Subclass {...} Evas_Device_Subclass;
+        enum :evas_device_subclass, [ :evas_device_subclass_none, :evas_device_subclass_finger, :evas_device_subclass_fingernail,
+            :evas_device_subclass_knuckle, :evas_device_subclass_palm, :evas_device_subclass_hand_size, :evas_device_subclass_hand_flat,
+            :evas_device_subclass_pen_tip, :evas_device_subclass_trackpad, :evas_device_subclass_trackpoint, :evas_device_subclass_trackball ]
         # typedef enum _Evas_Object_Pointer_Mode {...} Evas_Object_Pointer_Mode;
         enum :evas_object_pointer_mode, [ :evas_object_pointer_mode_autograb, :evas_object_pointer_mode_nograb,
             :evas_object_pointer_mode_nograb_no_repeat_updown ]
@@ -109,8 +116,8 @@ module Efl
         # TYPEDEFS
         # typedef struct _Evas_Version Evas_Version;
         typedef :pointer, :evas_version
-        # typedef short Evas_Callback_Priority;
-        typedef :short, :evas_callback_priority
+        # typedef Eo_Callback_Priority Evas_Callback_Priority;
+        typedef :short, :eo_callback_priority
         # typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle;
         typedef :pointer, :evas_coord_rectangle
         # typedef struct _Evas_Point Evas_Point;
@@ -119,6 +126,10 @@ module Efl
         typedef :pointer, :evas_coord_point
         # typedef struct _Evas_Coord_Precision_Point Evas_Coord_Precision_Point;
         typedef :pointer, :evas_coord_precision_point
+        # typedef struct _Evas_Coord_Size Evas_Coord_Size;
+        typedef :pointer, :evas_coord_size
+        # typedef struct _Evas_Coord_Precision_Size Evas_Coord_Precision_Size;
+        typedef :pointer, :evas_coord_precision_size
         # typedef struct _Evas_Position Evas_Position;
         typedef :pointer, :evas_position
         # typedef struct _Evas_Precision_Position Evas_Precision_Position;
@@ -131,9 +142,11 @@ module Efl
         typedef :pointer, :evas_smart_cb_description
         # typedef struct _Evas_Map Evas_Map;
         typedef :pointer, :evas_map
-        # typedef struct _Evas Evas;
+        # typedef Eo Evas;
         typedef :pointer, :evas
-        # typedef struct _Evas_Object Evas_Object;
+        # typedef struct _Evas_Public_Data Evas_Public_Data;
+        typedef :pointer, :evas_public_data
+        # typedef Eo Evas_Object;
         typedef :pointer, :evas_object
         # typedef void Evas_Performance;
         typedef :void, :evas_performance
@@ -185,6 +198,8 @@ module Efl
         typedef :pointer, :evas_event_key_up
         # typedef struct _Evas_Event_Hold Evas_Event_Hold;
         typedef :pointer, :evas_event_hold
+        # typedef struct _Evas_Event_Render_Post Evas_Event_Render_Post;
+        typedef :pointer, :evas_event_render_post
         # typedef struct _Evas_Textblock_Style Evas_Textblock_Style;
         typedef :pointer, :evas_textblock_style
         # typedef struct _Evas_Textblock_Cursor Evas_Textblock_Cursor;
@@ -211,57 +226,59 @@ module Efl
         typedef :pointer, :evas_cserve_image
         # typedef struct _Evas_Cserve_Config Evas_Cserve_Config;
         typedef :pointer, :evas_cserve_config
+        # typedef Eo Evas_Out;
+        typedef :pointer, :evas_out
         #
         # CALLBACKS
         # typedef void (*Evas_Video_Cb) (void *data, Evas_Object *obj, const Evas_Video_Surface *surface);
-        callback :evas_video_cb, [ :pointer, :evas_object, :evas_video_surface ], :void
+        callback :evas_video_cb, [ :pointer, :pointer, :evas_video_surface ], :void
         # typedef void (*Evas_Video_Coord_Cb) (void *data, Evas_Object *obj, const Evas_Video_Surface *surface, Evas_Coord a, Evas_Coord b);
-        callback :evas_video_coord_cb, [ :pointer, :evas_object, :evas_video_surface, :int, :int ], :void
+        callback :evas_video_coord_cb, [ :pointer, :pointer, :evas_video_surface, :int, :int ], :void
         # typedef void (*Evas_Smart_Cb) (void *data, Evas_Object *obj, void *event_info);
-        callback :evas_smart_cb, [ :pointer, :evas_object, :pointer ], :void
+        callback :evas_smart_cb, [ :pointer, :pointer, :pointer ], :void
         # typedef void (*Evas_Event_Cb) (void *data, Evas *e, void *event_info);
-        callback :evas_event_cb, [ :pointer, :evas, :pointer ], :void
+        callback :evas_event_cb, [ :pointer, :pointer, :pointer ], :void
         # typedef Eina_Bool (*Evas_Object_Event_Post_Cb) (void *data, Evas *e);
-        callback :evas_object_event_post_cb, [ :pointer, :evas ], :bool
+        callback :evas_object_event_post_cb, [ :pointer, :pointer ], :bool
         # typedef void (*Evas_Object_Event_Cb) (void *data, Evas *e, Evas_Object *obj, void *event_info);
-        callback :evas_object_event_cb, [ :pointer, :evas, :evas_object, :pointer ], :void
+        callback :evas_object_event_cb, [ :pointer, :pointer, :pointer, :pointer ], :void
         # typedef void (*Evas_Async_Events_Put_Cb) (void *target, Evas_Callback_Type type, void *event_info);
         callback :evas_async_events_put_cb, [ :pointer, :evas_callback_type, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Show_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_show_cb, [ :pointer, :evas_object ], :void
+        callback :evas_object_intercept_show_cb, [ :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Hide_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_hide_cb, [ :pointer, :evas_object ], :void
+        callback :evas_object_intercept_hide_cb, [ :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Move_Cb) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        callback :evas_object_intercept_move_cb, [ :pointer, :evas_object, :int, :int ], :void
+        callback :evas_object_intercept_move_cb, [ :pointer, :pointer, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Resize_Cb) (void *data, Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        callback :evas_object_intercept_resize_cb, [ :pointer, :evas_object, :int, :int ], :void
+        callback :evas_object_intercept_resize_cb, [ :pointer, :pointer, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Raise_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_raise_cb, [ :pointer, :evas_object ], :void
+        callback :evas_object_intercept_raise_cb, [ :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Lower_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_lower_cb, [ :pointer, :evas_object ], :void
+        callback :evas_object_intercept_lower_cb, [ :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Stack_Above_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
-        callback :evas_object_intercept_stack_above_cb, [ :pointer, :evas_object, :evas_object ], :void
+        callback :evas_object_intercept_stack_above_cb, [ :pointer, :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Stack_Below_Cb) (void *data, Evas_Object *obj, Evas_Object *above);
-        callback :evas_object_intercept_stack_below_cb, [ :pointer, :evas_object, :evas_object ], :void
+        callback :evas_object_intercept_stack_below_cb, [ :pointer, :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Layer_Set_Cb) (void *data, Evas_Object *obj, int l);
-        callback :evas_object_intercept_layer_set_cb, [ :pointer, :evas_object, :int ], :void
+        callback :evas_object_intercept_layer_set_cb, [ :pointer, :pointer, :int ], :void
+        # typedef void (*Evas_Object_Intercept_Focus_Set_Cb) (void *data, Evas_Object *obj, Eina_Bool focus);
+        callback :evas_object_intercept_focus_set_cb, [ :pointer, :pointer, :bool ], :void
         # typedef void (*Evas_Object_Intercept_Color_Set_Cb) (void *data, Evas_Object *obj, int r, int g, int b, int a);
-        callback :evas_object_intercept_color_set_cb, [ :pointer, :evas_object, :int, :int, :int, :int ], :void
+        callback :evas_object_intercept_color_set_cb, [ :pointer, :pointer, :int, :int, :int, :int ], :void
         # typedef void (*Evas_Object_Intercept_Clip_Set_Cb) (void *data, Evas_Object *obj, Evas_Object *clip);
-        callback :evas_object_intercept_clip_set_cb, [ :pointer, :evas_object, :evas_object ], :void
+        callback :evas_object_intercept_clip_set_cb, [ :pointer, :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Intercept_Clip_Unset_Cb) (void *data, Evas_Object *obj);
-        callback :evas_object_intercept_clip_unset_cb, [ :pointer, :evas_object ], :void
+        callback :evas_object_intercept_clip_unset_cb, [ :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
-        callback :evas_object_image_pixels_get_cb, [ :pointer, :evas_object ], :void
+        callback :evas_object_image_pixels_get_cb, [ :pointer, :pointer ], :void
         # typedef void (*Evas_Object_Box_Layout) (Evas_Object *o, Evas_Object_Box_Data *priv, void *user_data);
-        callback :evas_object_box_layout_cb, [ :evas_object, :evas_object_box_data, :pointer ], :void
-        #
-        # VARIABLES
-        # EAPI extern Evas_Version *evas_version;
-        attach_variable :evas_version, :evas_version
+        callback :evas_object_box_layout_cb, [ :pointer, :evas_object_box_data, :pointer ], :void
         #
         # FUNCTIONS
         fcts = [
+        # EAPI const char *evas_cserve_path_get(void);
+        [ :evas_cserve_path_get, [  ], :string ],
         # EAPI int evas_init(void);
         [ :evas_init, [  ], :int ],
         # EAPI int evas_shutdown(void);
@@ -274,1147 +291,1252 @@ module Efl
         [ :evas_async_events_process, [  ], :int ],
         # EAPI Eina_Bool evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func);
         [ :evas_async_events_put, [ :pointer, :evas_callback_type, :pointer, :evas_async_events_put_cb ], :bool ],
+        # EAPI int evas_render_method_lookup(const char *name);
+        [ :evas_render_method_lookup, [ :string ], :int ],
+        # EAPI Eina_List *evas_render_method_list(void);
+        [ :evas_render_method_list, [  ], :eina_list ],
+        # EAPI void evas_render_method_list_free(Eina_List *list);
+        [ :evas_render_method_list_free, [ :eina_list ], :void ],
+        # EAPI void evas_render_updates_free(Eina_List *updates);
+        [ :evas_render_updates_free, [ :eina_list ], :void ],
+        # EAPI Evas_Device *evas_device_add(Evas *e);
+        [ :evas_device_add, [ :pointer ], :evas_device ],
+        # EAPI void evas_device_del(Evas_Device *dev);
+        [ :evas_device_del, [ :evas_device ], :void ],
+        # EAPI void evas_device_push(Evas *e, Evas_Device *dev);
+        [ :evas_device_push, [ :pointer, :evas_device ], :void ],
+        # EAPI void evas_device_pop(Evas *e);
+        [ :evas_device_pop, [ :pointer ], :void ],
+        # EAPI const Eina_List *evas_device_list(Evas *e, const Evas_Device *dev);
+        [ :evas_device_list, [ :pointer, :evas_device ], :eina_list ],
+        # EAPI void evas_device_name_set(Evas_Device *dev, const char *name);
+        [ :evas_device_name_set, [ :evas_device, :string ], :void ],
+        # EAPI const char *evas_device_name_get(const Evas_Device *dev);
+        [ :evas_device_name_get, [ :evas_device ], :string ],
+        # EAPI void evas_device_description_set(Evas_Device *dev, const char *desc);
+        [ :evas_device_description_set, [ :evas_device, :string ], :void ],
+        # EAPI const char *evas_device_description_get(const Evas_Device *dev);
+        [ :evas_device_description_get, [ :evas_device ], :string ],
+        # EAPI void evas_device_parent_set(Evas_Device *dev, Evas_Device *parent);
+        [ :evas_device_parent_set, [ :evas_device, :evas_device ], :void ],
+        # EAPI const Evas_Device *evas_device_parent_get(const Evas_Device *dev);
+        [ :evas_device_parent_get, [ :evas_device ], :evas_device ],
+        # EAPI void evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas);
+        [ :evas_device_class_set, [ :evas_device, :evas_device_class ], :void ],
+        # EAPI Evas_Device_Class evas_device_class_get(const Evas_Device *dev);
+        [ :evas_device_class_get, [ :evas_device ], :evas_device_class ],
+        # EAPI void evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas);
+        [ :evas_device_subclass_set, [ :evas_device, :evas_device_subclass ], :void ],
+        # EAPI Evas_Device_Subclass evas_device_subclass_get(const Evas_Device *dev);
+        [ :evas_device_subclass_get, [ :evas_device ], :evas_device_subclass ],
+        # EAPI void evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src);
+        [ :evas_device_emulation_source_set, [ :evas_device, :evas_device ], :void ],
+        # EAPI const Evas_Device *evas_device_emulation_source_get(const Evas_Device *dev);
+        [ :evas_device_emulation_source_get, [ :evas_device ], :evas_device ],
+        # EAPI void evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *obj, Evas_Coord z);
+        [ :evas_map_util_points_populate_from_object_full, [ :evas_map, :pointer, :int ], :void ],
+        # EAPI void evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *obj);
+        [ :evas_map_util_points_populate_from_object, [ :evas_map, :pointer ], :void ],
+        # EAPI void evas_map_util_points_populate_from_geometry(Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Coord z);
+        [ :evas_map_util_points_populate_from_geometry, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
+        # EAPI void evas_map_util_points_color_set(Evas_Map *m, int r, int g, int b, int a);
+        [ :evas_map_util_points_color_set, [ :evas_map, :int, :int, :int, :int ], :void ],
+        # EAPI void evas_map_util_rotate(Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy);
+        [ :evas_map_util_rotate, [ :evas_map, :double, :int, :int ], :void ],
+        # EAPI void evas_map_util_zoom(Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy);
+        [ :evas_map_util_zoom, [ :evas_map, :double, :double, :int, :int ], :void ],
+        # EAPI void evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz);
+        [ :evas_map_util_3d_rotate, [ :evas_map, :double, :double, :double, :int, :int, :int ], :void ],
+        # EAPI void evas_map_util_quat_rotate(Evas_Map *m, double qx, double qy, double qz, double qw, double cx, double cy, double cz);
+        [ :evas_map_util_quat_rotate, [ :evas_map, :double, :double, :double, :double, :double, :double, :double ], :void ],
+        # EAPI void evas_map_util_3d_lighting(Evas_Map *m, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab);
+        [ :evas_map_util_3d_lighting, [ :evas_map, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :void ],
+        # EAPI void evas_map_util_3d_perspective(Evas_Map *m, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
+        [ :evas_map_util_3d_perspective, [ :evas_map, :int, :int, :int, :int ], :void ],
+        # EAPI Eina_Bool evas_map_util_clockwise_get(Evas_Map *m);
+        [ :evas_map_util_clockwise_get, [ :evas_map ], :bool ],
+        # EAPI Evas_Map *evas_map_new(int count);
+        [ :evas_map_new, [ :int ], :evas_map ],
+        # EAPI void evas_map_smooth_set(Evas_Map *m, Eina_Bool enabled);
+        [ :evas_map_smooth_set, [ :evas_map, :bool ], :void ],
+        # EAPI Eina_Bool evas_map_smooth_get(const Evas_Map *m);
+        [ :evas_map_smooth_get, [ :evas_map ], :bool ],
+        # EAPI void evas_map_alpha_set(Evas_Map *m, Eina_Bool enabled);
+        [ :evas_map_alpha_set, [ :evas_map, :bool ], :void ],
+        # EAPI Eina_Bool evas_map_alpha_get(const Evas_Map *m);
+        [ :evas_map_alpha_get, [ :evas_map ], :bool ],
+        # EAPI Evas_Map *evas_map_dup(const Evas_Map *m);
+        [ :evas_map_dup, [ :evas_map ], :evas_map ],
+        # EAPI void evas_map_free(Evas_Map *m);
+        [ :evas_map_free, [ :evas_map ], :void ],
+        # EAPI int evas_map_count_get(const Evas_Map *m);
+        [ :evas_map_count_get, [ :evas_map ], :int ],
+        # EAPI void evas_map_point_coord_set(Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z);
+        [ :evas_map_point_coord_set, [ :evas_map, :int, :int, :int, :int ], :void ],
+        # EAPI void evas_map_point_coord_get(const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z);
+        [ :evas_map_point_coord_get, [ :evas_map, :int, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void evas_map_point_image_uv_set(Evas_Map *m, int idx, double u, double v);
+        [ :evas_map_point_image_uv_set, [ :evas_map, :int, :double, :double ], :void ],
+        # EAPI void evas_map_point_image_uv_get(const Evas_Map *m, int idx, double *u, double *v);
+        [ :evas_map_point_image_uv_get, [ :evas_map, :int, :pointer, :pointer ], :void ],
+        # EAPI void evas_map_point_color_set(Evas_Map *m, int idx, int r, int g, int b, int a);
+        [ :evas_map_point_color_set, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
+        # EAPI void evas_map_point_color_get(const Evas_Map *m, int idx, int *r, int *g, int *b, int *a);
+        [ :evas_map_point_color_get, [ :evas_map, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI Eina_Bool evas_object_image_extension_can_load_get(const char *file);
+        [ :evas_object_image_extension_can_load_get, [ :string ], :bool ],
+        # EAPI Eina_Bool evas_object_image_extension_can_load_fast_get(const char *file);
+        [ :evas_object_image_extension_can_load_fast_get, [ :string ], :bool ],
+        # EAPI const char *evas_textblock_escape_string_get(const char *escape);
+        [ :evas_textblock_escape_string_get, [ :string ], :string ],
+        # EAPI const char *evas_textblock_string_escape_get(const char *string, int *len_ret);
+        [ :evas_textblock_string_escape_get, [ :string, :pointer ], :string ],
+        # EAPI const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end);
+        [ :evas_textblock_escape_string_range_get, [ :string, :string ], :string ],
+        # EAPI Evas_Textblock_Style *evas_textblock_style_new(void);
+        [ :evas_textblock_style_new, [  ], :evas_textblock_style ],
+        # EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts);
+        [ :evas_textblock_style_free, [ :evas_textblock_style ], :void ],
+        # EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text);
+        [ :evas_textblock_style_set, [ :evas_textblock_style, :string ], :void ],
+        # EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts);
+        [ :evas_textblock_style_get, [ :evas_textblock_style ], :string ],
+        # EAPI void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text);
+        [ :evas_object_textblock_text_markup_prepend, [ :evas_textblock_cursor, :string ], :void ],
+        # EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_free, [ :evas_textblock_cursor ], :void ],
+        # EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_first, [ :evas_textblock_cursor ], :void ],
+        # EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_last, [ :evas_textblock_cursor ], :void ],
+        # EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_next, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_prev, [ :evas_textblock_cursor ], :bool ],
+        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n);
+        [ :evas_textblock_node_format_next_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
+        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n);
+        [ :evas_textblock_node_format_prev_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
+        # EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n);
+        [ :evas_textblock_cursor_set_at_format, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
+        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_format_get, [ :evas_textblock_cursor ], :evas_object_textblock_node_format ],
+        # EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fnode);
+        [ :evas_textblock_node_format_text_get, [ :evas_object_textblock_node_format ], :string ],
+        # EAPI void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
+        [ :evas_textblock_cursor_at_format_set, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
+        # EAPI Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_format_is_visible_get, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_format_next, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_format_prev, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_is_format, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_char_next, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_char_prev, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_word_start, [ :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_word_end, [ :evas_textblock_cursor ], :bool ],
+        # EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_char_first, [ :evas_textblock_cursor ], :void ],
+        # EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_char_last, [ :evas_textblock_cursor ], :void ],
+        # EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_line_char_first, [ :evas_textblock_cursor ], :void ],
+        # EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_line_char_last, [ :evas_textblock_cursor ], :void ],
+        # EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_pos_get, [ :evas_textblock_cursor ], :int ],
+        # EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
+        [ :evas_textblock_cursor_pos_set, [ :evas_textblock_cursor, :int ], :void ],
+        # EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
+        [ :evas_textblock_cursor_line_set, [ :evas_textblock_cursor, :int ], :bool ],
+        # EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
+        [ :evas_textblock_cursor_compare, [ :evas_textblock_cursor, :evas_textblock_cursor ], :int ],
+        # EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
+        [ :evas_textblock_cursor_copy, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
+        # EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
+        [ :evas_textblock_cursor_text_append, [ :evas_textblock_cursor, :string ], :int ],
+        # EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
+        [ :evas_textblock_cursor_text_prepend, [ :evas_textblock_cursor, :string ], :int ],
+        # EAPI Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
+        [ :evas_textblock_cursor_format_append, [ :evas_textblock_cursor, :string ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
+        [ :evas_textblock_cursor_format_prepend, [ :evas_textblock_cursor, :string ], :bool ],
+        # EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_char_delete, [ :evas_textblock_cursor ], :void ],
+        # EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
+        [ :evas_textblock_cursor_range_delete, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
+        # EAPI const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_text_get, [ :evas_textblock_cursor ], :string ],
+        # EAPI int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_paragraph_text_length_get, [ :evas_textblock_cursor ], :int ],
+        # EAPI Eina_Bool evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end);
+        [ :evas_textblock_cursor_visible_range_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :bool ],
+        # EAPI Eina_List *evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
+        [ :evas_textblock_cursor_range_formats_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
+        # EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
+        [ :evas_textblock_cursor_range_text_get, [ :evas_textblock_cursor, :evas_textblock_cursor, :evas_textblock_text_type ], :string ],
+        # EAPI char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_content_get, [ :evas_textblock_cursor ], :string ],
+        # EAPI Eina_Bool evas_textblock_cursor_geometry_bidi_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2, Evas_Textblock_Cursor_Type ctype);
+        [ :evas_textblock_cursor_geometry_bidi_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer,
+            :pointer, :evas_textblock_cursor_type ], :bool ],
+        # EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype);
+        [ :evas_textblock_cursor_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer, :pointer, :evas_textblock_cursor_type
+            ], :int ],
+        # EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+        [ :evas_textblock_cursor_char_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
+        # EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch);
+        [ :evas_textblock_cursor_pen_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
+        # EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+        [ :evas_textblock_cursor_line_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
+        # EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
+        [ :evas_textblock_cursor_char_coord_set, [ :evas_textblock_cursor, :int, :int ], :bool ],
+        # EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
+        [ :evas_textblock_cursor_line_coord_set, [ :evas_textblock_cursor, :int ], :int ],
+        # EAPI Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
+        [ :evas_textblock_cursor_range_geometry_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
+        # EAPI Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+        [ :evas_textblock_cursor_format_item_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        # EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
+        [ :evas_textblock_cursor_eol_get, [ :evas_textblock_cursor ], :bool ],
+        # EAPI void evas_smart_free(Evas_Smart *s);
+        [ :evas_smart_free, [ :evas_smart ], :void ],
+        # EAPI Evas_Smart *evas_smart_class_new(const Evas_Smart_Class *sc);
+        [ :evas_smart_class_new, [ :evas_smart_class ], :evas_smart ],
+        # EAPI const Evas_Smart_Class *evas_smart_class_get(const Evas_Smart *s);
+        [ :evas_smart_class_get, [ :evas_smart ], :evas_smart_class ],
+        # EAPI void *evas_smart_data_get(const Evas_Smart *s);
+        [ :evas_smart_data_get, [ :evas_smart ], :pointer ],
+        # EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count);
+        [ :evas_smart_callbacks_descriptions_get, [ :evas_smart, :pointer ], :evas_smart_cb_description ],
+        # EAPI const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name);
+        [ :evas_smart_callback_description_find, [ :evas_smart, :string ], :evas_smart_cb_description ],
+        # EAPI Eina_Bool evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size);
+        [ :evas_smart_class_inherit_full, [ :evas_smart_class, :evas_smart_class, :uint ], :bool ],
+        # EAPI int evas_smart_usage_get(const Evas_Smart *s);
+        [ :evas_smart_usage_get, [ :evas_smart ], :int ],
+        # EAPI void evas_smart_legacy_type_register(const char *type, const Eo_Class *klass);
+        [ :evas_smart_legacy_type_register, [ :string, :pointer ], :void ],
+        # EAPI void evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc);
+        [ :evas_object_smart_clipped_smart_set, [ :evas_smart_class ], :void ],
+        # EAPI const Evas_Smart_Class *evas_object_smart_clipped_class_get(void);
+        [ :evas_object_smart_clipped_class_get, [  ], :evas_smart_class ],
+        # EAPI void evas_object_box_smart_set(Evas_Object_Box_Api *api);
+        [ :evas_object_box_smart_set, [ :evas_object_box_api ], :void ],
+        # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get(void);
+        [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api ],
+        # EAPI Eina_Bool evas_cserve_want_get(void);
+        [ :evas_cserve_want_get, [  ], :bool ],
+        # EAPI Eina_Bool evas_cserve_connected_get(void);
+        [ :evas_cserve_connected_get, [  ], :bool ],
+        # EAPI Eina_Bool evas_cserve_stats_get(Evas_Cserve_Stats *stats);
+        [ :evas_cserve_stats_get, [ :evas_cserve_stats ], :bool ],
+        # EAPI void evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache);
+        [ :evas_cserve_image_cache_contents_clean, [ :evas_cserve_image_cache ], :void ],
+        # EAPI Eina_Bool evas_cserve_config_get(Evas_Cserve_Config *config);
+        [ :evas_cserve_config_get, [ :evas_cserve_config ], :bool ],
+        # EAPI Eina_Bool evas_cserve_config_set(const Evas_Cserve_Config *config);
+        [ :evas_cserve_config_set, [ :evas_cserve_config ], :bool ],
+        # EAPI void evas_cserve_disconnect(void);
+        [ :evas_cserve_disconnect, [  ], :void ],
+        # EAPI const char *evas_load_error_str(Evas_Load_Error error);
+        [ :evas_load_error_str, [ :evas_load_error ], :string ],
+        # EAPI void evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b);
+        [ :evas_color_hsv_to_rgb, [ :float, :float, :float, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v);
+        [ :evas_color_rgb_to_hsv, [ :int, :int, :int, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void evas_color_argb_premul(int a, int *r, int *g, int *b);
+        [ :evas_color_argb_premul, [ :int, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void evas_color_argb_unpremul(int a, int *r, int *g, int *b);
+        [ :evas_color_argb_unpremul, [ :int, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void evas_data_argb_premul(unsigned int *data, unsigned int len);
+        [ :evas_data_argb_premul, [ :pointer, :uint ], :void ],
+        # EAPI void evas_data_argb_unpremul(unsigned int *data, unsigned int len);
+        [ :evas_data_argb_unpremul, [ :pointer, :uint ], :void ],
+        # EAPI int evas_string_char_next_get(const char *str, int pos, int *decoded);
+        [ :evas_string_char_next_get, [ :string, :int, :pointer ], :int ],
+        # EAPI int evas_string_char_prev_get(const char *str, int pos, int *decoded);
+        [ :evas_string_char_prev_get, [ :string, :int, :pointer ], :int ],
+        # EAPI int evas_string_char_len_get(const char *str);
+        [ :evas_string_char_len_get, [ :string ], :int ],
+        # EAPI Eina_Bool evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname);
+        [ :evas_key_modifier_is_set, [ :evas_modifier, :string ], :bool ],
+        # EAPI Eina_Bool evas_key_lock_is_set(const Evas_Lock *l, const char *keyname);
+        [ :evas_key_lock_is_set, [ :evas_lock, :string ], :bool ],
         # EAPI Evas *evas_new(void);
-        [ :evas_new, [  ], :evas ],
+        [ :evas_new, [  ], :pointer ],
         # EAPI void evas_free(Evas *e);
-        [ :evas_free, [ :evas ], :void ],
+        [ :evas_free, [ :pointer ], :void ],
         # EAPI void evas_focus_in(Evas *e);
-        [ :evas_focus_in, [ :evas ], :void ],
+        [ :evas_focus_in, [ :pointer ], :void ],
         # EAPI void evas_focus_out(Evas *e);
-        [ :evas_focus_out, [ :evas ], :void ],
+        [ :evas_focus_out, [ :pointer ], :void ],
         # EAPI Eina_Bool evas_focus_state_get(const Evas *e);
-        [ :evas_focus_state_get, [ :evas ], :bool ],
+        [ :evas_focus_state_get, [ :pointer ], :bool ],
         # EAPI void evas_nochange_push(Evas *e);
-        [ :evas_nochange_push, [ :evas ], :void ],
+        [ :evas_nochange_push, [ :pointer ], :void ],
         # EAPI void evas_nochange_pop(Evas *e);
-        [ :evas_nochange_pop, [ :evas ], :void ],
+        [ :evas_nochange_pop, [ :pointer ], :void ],
         # EAPI void evas_data_attach_set(Evas *e, void *data);
-        [ :evas_data_attach_set, [ :evas, :pointer ], :void ],
+        [ :evas_data_attach_set, [ :pointer, :pointer ], :void ],
         # EAPI void *evas_data_attach_get(const Evas *e);
-        [ :evas_data_attach_get, [ :evas ], :pointer ],
+        [ :evas_data_attach_get, [ :pointer ], :pointer ],
         # EAPI void evas_damage_rectangle_add(Evas *e, int x, int y, int w, int h);
-        [ :evas_damage_rectangle_add, [ :evas, :int, :int, :int, :int ], :void ],
+        [ :evas_damage_rectangle_add, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_obscured_rectangle_add(Evas *e, int x, int y, int w, int h);
-        [ :evas_obscured_rectangle_add, [ :evas, :int, :int, :int, :int ], :void ],
+        [ :evas_obscured_rectangle_add, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_obscured_clear(Evas *e);
-        [ :evas_obscured_clear, [ :evas ], :void ],
+        [ :evas_obscured_clear, [ :pointer ], :void ],
+        # EAPI Eina_Bool evas_render_async(Evas *e);
+        [ :evas_render_async, [ :pointer ], :bool ],
         # EAPI Eina_List *evas_render_updates(Evas *e);
-        [ :evas_render_updates, [ :evas ], :eina_list ],
-        # EAPI void evas_render_updates_free(Eina_List *updates);
-        [ :evas_render_updates_free, [ :eina_list ], :void ],
+        [ :evas_render_updates, [ :pointer ], :eina_list ],
         # EAPI void evas_render(Evas *e);
-        [ :evas_render, [ :evas ], :void ],
+        [ :evas_render, [ :pointer ], :void ],
         # EAPI void evas_norender(Evas *e);
-        [ :evas_norender, [ :evas ], :void ],
+        [ :evas_norender, [ :pointer ], :void ],
         # EAPI void evas_render_idle_flush(Evas *e);
-        [ :evas_render_idle_flush, [ :evas ], :void ],
+        [ :evas_render_idle_flush, [ :pointer ], :void ],
         # EAPI void evas_render_dump(Evas *e);
-        [ :evas_render_dump, [ :evas ], :void ],
-        # EAPI int evas_render_method_lookup(const char *name);
-        [ :evas_render_method_lookup, [ :string ], :int ],
-        # EAPI Eina_List *evas_render_method_list(void);
-        [ :evas_render_method_list, [  ], :eina_list ],
-        # EAPI void evas_render_method_list_free(Eina_List *list);
-        [ :evas_render_method_list_free, [ :eina_list ], :void ],
+        [ :evas_render_dump, [ :pointer ], :void ],
         # EAPI void evas_output_method_set(Evas *e, int render_method);
-        [ :evas_output_method_set, [ :evas, :int ], :void ],
+        [ :evas_output_method_set, [ :pointer, :int ], :void ],
         # EAPI int evas_output_method_get(const Evas *e);
-        [ :evas_output_method_get, [ :evas ], :int ],
+        [ :evas_output_method_get, [ :pointer ], :int ],
         # EAPI Evas_Engine_Info *evas_engine_info_get(const Evas *e);
-        [ :evas_engine_info_get, [ :evas ], :evas_engine_info ],
+        [ :evas_engine_info_get, [ :pointer ], :evas_engine_info ],
         # EAPI Eina_Bool evas_engine_info_set(Evas *e, Evas_Engine_Info *info);
-        [ :evas_engine_info_set, [ :evas, :evas_engine_info ], :bool ],
+        [ :evas_engine_info_set, [ :pointer, :evas_engine_info ], :bool ],
         # EAPI void evas_output_size_set(Evas *e, int w, int h);
-        [ :evas_output_size_set, [ :evas, :int, :int ], :void ],
+        [ :evas_output_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_output_size_get(const Evas *e, int *w, int *h);
-        [ :evas_output_size_get, [ :evas, :pointer, :pointer ], :void ],
+        [ :evas_output_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_output_viewport_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_output_viewport_set, [ :evas, :int, :int, :int, :int ], :void ],
+        [ :evas_output_viewport_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_output_viewport_get(const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_output_viewport_get, [ :evas, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_output_viewport_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_output_framespace_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_output_framespace_set, [ :evas, :int, :int, :int, :int ], :void ],
+        [ :evas_output_framespace_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_output_framespace_get(const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_output_framespace_get, [ :evas, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_output_framespace_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Coord evas_coord_screen_x_to_world(const Evas *e, int x);
-        [ :evas_coord_screen_x_to_world, [ :evas, :int ], :int ],
+        [ :evas_coord_screen_x_to_world, [ :pointer, :int ], :int ],
         # EAPI Evas_Coord evas_coord_screen_y_to_world(const Evas *e, int y);
-        [ :evas_coord_screen_y_to_world, [ :evas, :int ], :int ],
+        [ :evas_coord_screen_y_to_world, [ :pointer, :int ], :int ],
         # EAPI int evas_coord_world_x_to_screen(const Evas *e, Evas_Coord x);
-        [ :evas_coord_world_x_to_screen, [ :evas, :int ], :int ],
+        [ :evas_coord_world_x_to_screen, [ :pointer, :int ], :int ],
         # EAPI int evas_coord_world_y_to_screen(const Evas *e, Evas_Coord y);
-        [ :evas_coord_world_y_to_screen, [ :evas, :int ], :int ],
+        [ :evas_coord_world_y_to_screen, [ :pointer, :int ], :int ],
         # EAPI void evas_pointer_output_xy_get(const Evas *e, int *x, int *y);
-        [ :evas_pointer_output_xy_get, [ :evas, :pointer, :pointer ], :void ],
+        [ :evas_pointer_output_xy_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_pointer_canvas_xy_get(const Evas *e, Evas_Coord *x, Evas_Coord *y);
-        [ :evas_pointer_canvas_xy_get, [ :evas, :pointer, :pointer ], :void ],
+        [ :evas_pointer_canvas_xy_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI int evas_pointer_button_down_mask_get(const Evas *e);
-        [ :evas_pointer_button_down_mask_get, [ :evas ], :int ],
+        [ :evas_pointer_button_down_mask_get, [ :pointer ], :int ],
         # EAPI Eina_Bool evas_pointer_inside_get(const Evas *e);
-        [ :evas_pointer_inside_get, [ :evas ], :bool ],
+        [ :evas_pointer_inside_get, [ :pointer ], :bool ],
         # EAPI void evas_sync(Evas *e);
-        [ :evas_sync, [ :evas ], :void ],
+        [ :evas_sync, [ :pointer ], :void ],
         # EAPI void evas_event_callback_add(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_add, [ :evas, :evas_callback_type, :evas_event_cb, :pointer ], :void ],
+        [ :evas_event_callback_add, [ :pointer, :evas_callback_type, :evas_event_cb, :pointer ], :void ],
         # EAPI void evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_priority_add, [ :evas, :evas_callback_type, :short, :evas_event_cb, :pointer ], :void ],
+        [ :evas_event_callback_priority_add, [ :pointer, :evas_callback_type, :eo_callback_priority, :evas_event_cb, :pointer ], :void ],
         # EAPI void *evas_event_callback_del(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func);
-        [ :evas_event_callback_del, [ :evas, :evas_callback_type, :evas_event_cb ], :pointer ],
+        [ :evas_event_callback_del, [ :pointer, :evas_callback_type, :evas_event_cb ], :pointer ],
         # EAPI void *evas_event_callback_del_full(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data);
-        [ :evas_event_callback_del_full, [ :evas, :evas_callback_type, :evas_event_cb, :pointer ], :pointer ],
+        [ :evas_event_callback_del_full, [ :pointer, :evas_callback_type, :evas_event_cb, :pointer ], :pointer ],
         # EAPI void evas_post_event_callback_push(Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
-        [ :evas_post_event_callback_push, [ :evas, :evas_object_event_post_cb, :pointer ], :void ],
+        [ :evas_post_event_callback_push, [ :pointer, :evas_object_event_post_cb, :pointer ], :void ],
         # EAPI void evas_post_event_callback_remove(Evas *e, Evas_Object_Event_Post_Cb func);
-        [ :evas_post_event_callback_remove, [ :evas, :evas_object_event_post_cb ], :void ],
+        [ :evas_post_event_callback_remove, [ :pointer, :evas_object_event_post_cb ], :void ],
         # EAPI void evas_post_event_callback_remove_full(Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
-        [ :evas_post_event_callback_remove_full, [ :evas, :evas_object_event_post_cb, :pointer ], :void ],
+        [ :evas_post_event_callback_remove_full, [ :pointer, :evas_object_event_post_cb, :pointer ], :void ],
         # EAPI void evas_event_default_flags_set(Evas *e, Evas_Event_Flags flags);
-        [ :evas_event_default_flags_set, [ :evas, :evas_event_flags ], :void ],
+        [ :evas_event_default_flags_set, [ :pointer, :evas_event_flags ], :void ],
         # EAPI Evas_Event_Flags evas_event_default_flags_get(const Evas *e);
-        [ :evas_event_default_flags_get, [ :evas ], :evas_event_flags ],
+        [ :evas_event_default_flags_get, [ :pointer ], :evas_event_flags ],
         # EAPI void evas_event_freeze(Evas *e);
-        [ :evas_event_freeze, [ :evas ], :void ],
+        [ :evas_event_freeze, [ :pointer ], :void ],
         # EAPI void evas_event_thaw(Evas *e);
-        [ :evas_event_thaw, [ :evas ], :void ],
+        [ :evas_event_thaw, [ :pointer ], :void ],
         # EAPI int evas_event_freeze_get(const Evas *e);
-        [ :evas_event_freeze_get, [ :evas ], :int ],
+        [ :evas_event_freeze_get, [ :pointer ], :int ],
         # EAPI void evas_event_thaw_eval(Evas *e);
-        [ :evas_event_thaw_eval, [ :evas ], :void ],
+        [ :evas_event_thaw_eval, [ :pointer ], :void ],
         # EAPI int evas_event_down_count_get(const Evas *e);
-        [ :evas_event_down_count_get, [ :evas ], :int ],
+        [ :evas_event_down_count_get, [ :pointer ], :int ],
         # EAPI void evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_down, [ :evas, :int, :evas_button_flags, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_down, [ :pointer, :int, :evas_button_flags, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_up, [ :evas, :int, :evas_button_flags, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_up, [ :pointer, :int, :evas_button_flags, :uint, :pointer ], :void ],
+        # EAPI void evas_event_input_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const void *data);
+        [ :evas_event_input_mouse_move, [ :pointer, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_move, [ :evas, :int, :int, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_move, [ :pointer, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_in(Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_in, [ :evas, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_in, [ :pointer, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_out, [ :evas, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_out, [ :pointer, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_down(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_down, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
-            :uint, :pointer ], :void ],
+        [ :evas_event_feed_multi_down, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double,
+            :evas_button_flags, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_up(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_up, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
+        [ :evas_event_feed_multi_up, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
             :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_multi_move(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_multi_move, [ :evas, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :pointer ],
+        [ :evas_event_feed_multi_move, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :pointer ],
             :void ],
+        # EAPI void evas_event_input_multi_down(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+        [ :evas_event_input_multi_down, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double,
+            :evas_button_flags, :uint, :pointer ], :void ],
+        # EAPI void evas_event_input_multi_up(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+        [ :evas_event_input_multi_up, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :evas_button_flags,
+            :uint, :pointer ], :void ],
+        # EAPI void evas_event_input_multi_move(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
+        [ :evas_event_input_multi_move, [ :pointer, :int, :int, :int, :double, :double, :double, :double, :double, :double, :double, :uint, :pointer
+            ], :void ],
         # EAPI void evas_event_feed_mouse_cancel(Evas *e, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_cancel, [ :evas, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_cancel, [ :pointer, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_mouse_wheel(Evas *e, int direction, int z, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_mouse_wheel, [ :evas, :int, :int, :uint, :pointer ], :void ],
+        [ :evas_event_feed_mouse_wheel, [ :pointer, :int, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_key_down, [ :evas, :string, :string, :string, :string, :uint, :pointer ], :void ],
+        [ :evas_event_feed_key_down, [ :pointer, :string, :string, :string, :string, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_key_up, [ :evas, :string, :string, :string, :string, :uint, :pointer ], :void ],
+        [ :evas_event_feed_key_up, [ :pointer, :string, :string, :string, :string, :uint, :pointer ], :void ],
         # EAPI void evas_event_feed_hold(Evas *e, int hold, unsigned int timestamp, const void *data);
-        [ :evas_event_feed_hold, [ :evas, :int, :uint, :pointer ], :void ],
+        [ :evas_event_feed_hold, [ :pointer, :int, :uint, :pointer ], :void ],
         # EAPI void evas_event_refeed_event(Evas *e, void *event_copy, Evas_Callback_Type event_type);
-        [ :evas_event_refeed_event, [ :evas, :pointer, :evas_callback_type ], :void ],
+        [ :evas_event_refeed_event, [ :pointer, :pointer, :evas_callback_type ], :void ],
+        # EAPI Eina_List *evas_tree_objects_at_xy_get(Evas *eo_e, Evas_Object *stop, int x, int y);
+        [ :evas_tree_objects_at_xy_get, [ :pointer, :pointer, :int, :int ], :eina_list ],
         # EAPI void evas_image_cache_flush(Evas *e);
-        [ :evas_image_cache_flush, [ :evas ], :void ],
+        [ :evas_image_cache_flush, [ :pointer ], :void ],
         # EAPI void evas_image_cache_reload(Evas *e);
-        [ :evas_image_cache_reload, [ :evas ], :void ],
+        [ :evas_image_cache_reload, [ :pointer ], :void ],
         # EAPI void evas_image_cache_set(Evas *e, int size);
-        [ :evas_image_cache_set, [ :evas, :int ], :void ],
+        [ :evas_image_cache_set, [ :pointer, :int ], :void ],
         # EAPI int evas_image_cache_get(const Evas *e);
-        [ :evas_image_cache_get, [ :evas ], :int ],
+        [ :evas_image_cache_get, [ :pointer ], :int ],
         # EAPI Eina_Bool evas_image_max_size_get(const Evas *e, int *maxw, int *maxh);
-        [ :evas_image_max_size_get, [ :evas, :pointer, :pointer ], :bool ],
+        [ :evas_image_max_size_get, [ :pointer, :pointer, :pointer ], :bool ],
         # EAPI void evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting);
-        [ :evas_font_hinting_set, [ :evas, :evas_font_hinting_flags ], :void ],
+        [ :evas_font_hinting_set, [ :pointer, :evas_font_hinting_flags ], :void ],
         # EAPI Evas_Font_Hinting_Flags evas_font_hinting_get(const Evas *e);
-        [ :evas_font_hinting_get, [ :evas ], :evas_font_hinting_flags ],
+        [ :evas_font_hinting_get, [ :pointer ], :evas_font_hinting_flags ],
         # EAPI Eina_Bool evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags hinting);
-        [ :evas_font_hinting_can_hint, [ :evas, :evas_font_hinting_flags ], :bool ],
+        [ :evas_font_hinting_can_hint, [ :pointer, :evas_font_hinting_flags ], :bool ],
         # EAPI void evas_font_cache_flush(Evas *e);
-        [ :evas_font_cache_flush, [ :evas ], :void ],
+        [ :evas_font_cache_flush, [ :pointer ], :void ],
         # EAPI void evas_font_cache_set(Evas *e, int size);
-        [ :evas_font_cache_set, [ :evas, :int ], :void ],
+        [ :evas_font_cache_set, [ :pointer, :int ], :void ],
         # EAPI int evas_font_cache_get(const Evas *e);
-        [ :evas_font_cache_get, [ :evas ], :int ],
+        [ :evas_font_cache_get, [ :pointer ], :int ],
         # EAPI Eina_List *evas_font_available_list(const Evas *e);
-        [ :evas_font_available_list, [ :evas ], :eina_list ],
+        [ :evas_font_available_list, [ :pointer ], :eina_list ],
         # EAPI void evas_font_available_list_free(Evas *e, Eina_List *available);
-        [ :evas_font_available_list_free, [ :evas, :eina_list ], :void ],
+        [ :evas_font_available_list_free, [ :pointer, :eina_list ], :void ],
         # EAPI void evas_font_path_clear(Evas *e);
-        [ :evas_font_path_clear, [ :evas ], :void ],
+        [ :evas_font_path_clear, [ :pointer ], :void ],
         # EAPI void evas_font_path_append(Evas *e, const char *path);
-        [ :evas_font_path_append, [ :evas, :string ], :void ],
+        [ :evas_font_path_append, [ :pointer, :string ], :void ],
         # EAPI void evas_font_path_prepend(Evas *e, const char *path);
-        [ :evas_font_path_prepend, [ :evas, :string ], :void ],
+        [ :evas_font_path_prepend, [ :pointer, :string ], :void ],
         # EAPI const Eina_List *evas_font_path_list(const Evas *e);
-        [ :evas_font_path_list, [ :evas ], :eina_list ],
+        [ :evas_font_path_list, [ :pointer ], :eina_list ],
         # EAPI void evas_object_clip_set(Evas_Object *obj, Evas_Object *clip);
-        [ :evas_object_clip_set, [ :evas_object, :evas_object ], :void ],
+        [ :evas_object_clip_set, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_clip_get(const Evas_Object *obj);
-        [ :evas_object_clip_get, [ :evas_object ], :evas_object ],
+        [ :evas_object_clip_get, [ :pointer ], :pointer ],
         # EAPI void evas_object_clip_unset(Evas_Object *obj);
-        [ :evas_object_clip_unset, [ :evas_object ], :void ],
+        [ :evas_object_clip_unset, [ :pointer ], :void ],
         # EAPI const Eina_List *evas_object_clipees_get(const Evas_Object *obj);
-        [ :evas_object_clipees_get, [ :evas_object ], :eina_list ],
+        [ :evas_object_clipees_get, [ :pointer ], :eina_list ],
+        # EAPI Eina_Bool evas_object_clipees_has(const Evas_Object *eo_obj);
+        [ :evas_object_clipees_has, [ :pointer ], :bool ],
         # EAPI void evas_object_focus_set(Evas_Object *obj, Eina_Bool focus);
-        [ :evas_object_focus_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_focus_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_focus_get(const Evas_Object *obj);
-        [ :evas_object_focus_get, [ :evas_object ], :bool ],
+        [ :evas_object_focus_get, [ :pointer ], :bool ],
         # EAPI void evas_object_layer_set(Evas_Object *obj, short l);
-        [ :evas_object_layer_set, [ :evas_object, :short ], :void ],
+        [ :evas_object_layer_set, [ :pointer, :short ], :void ],
         # EAPI short evas_object_layer_get(const Evas_Object *obj);
-        [ :evas_object_layer_get, [ :evas_object ], :short ],
+        [ :evas_object_layer_get, [ :pointer ], :short ],
         # EAPI void evas_object_name_set(Evas_Object *obj, const char *name);
-        [ :evas_object_name_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_name_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_name_get(const Evas_Object *obj);
-        [ :evas_object_name_get, [ :evas_object ], :string ],
+        [ :evas_object_name_get, [ :pointer ], :string ],
         # EAPI void evas_object_ref(Evas_Object *obj);
-        [ :evas_object_ref, [ :evas_object ], :void ],
+        [ :evas_object_ref, [ :pointer ], :void ],
         # EAPI void evas_object_unref(Evas_Object *obj);
-        [ :evas_object_unref, [ :evas_object ], :void ],
+        [ :evas_object_unref, [ :pointer ], :void ],
         # EAPI int evas_object_ref_get(const Evas_Object *obj);
-        [ :evas_object_ref_get, [ :evas_object ], :int ],
+        [ :evas_object_ref_get, [ :pointer ], :int ],
         # EAPI void evas_object_del(Evas_Object *obj);
-        [ :evas_object_del, [ :evas_object ], :void ],
+        [ :evas_object_del, [ :pointer ], :void ],
         # EAPI void evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_move, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_move, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_resize, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_resize, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_geometry_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+        [ :evas_object_geometry_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_show(Evas_Object *obj);
-        [ :evas_object_show, [ :evas_object ], :void ],
+        [ :evas_object_show, [ :pointer ], :void ],
         # EAPI void evas_object_hide(Evas_Object *obj);
-        [ :evas_object_hide, [ :evas_object ], :void ],
+        [ :evas_object_hide, [ :pointer ], :void ],
         # EAPI Eina_Bool evas_object_visible_get(const Evas_Object *obj);
-        [ :evas_object_visible_get, [ :evas_object ], :bool ],
+        [ :evas_object_visible_get, [ :pointer ], :bool ],
         # EAPI void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas *evas_object_evas_get(const Evas_Object *obj);
-        [ :evas_object_evas_get, [ :evas_object ], :evas ],
+        [ :evas_object_evas_get, [ :pointer ], :pointer ],
         # EAPI const char *evas_object_type_get(const Evas_Object *obj);
-        [ :evas_object_type_get, [ :evas_object ], :string ],
+        [ :evas_object_type_get, [ :pointer ], :string ],
         # EAPI void evas_object_raise(Evas_Object *obj);
-        [ :evas_object_raise, [ :evas_object ], :void ],
+        [ :evas_object_raise, [ :pointer ], :void ],
         # EAPI void evas_object_lower(Evas_Object *obj);
-        [ :evas_object_lower, [ :evas_object ], :void ],
+        [ :evas_object_lower, [ :pointer ], :void ],
         # EAPI void evas_object_stack_above(Evas_Object *obj, Evas_Object *above);
-        [ :evas_object_stack_above, [ :evas_object, :evas_object ], :void ],
+        [ :evas_object_stack_above, [ :pointer, :pointer ], :void ],
         # EAPI void evas_object_stack_below(Evas_Object *obj, Evas_Object *below);
-        [ :evas_object_stack_below, [ :evas_object, :evas_object ], :void ],
+        [ :evas_object_stack_below, [ :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_above_get(const Evas_Object *obj);
-        [ :evas_object_above_get, [ :evas_object ], :evas_object ],
+        [ :evas_object_above_get, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_below_get(const Evas_Object *obj);
-        [ :evas_object_below_get, [ :evas_object ], :evas_object ],
+        [ :evas_object_below_get, [ :pointer ], :pointer ],
         # EAPI void evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_add, [ :evas_object, :evas_callback_type, :evas_object_event_cb, :pointer ], :void ],
+        [ :evas_object_event_callback_add, [ :pointer, :evas_callback_type, :evas_object_event_cb, :pointer ], :void ],
         # EAPI void evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_priority_add, [ :evas_object, :evas_callback_type, :short, :evas_object_event_cb, :pointer ], :void ],
+        [ :evas_object_event_callback_priority_add, [ :pointer, :evas_callback_type, :eo_callback_priority, :evas_object_event_cb, :pointer ], :void
+            ],
         # EAPI void *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func);
-        [ :evas_object_event_callback_del, [ :evas_object, :evas_callback_type, :evas_object_event_cb ], :pointer ],
+        [ :evas_object_event_callback_del, [ :pointer, :evas_callback_type, :evas_object_event_cb ], :pointer ],
         # EAPI void *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data);
-        [ :evas_object_event_callback_del_full, [ :evas_object, :evas_callback_type, :evas_object_event_cb, :pointer ], :pointer ],
+        [ :evas_object_event_callback_del_full, [ :pointer, :evas_callback_type, :evas_object_event_cb, :pointer ], :pointer ],
         # EAPI void evas_object_pass_events_set(Evas_Object *obj, Eina_Bool pass);
-        [ :evas_object_pass_events_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_pass_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_pass_events_get(const Evas_Object *obj);
-        [ :evas_object_pass_events_get, [ :evas_object ], :bool ],
+        [ :evas_object_pass_events_get, [ :pointer ], :bool ],
         # EAPI void evas_object_repeat_events_set(Evas_Object *obj, Eina_Bool repeat);
-        [ :evas_object_repeat_events_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_repeat_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_repeat_events_get(const Evas_Object *obj);
-        [ :evas_object_repeat_events_get, [ :evas_object ], :bool ],
+        [ :evas_object_repeat_events_get, [ :pointer ], :bool ],
         # EAPI void evas_object_propagate_events_set(Evas_Object *obj, Eina_Bool prop);
-        [ :evas_object_propagate_events_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_propagate_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_propagate_events_get(const Evas_Object *obj);
-        [ :evas_object_propagate_events_get, [ :evas_object ], :bool ],
+        [ :evas_object_propagate_events_get, [ :pointer ], :bool ],
         # EAPI void evas_object_freeze_events_set(Evas_Object *obj, Eina_Bool freeze);
-        [ :evas_object_freeze_events_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_freeze_events_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_freeze_events_get(const Evas_Object *obj);
-        [ :evas_object_freeze_events_get, [ :evas_object ], :bool ],
+        [ :evas_object_freeze_events_get, [ :pointer ], :bool ],
         # EAPI void evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled);
-        [ :evas_object_map_enable_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_map_enable_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_map_enable_get(const Evas_Object *obj);
-        [ :evas_object_map_enable_get, [ :evas_object ], :bool ],
+        [ :evas_object_map_enable_get, [ :pointer ], :bool ],
         # EAPI void evas_object_map_set(Evas_Object *obj, const Evas_Map *map);
-        [ :evas_object_map_set, [ :evas_object, :evas_map ], :void ],
+        [ :evas_object_map_set, [ :pointer, :evas_map ], :void ],
         # EAPI const Evas_Map *evas_object_map_get(const Evas_Object *obj);
-        [ :evas_object_map_get, [ :evas_object ], :evas_map ],
-        # EAPI void evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *obj, Evas_Coord z);
-        [ :evas_map_util_points_populate_from_object_full, [ :evas_map, :evas_object, :int ], :void ],
-        # EAPI void evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *obj);
-        [ :evas_map_util_points_populate_from_object, [ :evas_map, :evas_object ], :void ],
-        # EAPI void evas_map_util_points_populate_from_geometry(Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Coord z);
-        [ :evas_map_util_points_populate_from_geometry, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
-        # EAPI void evas_map_util_points_color_set(Evas_Map *m, int r, int g, int b, int a);
-        [ :evas_map_util_points_color_set, [ :evas_map, :int, :int, :int, :int ], :void ],
-        # EAPI void evas_map_util_rotate(Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy);
-        [ :evas_map_util_rotate, [ :evas_map, :double, :int, :int ], :void ],
-        # EAPI void evas_map_util_zoom(Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy);
-        [ :evas_map_util_zoom, [ :evas_map, :double, :double, :int, :int ], :void ],
-        # EAPI void evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz);
-        [ :evas_map_util_3d_rotate, [ :evas_map, :double, :double, :double, :int, :int, :int ], :void ],
-        # EAPI void evas_map_util_3d_lighting(Evas_Map *m, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab);
-        [ :evas_map_util_3d_lighting, [ :evas_map, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :void ],
-        # EAPI void evas_map_util_3d_perspective(Evas_Map *m, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
-        [ :evas_map_util_3d_perspective, [ :evas_map, :int, :int, :int, :int ], :void ],
-        # EAPI Eina_Bool evas_map_util_clockwise_get(Evas_Map *m);
-        [ :evas_map_util_clockwise_get, [ :evas_map ], :bool ],
-        # EAPI Evas_Map *evas_map_new(int count);
-        [ :evas_map_new, [ :int ], :evas_map ],
-        # EAPI void evas_map_smooth_set(Evas_Map *m, Eina_Bool enabled);
-        [ :evas_map_smooth_set, [ :evas_map, :bool ], :void ],
-        # EAPI Eina_Bool evas_map_smooth_get(const Evas_Map *m);
-        [ :evas_map_smooth_get, [ :evas_map ], :bool ],
-        # EAPI void evas_map_alpha_set(Evas_Map *m, Eina_Bool enabled);
-        [ :evas_map_alpha_set, [ :evas_map, :bool ], :void ],
-        # EAPI Eina_Bool evas_map_alpha_get(const Evas_Map *m);
-        [ :evas_map_alpha_get, [ :evas_map ], :bool ],
-        # EAPI Evas_Map *evas_map_dup(const Evas_Map *m);
-        [ :evas_map_dup, [ :evas_map ], :evas_map ],
-        # EAPI void evas_map_free(Evas_Map *m);
-        [ :evas_map_free, [ :evas_map ], :void ],
-        # EAPI int evas_map_count_get(const Evas_Map *m);
-        [ :evas_map_count_get, [ :evas_map ], :int ],
-        # EAPI void evas_map_point_coord_set(Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z);
-        [ :evas_map_point_coord_set, [ :evas_map, :int, :int, :int, :int ], :void ],
-        # EAPI void evas_map_point_coord_get(const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z);
-        [ :evas_map_point_coord_get, [ :evas_map, :int, :pointer, :pointer, :pointer ], :void ],
-        # EAPI void evas_map_point_image_uv_set(Evas_Map *m, int idx, double u, double v);
-        [ :evas_map_point_image_uv_set, [ :evas_map, :int, :double, :double ], :void ],
-        # EAPI void evas_map_point_image_uv_get(const Evas_Map *m, int idx, double *u, double *v);
-        [ :evas_map_point_image_uv_get, [ :evas_map, :int, :pointer, :pointer ], :void ],
-        # EAPI void evas_map_point_color_set(Evas_Map *m, int idx, int r, int g, int b, int a);
-        [ :evas_map_point_color_set, [ :evas_map, :int, :int, :int, :int, :int ], :void ],
-        # EAPI void evas_map_point_color_get(const Evas_Map *m, int idx, int *r, int *g, int *b, int *a);
-        [ :evas_map_point_color_get, [ :evas_map, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_map_get, [ :pointer ], :evas_map ],
         # EAPI void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_min_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_min_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_min_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_size_hint_min_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_max_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_max_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_max_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_size_hint_max_set, [ :pointer, :int, :int ], :void ],
+        # EAPI Evas_Display_Mode evas_object_size_hint_display_mode_get(const Evas_Object *obj);
+        [ :evas_object_size_hint_display_mode_get, [ :pointer ], :evas_display_mode ],
+        # EAPI void evas_object_size_hint_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode);
+        [ :evas_object_size_hint_display_mode_set, [ :pointer, :evas_display_mode ], :void ],
         # EAPI void evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_request_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_request_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_request_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_size_hint_request_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_size_hint_aspect_get, [ :evas_object, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_aspect_get, [ :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_size_hint_aspect_set, [ :evas_object, :evas_aspect_control, :int, :int ], :void ],
+        [ :evas_object_size_hint_aspect_set, [ :pointer, :evas_aspect_control, :int, :int ], :void ],
         # EAPI void evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y);
-        [ :evas_object_size_hint_align_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_align_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_align_set(Evas_Object *obj, double x, double y);
-        [ :evas_object_size_hint_align_set, [ :evas_object, :double, :double ], :void ],
+        [ :evas_object_size_hint_align_set, [ :pointer, :double, :double ], :void ],
         # EAPI void evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y);
-        [ :evas_object_size_hint_weight_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_weight_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y);
-        [ :evas_object_size_hint_weight_set, [ :evas_object, :double, :double ], :void ],
+        [ :evas_object_size_hint_weight_set, [ :pointer, :double, :double ], :void ],
         # EAPI void evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        [ :evas_object_size_hint_padding_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_size_hint_padding_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b);
-        [ :evas_object_size_hint_padding_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_size_hint_padding_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_data_set(Evas_Object *obj, const char *key, const void *data);
-        [ :evas_object_data_set, [ :evas_object, :string, :pointer ], :void ],
+        [ :evas_object_data_set, [ :pointer, :string, :pointer ], :void ],
         # EAPI void *evas_object_data_get(const Evas_Object *obj, const char *key);
-        [ :evas_object_data_get, [ :evas_object, :string ], :pointer ],
+        [ :evas_object_data_get, [ :pointer, :string ], :pointer ],
         # EAPI void *evas_object_data_del(Evas_Object *obj, const char *key);
-        [ :evas_object_data_del, [ :evas_object, :string ], :pointer ],
+        [ :evas_object_data_del, [ :pointer, :string ], :pointer ],
         # EAPI void evas_object_pointer_mode_set(Evas_Object *obj, Evas_Object_Pointer_Mode setting);
-        [ :evas_object_pointer_mode_set, [ :evas_object, :evas_object_pointer_mode ], :void ],
+        [ :evas_object_pointer_mode_set, [ :pointer, :evas_object_pointer_mode ], :void ],
         # EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Evas_Object *obj);
-        [ :evas_object_pointer_mode_get, [ :evas_object ], :evas_object_pointer_mode ],
+        [ :evas_object_pointer_mode_get, [ :pointer ], :evas_object_pointer_mode ],
         # EAPI void evas_object_anti_alias_set(Evas_Object *obj, Eina_Bool antialias);
-        [ :evas_object_anti_alias_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_anti_alias_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_anti_alias_get(const Evas_Object *obj);
-        [ :evas_object_anti_alias_get, [ :evas_object ], :bool ],
+        [ :evas_object_anti_alias_get, [ :pointer ], :bool ],
         # EAPI void evas_object_scale_set(Evas_Object *obj, double scale);
-        [ :evas_object_scale_set, [ :evas_object, :double ], :void ],
+        [ :evas_object_scale_set, [ :pointer, :double ], :void ],
         # EAPI double evas_object_scale_get(const Evas_Object *obj);
-        [ :evas_object_scale_get, [ :evas_object ], :double ],
+        [ :evas_object_scale_get, [ :pointer ], :double ],
         # EAPI void evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op op);
-        [ :evas_object_render_op_set, [ :evas_object, :evas_render_op ], :void ],
+        [ :evas_object_render_op_set, [ :pointer, :evas_render_op ], :void ],
         # EAPI Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj);
-        [ :evas_object_render_op_get, [ :evas_object ], :evas_render_op ],
+        [ :evas_object_render_op_get, [ :pointer ], :evas_render_op ],
         # EAPI void evas_object_precise_is_inside_set(Evas_Object *obj, Eina_Bool precise);
-        [ :evas_object_precise_is_inside_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_precise_is_inside_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_precise_is_inside_get(const Evas_Object *obj);
-        [ :evas_object_precise_is_inside_get, [ :evas_object ], :bool ],
+        [ :evas_object_precise_is_inside_get, [ :pointer ], :bool ],
         # EAPI void evas_object_static_clip_set(Evas_Object *obj, Eina_Bool is_static_clip);
-        [ :evas_object_static_clip_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_static_clip_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_static_clip_get(const Evas_Object *obj);
-        [ :evas_object_static_clip_get, [ :evas_object ], :bool ],
+        [ :evas_object_static_clip_get, [ :pointer ], :bool ],
         # EAPI Evas_Object *evas_focus_get(const Evas *e);
-        [ :evas_focus_get, [ :evas ], :evas_object ],
+        [ :evas_focus_get, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_name_find(const Evas *e, const char *name);
-        [ :evas_object_name_find, [ :evas, :string ], :evas_object ],
+        [ :evas_object_name_find, [ :pointer, :string ], :pointer ],
         # EAPI Evas_Object *evas_object_name_child_find(const Evas_Object *obj, const char *name, int recurse);
-        [ :evas_object_name_child_find, [ :evas_object, :string, :int ], :evas_object ],
+        [ :evas_object_name_child_find, [ :pointer, :string, :int ], :pointer ],
         # EAPI Evas_Object *evas_object_top_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_object_top_at_xy_get, [ :evas, :int, :int, :bool, :bool ], :evas_object ],
+        [ :evas_object_top_at_xy_get, [ :pointer, :int, :int, :bool, :bool ], :pointer ],
         # EAPI Evas_Object *evas_object_top_at_pointer_get(const Evas *e);
-        [ :evas_object_top_at_pointer_get, [ :evas ], :evas_object ],
+        [ :evas_object_top_at_pointer_get, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_top_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_object_top_in_rectangle_get, [ :evas, :int, :int, :int, :int, :bool, :bool ], :evas_object ],
+        [ :evas_object_top_in_rectangle_get, [ :pointer, :int, :int, :int, :int, :bool, :bool ], :pointer ],
         # EAPI Eina_List *evas_objects_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_objects_at_xy_get, [ :evas, :int, :int, :bool, :bool ], :eina_list ],
+        [ :evas_objects_at_xy_get, [ :pointer, :int, :int, :bool, :bool ], :eina_list ],
         # EAPI Eina_List *evas_objects_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
-        [ :evas_objects_in_rectangle_get, [ :evas, :int, :int, :int, :int, :bool, :bool ], :eina_list ],
+        [ :evas_objects_in_rectangle_get, [ :pointer, :int, :int, :int, :int, :bool, :bool ], :eina_list ],
         # EAPI Evas_Object *evas_object_bottom_get(const Evas *e);
-        [ :evas_object_bottom_get, [ :evas ], :evas_object ],
+        [ :evas_object_bottom_get, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_top_get(const Evas *e);
-        [ :evas_object_top_get, [ :evas ], :evas_object ],
+        [ :evas_object_top_get, [ :pointer ], :pointer ],
         # EAPI void evas_object_intercept_show_callback_add(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data);
-        [ :evas_object_intercept_show_callback_add, [ :evas_object, :evas_object_intercept_show_cb, :pointer ], :void ],
+        [ :evas_object_intercept_show_callback_add, [ :pointer, :evas_object_intercept_show_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func);
-        [ :evas_object_intercept_show_callback_del, [ :evas_object, :evas_object_intercept_show_cb ], :pointer ],
+        [ :evas_object_intercept_show_callback_del, [ :pointer, :evas_object_intercept_show_cb ], :pointer ],
         # EAPI void evas_object_intercept_hide_callback_add(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data);
-        [ :evas_object_intercept_hide_callback_add, [ :evas_object, :evas_object_intercept_hide_cb, :pointer ], :void ],
+        [ :evas_object_intercept_hide_callback_add, [ :pointer, :evas_object_intercept_hide_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func);
-        [ :evas_object_intercept_hide_callback_del, [ :evas_object, :evas_object_intercept_hide_cb ], :pointer ],
+        [ :evas_object_intercept_hide_callback_del, [ :pointer, :evas_object_intercept_hide_cb ], :pointer ],
         # EAPI void evas_object_intercept_move_callback_add(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data);
-        [ :evas_object_intercept_move_callback_add, [ :evas_object, :evas_object_intercept_move_cb, :pointer ], :void ],
+        [ :evas_object_intercept_move_callback_add, [ :pointer, :evas_object_intercept_move_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_move_callback_del(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func);
-        [ :evas_object_intercept_move_callback_del, [ :evas_object, :evas_object_intercept_move_cb ], :pointer ],
+        [ :evas_object_intercept_move_callback_del, [ :pointer, :evas_object_intercept_move_cb ], :pointer ],
         # EAPI void evas_object_intercept_resize_callback_add(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data);
-        [ :evas_object_intercept_resize_callback_add, [ :evas_object, :evas_object_intercept_resize_cb, :pointer ], :void ],
+        [ :evas_object_intercept_resize_callback_add, [ :pointer, :evas_object_intercept_resize_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_resize_callback_del(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func);
-        [ :evas_object_intercept_resize_callback_del, [ :evas_object, :evas_object_intercept_resize_cb ], :pointer ],
+        [ :evas_object_intercept_resize_callback_del, [ :pointer, :evas_object_intercept_resize_cb ], :pointer ],
         # EAPI void evas_object_intercept_raise_callback_add(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data);
-        [ :evas_object_intercept_raise_callback_add, [ :evas_object, :evas_object_intercept_raise_cb, :pointer ], :void ],
+        [ :evas_object_intercept_raise_callback_add, [ :pointer, :evas_object_intercept_raise_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_raise_callback_del(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func);
-        [ :evas_object_intercept_raise_callback_del, [ :evas_object, :evas_object_intercept_raise_cb ], :pointer ],
+        [ :evas_object_intercept_raise_callback_del, [ :pointer, :evas_object_intercept_raise_cb ], :pointer ],
         # EAPI void evas_object_intercept_lower_callback_add(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data);
-        [ :evas_object_intercept_lower_callback_add, [ :evas_object, :evas_object_intercept_lower_cb, :pointer ], :void ],
+        [ :evas_object_intercept_lower_callback_add, [ :pointer, :evas_object_intercept_lower_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_lower_callback_del(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func);
-        [ :evas_object_intercept_lower_callback_del, [ :evas_object, :evas_object_intercept_lower_cb ], :pointer ],
+        [ :evas_object_intercept_lower_callback_del, [ :pointer, :evas_object_intercept_lower_cb ], :pointer ],
         # EAPI void evas_object_intercept_stack_above_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data);
-        [ :evas_object_intercept_stack_above_callback_add, [ :evas_object, :evas_object_intercept_stack_above_cb, :pointer ], :void ],
+        [ :evas_object_intercept_stack_above_callback_add, [ :pointer, :evas_object_intercept_stack_above_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_stack_above_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func);
-        [ :evas_object_intercept_stack_above_callback_del, [ :evas_object, :evas_object_intercept_stack_above_cb ], :pointer ],
+        [ :evas_object_intercept_stack_above_callback_del, [ :pointer, :evas_object_intercept_stack_above_cb ], :pointer ],
         # EAPI void evas_object_intercept_stack_below_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data);
-        [ :evas_object_intercept_stack_below_callback_add, [ :evas_object, :evas_object_intercept_stack_below_cb, :pointer ], :void ],
+        [ :evas_object_intercept_stack_below_callback_add, [ :pointer, :evas_object_intercept_stack_below_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_stack_below_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func);
-        [ :evas_object_intercept_stack_below_callback_del, [ :evas_object, :evas_object_intercept_stack_below_cb ], :pointer ],
+        [ :evas_object_intercept_stack_below_callback_del, [ :pointer, :evas_object_intercept_stack_below_cb ], :pointer ],
         # EAPI void evas_object_intercept_layer_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data);
-        [ :evas_object_intercept_layer_set_callback_add, [ :evas_object, :evas_object_intercept_layer_set_cb, :pointer ], :void ],
+        [ :evas_object_intercept_layer_set_callback_add, [ :pointer, :evas_object_intercept_layer_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_layer_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func);
-        [ :evas_object_intercept_layer_set_callback_del, [ :evas_object, :evas_object_intercept_layer_set_cb ], :pointer ],
+        [ :evas_object_intercept_layer_set_callback_del, [ :pointer, :evas_object_intercept_layer_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_color_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data);
-        [ :evas_object_intercept_color_set_callback_add, [ :evas_object, :evas_object_intercept_color_set_cb, :pointer ], :void ],
+        [ :evas_object_intercept_color_set_callback_add, [ :pointer, :evas_object_intercept_color_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_color_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func);
-        [ :evas_object_intercept_color_set_callback_del, [ :evas_object, :evas_object_intercept_color_set_cb ], :pointer ],
+        [ :evas_object_intercept_color_set_callback_del, [ :pointer, :evas_object_intercept_color_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_clip_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data);
-        [ :evas_object_intercept_clip_set_callback_add, [ :evas_object, :evas_object_intercept_clip_set_cb, :pointer ], :void ],
+        [ :evas_object_intercept_clip_set_callback_add, [ :pointer, :evas_object_intercept_clip_set_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_clip_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func);
-        [ :evas_object_intercept_clip_set_callback_del, [ :evas_object, :evas_object_intercept_clip_set_cb ], :pointer ],
+        [ :evas_object_intercept_clip_set_callback_del, [ :pointer, :evas_object_intercept_clip_set_cb ], :pointer ],
         # EAPI void evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data);
-        [ :evas_object_intercept_clip_unset_callback_add, [ :evas_object, :evas_object_intercept_clip_unset_cb, :pointer ], :void ],
+        [ :evas_object_intercept_clip_unset_callback_add, [ :pointer, :evas_object_intercept_clip_unset_cb, :pointer ], :void ],
         # EAPI void *evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func);
-        [ :evas_object_intercept_clip_unset_callback_del, [ :evas_object, :evas_object_intercept_clip_unset_cb ], :pointer ],
+        [ :evas_object_intercept_clip_unset_callback_del, [ :pointer, :evas_object_intercept_clip_unset_cb ], :pointer ],
+        # EAPI void evas_object_intercept_focus_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Focus_Set_Cb func, const void *data);
+        [ :evas_object_intercept_focus_set_callback_add, [ :pointer, :evas_object_intercept_focus_set_cb, :pointer ], :void ],
+        # EAPI void *evas_object_intercept_focus_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Focus_Set_Cb func);
+        [ :evas_object_intercept_focus_set_callback_del, [ :pointer, :evas_object_intercept_focus_set_cb ], :pointer ],
         # EAPI Evas_Object *evas_object_rectangle_add(Evas *e);
-        [ :evas_object_rectangle_add, [ :evas ], :evas_object ],
+        [ :evas_object_rectangle_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_image_add(Evas *e);
-        [ :evas_object_image_add, [ :evas ], :evas_object ],
+        [ :evas_object_image_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_image_filled_add(Evas *e);
-        [ :evas_object_image_filled_add, [ :evas ], :evas_object ],
+        [ :evas_object_image_filled_add, [ :pointer ], :pointer ],
         # EAPI void evas_object_image_memfile_set(Evas_Object *obj, void *data, int size, char *format, char *key);
-        [ :evas_object_image_memfile_set, [ :evas_object, :pointer, :int, :string, :string ], :void ],
+        [ :evas_object_image_memfile_set, [ :pointer, :pointer, :int, :string, :string ], :void ],
         # EAPI void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key);
-        [ :evas_object_image_file_set, [ :evas_object, :string, :string ], :void ],
+        [ :evas_object_image_file_set, [ :pointer, :string, :string ], :void ],
+        # EAPI void evas_object_image_mmap_set(Evas_Object *eo_obj, const Eina_File *f, const char *key);
+        [ :evas_object_image_mmap_set, [ :pointer, :eina_file, :string ], :void ],
         # EAPI void evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key);
-        [ :evas_object_image_file_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_image_file_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b);
-        [ :evas_object_image_border_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_border_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :evas_object_image_border_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_border_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill);
-        [ :evas_object_image_border_center_fill_set, [ :evas_object, :evas_border_fill_mode ], :void ],
+        [ :evas_object_image_border_center_fill_set, [ :pointer, :evas_border_fill_mode ], :void ],
         # EAPI Evas_Border_Fill_Mode evas_object_image_border_center_fill_get(const Evas_Object *obj);
-        [ :evas_object_image_border_center_fill_get, [ :evas_object ], :evas_border_fill_mode ],
+        [ :evas_object_image_border_center_fill_get, [ :pointer ], :evas_border_fill_mode ],
         # EAPI void evas_object_image_filled_set(Evas_Object *obj, Eina_Bool setting);
-        [ :evas_object_image_filled_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_filled_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_filled_get(const Evas_Object *obj);
-        [ :evas_object_image_filled_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_filled_get, [ :pointer ], :bool ],
         # EAPI void evas_object_image_border_scale_set(Evas_Object *obj, double scale);
-        [ :evas_object_image_border_scale_set, [ :evas_object, :double ], :void ],
+        [ :evas_object_image_border_scale_set, [ :pointer, :double ], :void ],
         # EAPI double evas_object_image_border_scale_get(const Evas_Object *obj);
-        [ :evas_object_image_border_scale_get, [ :evas_object ], :double ],
+        [ :evas_object_image_border_scale_get, [ :pointer ], :double ],
         # EAPI void evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-        [ :evas_object_image_fill_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_fill_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_image_fill_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_fill_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_fill_spread_set(Evas_Object *obj, Evas_Fill_Spread spread);
-        [ :evas_object_image_fill_spread_set, [ :evas_object, :evas_fill_spread ], :void ],
+        [ :evas_object_image_fill_spread_set, [ :pointer, :evas_fill_spread ], :void ],
         # EAPI Evas_Fill_Spread evas_object_image_fill_spread_get(const Evas_Object *obj);
-        [ :evas_object_image_fill_spread_get, [ :evas_object ], :evas_fill_spread ],
+        [ :evas_object_image_fill_spread_get, [ :pointer ], :evas_fill_spread ],
         # EAPI void evas_object_image_size_set(Evas_Object *obj, int w, int h);
-        [ :evas_object_image_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_image_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_image_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_image_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_image_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI int evas_object_image_stride_get(const Evas_Object *obj);
-        [ :evas_object_image_stride_get, [ :evas_object ], :int ],
+        [ :evas_object_image_stride_get, [ :pointer ], :int ],
         # EAPI Evas_Load_Error evas_object_image_load_error_get(const Evas_Object *obj);
-        [ :evas_object_image_load_error_get, [ :evas_object ], :evas_load_error ],
+        [ :evas_object_image_load_error_get, [ :pointer ], :evas_load_error ],
         # EAPI void evas_object_image_data_set(Evas_Object *obj, void *data);
-        [ :evas_object_image_data_set, [ :evas_object, :pointer ], :void ],
+        [ :evas_object_image_data_set, [ :pointer, :pointer ], :void ],
         # EAPI void *evas_object_image_data_get(const Evas_Object *obj, Eina_Bool for_writing);
-        [ :evas_object_image_data_get, [ :evas_object, :bool ], :pointer ],
+        [ :evas_object_image_data_get, [ :pointer, :bool ], :pointer ],
         # EAPI void *evas_object_image_data_convert(Evas_Object *obj, Evas_Colorspace to_cspace);
-        [ :evas_object_image_data_convert, [ :evas_object, :evas_colorspace ], :pointer ],
+        [ :evas_object_image_data_convert, [ :pointer, :evas_colorspace ], :pointer ],
         # EAPI void evas_object_image_data_copy_set(Evas_Object *obj, void *data);
-        [ :evas_object_image_data_copy_set, [ :evas_object, :pointer ], :void ],
+        [ :evas_object_image_data_copy_set, [ :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_image_data_update_add, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_data_update_add, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_alpha_set(Evas_Object *obj, Eina_Bool has_alpha);
-        [ :evas_object_image_alpha_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_alpha_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_alpha_get(const Evas_Object *obj);
-        [ :evas_object_image_alpha_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_alpha_get, [ :pointer ], :bool ],
         # EAPI void evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale);
-        [ :evas_object_image_smooth_scale_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_smooth_scale_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_smooth_scale_get(const Evas_Object *obj);
-        [ :evas_object_image_smooth_scale_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_smooth_scale_get, [ :pointer ], :bool ],
         # EAPI void evas_object_image_preload(Evas_Object *obj, Eina_Bool cancel);
-        [ :evas_object_image_preload, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_preload, [ :pointer, :bool ], :void ],
         # EAPI void evas_object_image_reload(Evas_Object *obj);
-        [ :evas_object_image_reload, [ :evas_object ], :void ],
+        [ :evas_object_image_reload, [ :pointer ], :void ],
         # EAPI Eina_Bool evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags);
-        [ :evas_object_image_save, [ :evas_object, :string, :string, :string ], :bool ],
+        [ :evas_object_image_save, [ :pointer, :string, :string, :string ], :bool ],
         # EAPI Eina_Bool evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixels);
-        [ :evas_object_image_pixels_import, [ :evas_object, :evas_pixel_import_source ], :bool ],
+        [ :evas_object_image_pixels_import, [ :pointer, :evas_pixel_import_source ], :bool ],
         # EAPI void evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data);
-        [ :evas_object_image_pixels_get_callback_set, [ :evas_object, :evas_object_image_pixels_get_cb, :pointer ], :void ],
+        [ :evas_object_image_pixels_get_callback_set, [ :pointer, :evas_object_image_pixels_get_cb, :pointer ], :void ],
         # EAPI void evas_object_image_pixels_dirty_set(Evas_Object *obj, Eina_Bool dirty);
-        [ :evas_object_image_pixels_dirty_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_pixels_dirty_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_pixels_dirty_get(const Evas_Object *obj);
-        [ :evas_object_image_pixels_dirty_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_pixels_dirty_get, [ :pointer ], :bool ],
         # EAPI void evas_object_image_load_dpi_set(Evas_Object *obj, double dpi);
-        [ :evas_object_image_load_dpi_set, [ :evas_object, :double ], :void ],
+        [ :evas_object_image_load_dpi_set, [ :pointer, :double ], :void ],
         # EAPI double evas_object_image_load_dpi_get(const Evas_Object *obj);
-        [ :evas_object_image_load_dpi_get, [ :evas_object ], :double ],
+        [ :evas_object_image_load_dpi_get, [ :pointer ], :double ],
         # EAPI void evas_object_image_load_size_set(Evas_Object *obj, int w, int h);
-        [ :evas_object_image_load_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_image_load_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_image_load_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_image_load_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_image_load_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_load_scale_down_set(Evas_Object *obj, int scale_down);
-        [ :evas_object_image_load_scale_down_set, [ :evas_object, :int ], :void ],
+        [ :evas_object_image_load_scale_down_set, [ :pointer, :int ], :void ],
         # EAPI int evas_object_image_load_scale_down_get(const Evas_Object *obj);
-        [ :evas_object_image_load_scale_down_get, [ :evas_object ], :int ],
+        [ :evas_object_image_load_scale_down_get, [ :pointer ], :int ],
         # EAPI void evas_object_image_load_region_set(Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_image_load_region_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_image_load_region_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_image_load_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
-        [ :evas_object_image_load_region_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_image_load_region_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_image_load_orientation_set(Evas_Object *obj, Eina_Bool enable);
-        [ :evas_object_image_load_orientation_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_load_orientation_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_load_orientation_get(const Evas_Object *obj);
-        [ :evas_object_image_load_orientation_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_load_orientation_get, [ :pointer ], :bool ],
         # EAPI void evas_object_image_colorspace_set(Evas_Object *obj, Evas_Colorspace cspace);
-        [ :evas_object_image_colorspace_set, [ :evas_object, :evas_colorspace ], :void ],
+        [ :evas_object_image_colorspace_set, [ :pointer, :evas_colorspace ], :void ],
         # EAPI Evas_Colorspace evas_object_image_colorspace_get(const Evas_Object *obj);
-        [ :evas_object_image_colorspace_get, [ :evas_object ], :evas_colorspace ],
+        [ :evas_object_image_colorspace_get, [ :pointer ], :evas_colorspace ],
         # EAPI Eina_Bool evas_object_image_region_support_get(const Evas_Object *obj);
-        [ :evas_object_image_region_support_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_region_support_get, [ :pointer ], :bool ],
         # EAPI void evas_object_image_native_surface_set(Evas_Object *obj, Evas_Native_Surface *surf);
-        [ :evas_object_image_native_surface_set, [ :evas_object, :evas_native_surface ], :void ],
+        [ :evas_object_image_native_surface_set, [ :pointer, :evas_native_surface ], :void ],
         # EAPI Evas_Native_Surface *evas_object_image_native_surface_get(const Evas_Object *obj);
-        [ :evas_object_image_native_surface_get, [ :evas_object ], :evas_native_surface ],
+        [ :evas_object_image_native_surface_get, [ :pointer ], :evas_native_surface ],
         # EAPI void evas_object_image_video_surface_set(Evas_Object *obj, Evas_Video_Surface *surf);
-        [ :evas_object_image_video_surface_set, [ :evas_object, :evas_video_surface ], :void ],
+        [ :evas_object_image_video_surface_set, [ :pointer, :evas_video_surface ], :void ],
         # EAPI const Evas_Video_Surface *evas_object_image_video_surface_get(const Evas_Object *obj);
-        [ :evas_object_image_video_surface_get, [ :evas_object ], :evas_video_surface ],
+        [ :evas_object_image_video_surface_get, [ :pointer ], :evas_video_surface ],
+        # EAPI void evas_object_image_video_surface_caps_set(Evas_Object *obj, unsigned int caps);
+        [ :evas_object_image_video_surface_caps_set, [ :pointer, :uint ], :void ],
+        # EAPI unsigned int evas_object_image_video_surface_caps_get(const Evas_Object *obj);
+        [ :evas_object_image_video_surface_caps_get, [ :pointer ], :uint ],
         # EAPI void evas_object_image_scale_hint_set(Evas_Object *obj, Evas_Image_Scale_Hint hint);
-        [ :evas_object_image_scale_hint_set, [ :evas_object, :evas_image_scale_hint ], :void ],
+        [ :evas_object_image_scale_hint_set, [ :pointer, :evas_image_scale_hint ], :void ],
         # EAPI Evas_Image_Scale_Hint evas_object_image_scale_hint_get(const Evas_Object *obj);
-        [ :evas_object_image_scale_hint_get, [ :evas_object ], :evas_image_scale_hint ],
+        [ :evas_object_image_scale_hint_get, [ :pointer ], :evas_image_scale_hint ],
         # EAPI void evas_object_image_content_hint_set(Evas_Object *obj, Evas_Image_Content_Hint hint);
-        [ :evas_object_image_content_hint_set, [ :evas_object, :evas_image_content_hint ], :void ],
+        [ :evas_object_image_content_hint_set, [ :pointer, :evas_image_content_hint ], :void ],
         # EAPI Evas_Image_Content_Hint evas_object_image_content_hint_get(const Evas_Object *obj);
-        [ :evas_object_image_content_hint_get, [ :evas_object ], :evas_image_content_hint ],
+        [ :evas_object_image_content_hint_get, [ :pointer ], :evas_image_content_hint ],
         # EAPI void evas_object_image_alpha_mask_set(Evas_Object *obj, Eina_Bool ismask);
-        [ :evas_object_image_alpha_mask_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_image_alpha_mask_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_image_source_set(Evas_Object *obj, Evas_Object *src);
-        [ :evas_object_image_source_set, [ :evas_object, :evas_object ], :bool ],
+        [ :evas_object_image_source_set, [ :pointer, :pointer ], :bool ],
         # EAPI Evas_Object *evas_object_image_source_get(const Evas_Object *obj);
-        [ :evas_object_image_source_get, [ :evas_object ], :evas_object ],
+        [ :evas_object_image_source_get, [ :pointer ], :pointer ],
         # EAPI Eina_Bool evas_object_image_source_unset(Evas_Object *obj);
-        [ :evas_object_image_source_unset, [ :evas_object ], :bool ],
-        # EAPI Eina_Bool evas_object_image_extension_can_load_get(const char *file);
-        [ :evas_object_image_extension_can_load_get, [ :string ], :bool ],
-        # EAPI Eina_Bool evas_object_image_extension_can_load_fast_get(const char *file);
-        [ :evas_object_image_extension_can_load_fast_get, [ :string ], :bool ],
+        [ :evas_object_image_source_unset, [ :pointer ], :bool ],
+        # EAPI void evas_object_image_source_visible_set(Evas_Object *obj, Eina_Bool visible);
+        [ :evas_object_image_source_visible_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool evas_object_image_source_visible_get(const Evas_Object *obj);
+        [ :evas_object_image_source_visible_get, [ :pointer ], :bool ],
+        # EAPI void evas_object_image_source_events_set(Evas_Object *obj, Eina_Bool source);
+        [ :evas_object_image_source_events_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool evas_object_image_source_events_get(const Evas_Object *obj);
+        [ :evas_object_image_source_events_get, [ :pointer ], :bool ],
+        # EAPI void evas_object_image_source_clip_set(Evas_Object *obj, Eina_Bool source_clip);
+        [ :evas_object_image_source_clip_set, [ :pointer, :bool ], :void ],
+        # EAPI Eina_Bool evas_object_image_source_clip_get(const Evas_Object *obj);
+        [ :evas_object_image_source_clip_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_image_animated_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_get, [ :evas_object ], :bool ],
+        [ :evas_object_image_animated_get, [ :pointer ], :bool ],
         # EAPI int evas_object_image_animated_frame_count_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_frame_count_get, [ :evas_object ], :int ],
+        [ :evas_object_image_animated_frame_count_get, [ :pointer ], :int ],
         # EAPI Evas_Image_Animated_Loop_Hint evas_object_image_animated_loop_type_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_loop_type_get, [ :evas_object ], :evas_image_animated_loop_hint ],
+        [ :evas_object_image_animated_loop_type_get, [ :pointer ], :evas_image_animated_loop_hint ],
         # EAPI int evas_object_image_animated_loop_count_get(const Evas_Object *obj);
-        [ :evas_object_image_animated_loop_count_get, [ :evas_object ], :int ],
+        [ :evas_object_image_animated_loop_count_get, [ :pointer ], :int ],
         # EAPI double evas_object_image_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int fram_num);
-        [ :evas_object_image_animated_frame_duration_get, [ :evas_object, :int, :int ], :double ],
+        [ :evas_object_image_animated_frame_duration_get, [ :pointer, :int, :int ], :double ],
         # EAPI void evas_object_image_animated_frame_set(Evas_Object *obj, int frame_num);
-        [ :evas_object_image_animated_frame_set, [ :evas_object, :int ], :void ],
+        [ :evas_object_image_animated_frame_set, [ :pointer, :int ], :void ],
         # EAPI Evas_Object *evas_object_text_add(Evas *e);
-        [ :evas_object_text_add, [ :evas ], :evas_object ],
+        [ :evas_object_text_add, [ :pointer ], :pointer ],
         # EAPI void evas_object_text_font_source_set(Evas_Object *obj, const char *font);
-        [ :evas_object_text_font_source_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_text_font_source_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_text_font_source_get(const Evas_Object *obj);
-        [ :evas_object_text_font_source_get, [ :evas_object ], :string ],
+        [ :evas_object_text_font_source_get, [ :pointer ], :string ],
         # EAPI void evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size);
-        [ :evas_object_text_font_set, [ :evas_object, :string, :int ], :void ],
+        [ :evas_object_text_font_set, [ :pointer, :string, :int ], :void ],
         # EAPI void evas_object_text_font_get(const Evas_Object *obj, const char **font, Evas_Font_Size *size);
-        [ :evas_object_text_font_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_text_font_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_text_set(Evas_Object *obj, const char *text);
-        [ :evas_object_text_text_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_text_text_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_text_text_get(const Evas_Object *obj);
-        [ :evas_object_text_text_get, [ :evas_object ], :string ],
+        [ :evas_object_text_text_get, [ :pointer ], :string ],
         # EAPI void evas_object_text_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        [ :evas_object_text_bidi_delimiters_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_text_bidi_delimiters_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_text_bidi_delimiters_get(const Evas_Object *obj);
-        [ :evas_object_text_bidi_delimiters_get, [ :evas_object ], :string ],
+        [ :evas_object_text_bidi_delimiters_get, [ :pointer ], :string ],
+        # EAPI void evas_object_text_ellipsis_set(Evas_Object *obj, double ellipsis);
+        [ :evas_object_text_ellipsis_set, [ :pointer, :double ], :void ],
+        # EAPI double evas_object_text_ellipsis_get(const Evas_Object *obj);
+        [ :evas_object_text_ellipsis_get, [ :pointer ], :double ],
         # EAPI Evas_Coord evas_object_text_ascent_get(const Evas_Object *obj);
-        [ :evas_object_text_ascent_get, [ :evas_object ], :int ],
+        [ :evas_object_text_ascent_get, [ :pointer ], :int ],
         # EAPI Evas_Coord evas_object_text_descent_get(const Evas_Object *obj);
-        [ :evas_object_text_descent_get, [ :evas_object ], :int ],
+        [ :evas_object_text_descent_get, [ :pointer ], :int ],
         # EAPI Evas_Coord evas_object_text_max_ascent_get(const Evas_Object *obj);
-        [ :evas_object_text_max_ascent_get, [ :evas_object ], :int ],
+        [ :evas_object_text_max_ascent_get, [ :pointer ], :int ],
         # EAPI Evas_Coord evas_object_text_max_descent_get(const Evas_Object *obj);
-        [ :evas_object_text_max_descent_get, [ :evas_object ], :int ],
+        [ :evas_object_text_max_descent_get, [ :pointer ], :int ],
         # EAPI Evas_Coord evas_object_text_horiz_advance_get(const Evas_Object *obj);
-        [ :evas_object_text_horiz_advance_get, [ :evas_object ], :int ],
+        [ :evas_object_text_horiz_advance_get, [ :pointer ], :int ],
         # EAPI Evas_Coord evas_object_text_vert_advance_get(const Evas_Object *obj);
-        [ :evas_object_text_vert_advance_get, [ :evas_object ], :int ],
+        [ :evas_object_text_vert_advance_get, [ :pointer ], :int ],
         # EAPI Evas_Coord evas_object_text_inset_get(const Evas_Object *obj);
-        [ :evas_object_text_inset_get, [ :evas_object ], :int ],
+        [ :evas_object_text_inset_get, [ :pointer ], :int ],
         # EAPI Eina_Bool evas_object_text_char_pos_get(const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_text_char_pos_get, [ :evas_object, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        [ :evas_object_text_char_pos_get, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI int evas_object_text_char_coords_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_text_char_coords_get, [ :evas_object, :int, :int, :pointer, :pointer, :pointer, :pointer ], :int ],
+        [ :evas_object_text_char_coords_get, [ :pointer, :int, :int, :pointer, :pointer, :pointer, :pointer ], :int ],
         # EAPI int evas_object_text_last_up_to_pos(const Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_text_last_up_to_pos, [ :evas_object, :int, :int ], :int ],
+        [ :evas_object_text_last_up_to_pos, [ :pointer, :int, :int ], :int ],
         # EAPI Evas_Text_Style_Type evas_object_text_style_get(const Evas_Object *obj);
-        [ :evas_object_text_style_get, [ :evas_object ], :evas_text_style_type ],
+        [ :evas_object_text_style_get, [ :pointer ], :evas_text_style_type ],
         # EAPI void evas_object_text_style_set(Evas_Object *obj, Evas_Text_Style_Type type);
-        [ :evas_object_text_style_set, [ :evas_object, :evas_text_style_type ], :void ],
+        [ :evas_object_text_style_set, [ :pointer, :evas_text_style_type ], :void ],
         # EAPI void evas_object_text_shadow_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_shadow_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_shadow_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_shadow_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_shadow_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_shadow_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_glow_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_glow_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_glow_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_glow_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_glow_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_glow_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_glow2_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_glow2_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_glow2_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_glow2_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_glow2_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_glow2_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_outline_color_set(Evas_Object *obj, int r, int g, int b, int a);
-        [ :evas_object_text_outline_color_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_text_outline_color_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
-        [ :evas_object_text_outline_color_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_outline_color_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_text_style_pad_get(const Evas_Object *obj, int *l, int *r, int *t, int *b);
-        [ :evas_object_text_style_pad_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_text_style_pad_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_BiDi_Direction evas_object_text_direction_get(const Evas_Object *obj);
-        [ :evas_object_text_direction_get, [ :evas_object ], :evas_bidi_direction ],
+        [ :evas_object_text_direction_get, [ :pointer ], :evas_bidi_direction ],
         # EAPI Evas_Object *evas_object_textblock_add(Evas *e);
-        [ :evas_object_textblock_add, [ :evas ], :evas_object ],
-        # EAPI const char *evas_textblock_escape_string_get(const char *escape);
-        [ :evas_textblock_escape_string_get, [ :string ], :string ],
-        # EAPI const char *evas_textblock_string_escape_get(const char *string, int *len_ret);
-        [ :evas_textblock_string_escape_get, [ :string, :pointer ], :string ],
-        # EAPI const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end);
-        [ :evas_textblock_escape_string_range_get, [ :string, :string ], :string ],
+        [ :evas_object_textblock_add, [ :pointer ], :pointer ],
         # EAPI char *evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text);
-        [ :evas_textblock_text_markup_to_utf8, [ :evas_object, :string ], :string ],
+        [ :evas_textblock_text_markup_to_utf8, [ :pointer, :string ], :string ],
         # EAPI char *evas_textblock_text_utf8_to_markup(const Evas_Object *obj, const char *text);
-        [ :evas_textblock_text_utf8_to_markup, [ :evas_object, :string ], :string ],
-        # EAPI Evas_Textblock_Style *evas_textblock_style_new(void);
-        [ :evas_textblock_style_new, [  ], :evas_textblock_style ],
-        # EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts);
-        [ :evas_textblock_style_free, [ :evas_textblock_style ], :void ],
-        # EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text);
-        [ :evas_textblock_style_set, [ :evas_textblock_style, :string ], :void ],
-        # EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts);
-        [ :evas_textblock_style_get, [ :evas_textblock_style ], :string ],
-        # EAPI void evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts);
-        [ :evas_object_textblock_style_set, [ :evas_object, :evas_textblock_style ], :void ],
+        [ :evas_textblock_text_utf8_to_markup, [ :pointer, :string ], :string ],
+        # EAPI void evas_object_textblock_style_set(Evas_Object *obj, const Evas_Textblock_Style *ts);
+        [ :evas_object_textblock_style_set, [ :pointer, :evas_textblock_style ], :void ],
         # EAPI const Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj);
-        [ :evas_object_textblock_style_get, [ :evas_object ], :evas_textblock_style ],
+        [ :evas_object_textblock_style_get, [ :pointer ], :evas_textblock_style ],
         # EAPI void evas_object_textblock_style_user_push(Evas_Object *obj, Evas_Textblock_Style *ts);
-        [ :evas_object_textblock_style_user_push, [ :evas_object, :evas_textblock_style ], :void ],
+        [ :evas_object_textblock_style_user_push, [ :pointer, :evas_textblock_style ], :void ],
         # EAPI void evas_object_textblock_style_user_pop(Evas_Object *obj);
-        [ :evas_object_textblock_style_user_pop, [ :evas_object ], :void ],
+        [ :evas_object_textblock_style_user_pop, [ :pointer ], :void ],
         # EAPI const Evas_Textblock_Style *evas_object_textblock_style_user_peek(const Evas_Object *obj);
-        [ :evas_object_textblock_style_user_peek, [ :evas_object ], :evas_textblock_style ],
+        [ :evas_object_textblock_style_user_peek, [ :pointer ], :evas_textblock_style ],
         # EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
-        [ :evas_object_textblock_replace_char_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_textblock_replace_char_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_textblock_replace_char_get(Evas_Object *obj);
-        [ :evas_object_textblock_replace_char_get, [ :evas_object ], :string ],
+        [ :evas_object_textblock_replace_char_get, [ :pointer ], :string ],
         # EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
-        [ :evas_object_textblock_valign_set, [ :evas_object, :double ], :void ],
+        [ :evas_object_textblock_valign_set, [ :pointer, :double ], :void ],
         # EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
-        [ :evas_object_textblock_valign_get, [ :evas_object ], :double ],
+        [ :evas_object_textblock_valign_get, [ :pointer ], :double ],
         # EAPI void evas_object_textblock_bidi_delimiters_set(Evas_Object *obj, const char *delim);
-        [ :evas_object_textblock_bidi_delimiters_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_textblock_bidi_delimiters_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_textblock_bidi_delimiters_get(const Evas_Object *obj);
-        [ :evas_object_textblock_bidi_delimiters_get, [ :evas_object ], :string ],
+        [ :evas_object_textblock_bidi_delimiters_get, [ :pointer ], :string ],
         # EAPI void evas_object_textblock_legacy_newline_set(Evas_Object *obj, Eina_Bool mode);
-        [ :evas_object_textblock_legacy_newline_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_textblock_legacy_newline_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Evas_Object *obj);
-        [ :evas_object_textblock_legacy_newline_get, [ :evas_object ], :bool ],
+        [ :evas_object_textblock_legacy_newline_get, [ :pointer ], :bool ],
         # EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text);
-        [ :evas_object_textblock_text_markup_set, [ :evas_object, :string ], :void ],
-        # EAPI void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_object_textblock_text_markup_prepend, [ :evas_textblock_cursor, :string ], :void ],
+        [ :evas_object_textblock_text_markup_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_textblock_text_markup_get(const Evas_Object *obj);
-        [ :evas_object_textblock_text_markup_get, [ :evas_object ], :string ],
+        [ :evas_object_textblock_text_markup_get, [ :pointer ], :string ],
         # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
-        [ :evas_object_textblock_cursor_get, [ :evas_object ], :evas_textblock_cursor ],
+        [ :evas_object_textblock_cursor_get, [ :pointer ], :evas_textblock_cursor ],
         # EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *obj);
-        [ :evas_object_textblock_cursor_new, [ :evas_object ], :evas_textblock_cursor ],
-        # EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_free, [ :evas_textblock_cursor ], :void ],
-        # EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_first, [ :evas_textblock_cursor ], :void ],
-        # EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_last, [ :evas_textblock_cursor ], :void ],
-        # EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_next, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_prev, [ :evas_textblock_cursor ], :bool ],
+        [ :evas_object_textblock_cursor_new, [ :pointer ], :evas_textblock_cursor ],
         # EAPI const Eina_List *evas_textblock_node_format_list_get(const Evas_Object *obj, const char *anchor);
-        [ :evas_textblock_node_format_list_get, [ :evas_object, :string ], :eina_list ],
+        [ :evas_textblock_node_format_list_get, [ :pointer, :string ], :eina_list ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_first_get(const Evas_Object *obj);
-        [ :evas_textblock_node_format_first_get, [ :evas_object ], :evas_object_textblock_node_format ],
+        [ :evas_textblock_node_format_first_get, [ :pointer ], :evas_object_textblock_node_format ],
         # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_last_get(const Evas_Object *obj);
-        [ :evas_textblock_node_format_last_get, [ :evas_object ], :evas_object_textblock_node_format ],
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_next_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_prev_get, [ :evas_object_textblock_node_format ], :evas_object_textblock_node_format ],
+        [ :evas_textblock_node_format_last_get, [ :pointer ], :evas_object_textblock_node_format ],
         # EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_node_format_remove_pair, [ :evas_object, :evas_object_textblock_node_format ], :void ],
-        # EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n);
-        [ :evas_textblock_cursor_set_at_format, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
-        # EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_get, [ :evas_textblock_cursor ], :evas_object_textblock_node_format ],
-        # EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fnode);
-        [ :evas_textblock_node_format_text_get, [ :evas_object_textblock_node_format ], :string ],
-        # EAPI void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
-        [ :evas_textblock_cursor_at_format_set, [ :evas_textblock_cursor, :evas_object_textblock_node_format ], :void ],
-        # EAPI Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_is_visible_get, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_next, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_format_prev, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_is_format, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_next, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_prev, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_word_start, [ :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_word_end, [ :evas_textblock_cursor ], :bool ],
-        # EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_char_first, [ :evas_textblock_cursor ], :void ],
-        # EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_char_last, [ :evas_textblock_cursor ], :void ],
-        # EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_line_char_first, [ :evas_textblock_cursor ], :void ],
-        # EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_line_char_last, [ :evas_textblock_cursor ], :void ],
-        # EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_pos_get, [ :evas_textblock_cursor ], :int ],
-        # EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
-        [ :evas_textblock_cursor_pos_set, [ :evas_textblock_cursor, :int ], :void ],
-        # EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
-        [ :evas_textblock_cursor_line_set, [ :evas_textblock_cursor, :int ], :bool ],
-        # EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_compare, [ :evas_textblock_cursor, :evas_textblock_cursor ], :int ],
-        # EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
-        [ :evas_textblock_cursor_copy, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
-        # EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_textblock_cursor_text_append, [ :evas_textblock_cursor, :string ], :int ],
-        # EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
-        [ :evas_textblock_cursor_text_prepend, [ :evas_textblock_cursor, :string ], :int ],
-        # EAPI Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
-        [ :evas_textblock_cursor_format_append, [ :evas_textblock_cursor, :string ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
-        [ :evas_textblock_cursor_format_prepend, [ :evas_textblock_cursor, :string ], :bool ],
-        # EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_char_delete, [ :evas_textblock_cursor ], :void ],
-        # EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_delete, [ :evas_textblock_cursor, :evas_textblock_cursor ], :void ],
-        # EAPI const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_text_get, [ :evas_textblock_cursor ], :string ],
-        # EAPI int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_paragraph_text_length_get, [ :evas_textblock_cursor ], :int ],
-        # EAPI Eina_Bool evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end);
-        [ :evas_textblock_cursor_visible_range_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :bool ],
-        # EAPI Eina_List *evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_formats_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
-        # EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
-        [ :evas_textblock_cursor_range_text_get, [ :evas_textblock_cursor, :evas_textblock_cursor, :evas_textblock_text_type ], :string ],
-        # EAPI char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_content_get, [ :evas_textblock_cursor ], :string ],
-        # EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype);
-        [ :evas_textblock_cursor_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer, :pointer, :evas_textblock_cursor_type
-            ], :int ],
-        # EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_char_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
-        # EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch);
-        [ :evas_textblock_cursor_pen_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
-        # EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_line_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :int ],
-        # EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
-        [ :evas_textblock_cursor_char_coord_set, [ :evas_textblock_cursor, :int, :int ], :bool ],
-        # EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
-        [ :evas_textblock_cursor_line_coord_set, [ :evas_textblock_cursor, :int ], :int ],
-        # EAPI Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2);
-        [ :evas_textblock_cursor_range_geometry_get, [ :evas_textblock_cursor, :evas_textblock_cursor ], :eina_list ],
-        # EAPI Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_textblock_cursor_format_item_geometry_get, [ :evas_textblock_cursor, :pointer, :pointer, :pointer, :pointer ], :bool ],
-        # EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
-        [ :evas_textblock_cursor_eol_get, [ :evas_textblock_cursor ], :bool ],
+        [ :evas_textblock_node_format_remove_pair, [ :pointer, :evas_object_textblock_node_format ], :void ],
         # EAPI Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :evas_object_textblock_line_number_geometry_get, [ :evas_object, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        [ :evas_object_textblock_line_number_geometry_get, [ :pointer, :int, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI void evas_object_textblock_clear(Evas_Object *obj);
-        [ :evas_object_textblock_clear, [ :evas_object ], :void ],
+        [ :evas_object_textblock_clear, [ :pointer ], :void ],
         # EAPI void evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textblock_size_formatted_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_size_formatted_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textblock_size_native_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_size_native_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
-        [ :evas_object_textblock_style_insets_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_textblock_style_insets_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_textgrid_add(Evas *e);
-        [ :evas_object_textgrid_add, [ :evas ], :evas_object ],
+        [ :evas_object_textgrid_add, [ :pointer ], :pointer ],
         # EAPI void evas_object_textgrid_size_set(Evas_Object *obj, int w, int h);
-        [ :evas_object_textgrid_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_textgrid_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_textgrid_size_get(const Evas_Object *obj, int *w, int *h);
-        [ :evas_object_textgrid_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_textgrid_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textgrid_font_source_set(Evas_Object *obj, const char *font_source);
-        [ :evas_object_textgrid_font_source_set, [ :evas_object, :string ], :void ],
+        [ :evas_object_textgrid_font_source_set, [ :pointer, :string ], :void ],
         # EAPI const char *evas_object_textgrid_font_source_get(const Evas_Object *obj);
-        [ :evas_object_textgrid_font_source_get, [ :evas_object ], :string ],
+        [ :evas_object_textgrid_font_source_get, [ :pointer ], :string ],
         # EAPI void evas_object_textgrid_font_set(Evas_Object *obj, const char *font_name, Evas_Font_Size font_size);
-        [ :evas_object_textgrid_font_set, [ :evas_object, :string, :int ], :void ],
+        [ :evas_object_textgrid_font_set, [ :pointer, :string, :int ], :void ],
         # EAPI void evas_object_textgrid_font_get(const Evas_Object *obj, const char **font_name, Evas_Font_Size *font_size);
-        [ :evas_object_textgrid_font_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_textgrid_font_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textgrid_cell_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-        [ :evas_object_textgrid_cell_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_textgrid_cell_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textgrid_palette_set(Evas_Object *obj, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a);
-        [ :evas_object_textgrid_palette_set, [ :evas_object, :evas_textgrid_palette, :int, :int, :int, :int, :int ], :void ],
+        [ :evas_object_textgrid_palette_set, [ :pointer, :evas_textgrid_palette, :int, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_textgrid_palette_get(const Evas_Object *obj, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a);
-        [ :evas_object_textgrid_palette_get, [ :evas_object, :evas_textgrid_palette, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_textgrid_palette_get, [ :pointer, :evas_textgrid_palette, :int, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_textgrid_supported_font_styles_set(Evas_Object *obj, Evas_Textgrid_Font_Style styles);
-        [ :evas_object_textgrid_supported_font_styles_set, [ :evas_object, :evas_textgrid_font_style ], :void ],
+        [ :evas_object_textgrid_supported_font_styles_set, [ :pointer, :evas_textgrid_font_style ], :void ],
         # EAPI Evas_Textgrid_Font_Style evas_object_textgrid_supported_font_styles_get(const Evas_Object *obj);
-        [ :evas_object_textgrid_supported_font_styles_get, [ :evas_object ], :evas_textgrid_font_style ],
+        [ :evas_object_textgrid_supported_font_styles_get, [ :pointer ], :evas_textgrid_font_style ],
         # EAPI void evas_object_textgrid_cellrow_set(Evas_Object *obj, int y, const Evas_Textgrid_Cell *row);
-        [ :evas_object_textgrid_cellrow_set, [ :evas_object, :int, :evas_textgrid_cell ], :void ],
+        [ :evas_object_textgrid_cellrow_set, [ :pointer, :int, :evas_textgrid_cell ], :void ],
         # EAPI Evas_Textgrid_Cell *evas_object_textgrid_cellrow_get(const Evas_Object *obj, int y);
-        [ :evas_object_textgrid_cellrow_get, [ :evas_object, :int ], :evas_textgrid_cell ],
+        [ :evas_object_textgrid_cellrow_get, [ :pointer, :int ], :evas_textgrid_cell ],
         # EAPI void evas_object_textgrid_update_add(Evas_Object *obj, int x, int y, int w, int h);
-        [ :evas_object_textgrid_update_add, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_textgrid_update_add, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI Evas_Object *evas_object_line_add(Evas *e);
-        [ :evas_object_line_add, [ :evas ], :evas_object ],
+        [ :evas_object_line_add, [ :pointer ], :pointer ],
         # EAPI void evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2);
-        [ :evas_object_line_xy_set, [ :evas_object, :int, :int, :int, :int ], :void ],
+        [ :evas_object_line_xy_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2);
-        [ :evas_object_line_xy_get, [ :evas_object, :pointer, :pointer, :pointer, :pointer ], :void ],
+        [ :evas_object_line_xy_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object *evas_object_polygon_add(Evas *e);
-        [ :evas_object_polygon_add, [ :evas ], :evas_object ],
+        [ :evas_object_polygon_add, [ :pointer ], :pointer ],
         # EAPI void evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-        [ :evas_object_polygon_point_add, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_polygon_point_add, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_polygon_points_clear(Evas_Object *obj);
-        [ :evas_object_polygon_points_clear, [ :evas_object ], :void ],
+        [ :evas_object_polygon_points_clear, [ :pointer ], :void ],
         # EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame);
-        [ :evas_object_is_frame_object_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_is_frame_object_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_is_frame_object_get(Evas_Object *obj);
-        [ :evas_object_is_frame_object_get, [ :evas_object ], :bool ],
-        # EAPI void evas_smart_free(Evas_Smart *s);
-        [ :evas_smart_free, [ :evas_smart ], :void ],
-        # EAPI Evas_Smart *evas_smart_class_new(const Evas_Smart_Class *sc);
-        [ :evas_smart_class_new, [ :evas_smart_class ], :evas_smart ],
-        # EAPI const Evas_Smart_Class *evas_smart_class_get(const Evas_Smart *s);
-        [ :evas_smart_class_get, [ :evas_smart ], :evas_smart_class ],
-        # EAPI void *evas_smart_data_get(const Evas_Smart *s);
-        [ :evas_smart_data_get, [ :evas_smart ], :pointer ],
-        # EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count);
-        [ :evas_smart_callbacks_descriptions_get, [ :evas_smart, :pointer ], :evas_smart_cb_description ],
-        # EAPI const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name);
-        [ :evas_smart_callback_description_find, [ :evas_smart, :string ], :evas_smart_cb_description ],
-        # EAPI Eina_Bool evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size);
-        [ :evas_smart_class_inherit_full, [ :evas_smart_class, :evas_smart_class, :uint ], :bool ],
-        # EAPI int evas_smart_usage_get(const Evas_Smart *s);
-        [ :evas_smart_usage_get, [ :evas_smart ], :int ],
+        [ :evas_object_is_frame_object_get, [ :pointer ], :bool ],
         # EAPI Evas_Object *evas_object_smart_add(Evas *e, Evas_Smart *s);
-        [ :evas_object_smart_add, [ :evas, :evas_smart ], :evas_object ],
+        [ :evas_object_smart_add, [ :pointer, :evas_smart ], :pointer ],
         # EAPI void evas_object_smart_member_add(Evas_Object *obj, Evas_Object *smart_obj);
-        [ :evas_object_smart_member_add, [ :evas_object, :evas_object ], :void ],
+        [ :evas_object_smart_member_add, [ :pointer, :pointer ], :void ],
         # EAPI void evas_object_smart_member_del(Evas_Object *obj);
-        [ :evas_object_smart_member_del, [ :evas_object ], :void ],
+        [ :evas_object_smart_member_del, [ :pointer ], :void ],
         # EAPI Eina_List *evas_object_smart_members_get(const Evas_Object *obj);
-        [ :evas_object_smart_members_get, [ :evas_object ], :eina_list ],
+        [ :evas_object_smart_members_get, [ :pointer ], :eina_list ],
+        # EAPI Eina_Iterator *evas_object_smart_iterator_new(const Evas_Object *obj);
+        [ :evas_object_smart_iterator_new, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_smart_parent_get(const Evas_Object *obj);
-        [ :evas_object_smart_parent_get, [ :evas_object ], :evas_object ],
+        [ :evas_object_smart_parent_get, [ :pointer ], :pointer ],
         # EAPI Eina_Bool evas_object_smart_type_check(const Evas_Object *obj, const char *type);
-        [ :evas_object_smart_type_check, [ :evas_object, :string ], :bool ],
+        [ :evas_object_smart_type_check, [ :pointer, :string ], :bool ],
         # EAPI Eina_Bool evas_object_smart_type_check_ptr(const Evas_Object *obj, const char *type);
-        [ :evas_object_smart_type_check_ptr, [ :evas_object, :string ], :bool ],
+        [ :evas_object_smart_type_check_ptr, [ :pointer, :string ], :bool ],
         # EAPI Evas_Smart *evas_object_smart_smart_get(const Evas_Object *obj);
-        [ :evas_object_smart_smart_get, [ :evas_object ], :evas_smart ],
+        [ :evas_object_smart_smart_get, [ :pointer ], :evas_smart ],
         # EAPI void *evas_object_smart_data_get(const Evas_Object *obj);
-        [ :evas_object_smart_data_get, [ :evas_object ], :pointer ],
+        [ :evas_object_smart_data_get, [ :pointer ], :pointer ],
         # EAPI void evas_object_smart_data_set(Evas_Object *obj, void *data);
-        [ :evas_object_smart_data_set, [ :evas_object, :pointer ], :void ],
+        [ :evas_object_smart_data_set, [ :pointer, :pointer ], :void ],
         # EAPI void evas_object_smart_callback_add(Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_add, [ :evas_object, :string, :evas_smart_cb, :pointer ], :void ],
+        [ :evas_object_smart_callback_add, [ :pointer, :string, :evas_smart_cb, :pointer ], :void ],
         # EAPI void evas_object_smart_callback_priority_add(Evas_Object *obj, const char *event, Evas_Callback_Priority priority, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_priority_add, [ :evas_object, :string, :short, :evas_smart_cb, :pointer ], :void ],
+        [ :evas_object_smart_callback_priority_add, [ :pointer, :string, :eo_callback_priority, :evas_smart_cb, :pointer ], :void ],
         # EAPI void *evas_object_smart_callback_del(Evas_Object *obj, const char *event, Evas_Smart_Cb func);
-        [ :evas_object_smart_callback_del, [ :evas_object, :string, :evas_smart_cb ], :pointer ],
+        [ :evas_object_smart_callback_del, [ :pointer, :string, :evas_smart_cb ], :pointer ],
         # EAPI void *evas_object_smart_callback_del_full(Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data);
-        [ :evas_object_smart_callback_del_full, [ :evas_object, :string, :evas_smart_cb, :pointer ], :pointer ],
+        [ :evas_object_smart_callback_del_full, [ :pointer, :string, :evas_smart_cb, :pointer ], :pointer ],
         # EAPI void evas_object_smart_callback_call(Evas_Object *obj, const char *event, void *event_info);
-        [ :evas_object_smart_callback_call, [ :evas_object, :string, :pointer ], :void ],
+        [ :evas_object_smart_callback_call, [ :pointer, :string, :pointer ], :void ],
         # EAPI Eina_Bool evas_object_smart_callbacks_descriptions_set(Evas_Object *obj, const Evas_Smart_Cb_Description *descriptions);
-        [ :evas_object_smart_callbacks_descriptions_set, [ :evas_object, :evas_smart_cb_description ], :bool ],
+        [ :evas_object_smart_callbacks_descriptions_set, [ :pointer, :evas_smart_cb_description ], :bool ],
         # EAPI void evas_object_smart_callbacks_descriptions_get(const Evas_Object *obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count);
-        [ :evas_object_smart_callbacks_descriptions_get, [ :evas_object, :evas_smart_cb_description, :pointer, :evas_smart_cb_description, :pointer ],
+        [ :evas_object_smart_callbacks_descriptions_get, [ :pointer, :evas_smart_cb_description, :pointer, :evas_smart_cb_description, :pointer ],
             :void ],
         # EAPI void evas_object_smart_callback_description_find(const Evas_Object *obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description);
-        [ :evas_object_smart_callback_description_find, [ :evas_object, :string, :evas_smart_cb_description, :evas_smart_cb_description ], :void ],
+        [ :evas_object_smart_callback_description_find, [ :pointer, :string, :evas_smart_cb_description, :evas_smart_cb_description ], :void ],
         # EAPI void evas_object_smart_changed(Evas_Object *obj);
-        [ :evas_object_smart_changed, [ :evas_object ], :void ],
+        [ :evas_object_smart_changed, [ :pointer ], :void ],
         # EAPI void evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value);
-        [ :evas_object_smart_need_recalculate_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_smart_need_recalculate_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
-        [ :evas_object_smart_need_recalculate_get, [ :evas_object ], :bool ],
+        [ :evas_object_smart_need_recalculate_get, [ :pointer ], :bool ],
         # EAPI void evas_object_smart_calculate(Evas_Object *obj);
-        [ :evas_object_smart_calculate, [ :evas_object ], :void ],
+        [ :evas_object_smart_calculate, [ :pointer ], :void ],
         # EAPI void evas_smart_objects_calculate(Evas *e);
-        [ :evas_smart_objects_calculate, [ :evas ], :void ],
+        [ :evas_smart_objects_calculate, [ :pointer ], :void ],
         # EAPI int evas_smart_objects_calculate_count_get(const Evas *e);
-        [ :evas_smart_objects_calculate_count_get, [ :evas ], :int ],
+        [ :evas_smart_objects_calculate_count_get, [ :pointer ], :int ],
         # EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy);
-        [ :evas_object_smart_move_children_relative, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_smart_move_children_relative, [ :pointer, :int, :int ], :void ],
         # EAPI Evas_Object *evas_object_smart_clipped_clipper_get(Evas_Object *obj);
-        [ :evas_object_smart_clipped_clipper_get, [ :evas_object ], :evas_object ],
-        # EAPI void evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc);
-        [ :evas_object_smart_clipped_smart_set, [ :evas_smart_class ], :void ],
-        # EAPI const Evas_Smart_Class *evas_object_smart_clipped_class_get(void);
-        [ :evas_object_smart_clipped_class_get, [  ], :evas_smart_class ],
-        # EAPI void evas_object_box_smart_set(Evas_Object_Box_Api *api);
-        [ :evas_object_box_smart_set, [ :evas_object_box_api ], :void ],
-        # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get(void);
-        [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api ],
+        [ :evas_object_smart_clipped_clipper_get, [ :pointer ], :pointer ],
         # EAPI void evas_object_box_layout_set(Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-        [ :evas_object_box_layout_set, [ :evas_object, :evas_object_box_layout_cb, :pointer, (callback [:pointer], :void) ], :void ],
+        # FIXME
         # EAPI Evas_Object *evas_object_box_add(Evas *evas);
-        [ :evas_object_box_add, [ :evas ], :evas_object ],
+        [ :evas_object_box_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_box_add_to(Evas_Object *parent);
-        [ :evas_object_box_add_to, [ :evas_object ], :evas_object ],
+        [ :evas_object_box_add_to, [ :pointer ], :pointer ],
         # EAPI void evas_object_box_layout_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_horizontal, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_vertical, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_vertical, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_horizontal, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_max_size_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_max_size_horizontal, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_homogeneous_max_size_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_homogeneous_max_size_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_homogeneous_max_size_vertical, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_flow_horizontal, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_flow_horizontal, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_flow_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_flow_vertical, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_flow_vertical, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_layout_stack(Evas_Object *o, Evas_Object_Box_Data *priv, void *data);
-        [ :evas_object_box_layout_stack, [ :evas_object, :evas_object_box_data, :pointer ], :void ],
+        [ :evas_object_box_layout_stack, [ :pointer, :evas_object_box_data, :pointer ], :void ],
         # EAPI void evas_object_box_align_set(Evas_Object *o, double horizontal, double vertical);
-        [ :evas_object_box_align_set, [ :evas_object, :double, :double ], :void ],
+        [ :evas_object_box_align_set, [ :pointer, :double, :double ], :void ],
         # EAPI void evas_object_box_align_get(const Evas_Object *o, double *horizontal, double *vertical);
-        [ :evas_object_box_align_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_box_align_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_box_padding_set(Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :evas_object_box_padding_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_box_padding_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_box_padding_get(const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :evas_object_box_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_box_padding_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI Evas_Object_Box_Option *evas_object_box_append(Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_append, [ :evas_object, :evas_object ], :evas_object_box_option ],
+        [ :evas_object_box_append, [ :pointer, :pointer ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_prepend(Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_prepend, [ :evas_object, :evas_object ], :evas_object_box_option ],
+        [ :evas_object_box_prepend, [ :pointer, :pointer ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_before(Evas_Object *o, Evas_Object *child, const Evas_Object *reference);
-        [ :evas_object_box_insert_before, [ :evas_object, :evas_object, :evas_object ], :evas_object_box_option ],
+        [ :evas_object_box_insert_before, [ :pointer, :pointer, :pointer ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_after(Evas_Object *o, Evas_Object *child, const Evas_Object *reference);
-        [ :evas_object_box_insert_after, [ :evas_object, :evas_object, :evas_object ], :evas_object_box_option ],
+        [ :evas_object_box_insert_after, [ :pointer, :pointer, :pointer ], :evas_object_box_option ],
         # EAPI Evas_Object_Box_Option *evas_object_box_insert_at(Evas_Object *o, Evas_Object *child, unsigned int pos);
-        [ :evas_object_box_insert_at, [ :evas_object, :evas_object, :uint ], :evas_object_box_option ],
+        [ :evas_object_box_insert_at, [ :pointer, :pointer, :uint ], :evas_object_box_option ],
         # EAPI Eina_Bool evas_object_box_remove(Evas_Object *o, Evas_Object *child);
-        [ :evas_object_box_remove, [ :evas_object, :evas_object ], :bool ],
+        [ :evas_object_box_remove, [ :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_box_remove_at(Evas_Object *o, unsigned int pos);
-        [ :evas_object_box_remove_at, [ :evas_object, :uint ], :bool ],
+        [ :evas_object_box_remove_at, [ :pointer, :uint ], :bool ],
         # EAPI Eina_Bool evas_object_box_remove_all(Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_box_remove_all, [ :evas_object, :bool ], :bool ],
+        [ :evas_object_box_remove_all, [ :pointer, :bool ], :bool ],
         # EAPI Eina_Iterator *evas_object_box_iterator_new(const Evas_Object *o);
-        [ :evas_object_box_iterator_new, [ :evas_object ], :pointer ],
+        [ :evas_object_box_iterator_new, [ :pointer ], :pointer ],
         # EAPI Eina_Accessor *evas_object_box_accessor_new(const Evas_Object *o);
-        [ :evas_object_box_accessor_new, [ :evas_object ], :pointer ],
+        [ :evas_object_box_accessor_new, [ :pointer ], :pointer ],
         # EAPI Eina_List *evas_object_box_children_get(const Evas_Object *o);
-        [ :evas_object_box_children_get, [ :evas_object ], :eina_list ],
+        [ :evas_object_box_children_get, [ :pointer ], :eina_list ],
         # EAPI const char *evas_object_box_option_property_name_get(const Evas_Object *o, int property);
-        [ :evas_object_box_option_property_name_get, [ :evas_object, :int ], :string ],
+        [ :evas_object_box_option_property_name_get, [ :pointer, :int ], :string ],
         # EAPI int evas_object_box_option_property_id_get(const Evas_Object *o, const char *name);
-        [ :evas_object_box_option_property_id_get, [ :evas_object, :string ], :int ],
+        [ :evas_object_box_option_property_id_get, [ :pointer, :string ], :int ],
         # EAPI Eina_Bool evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        [ :evas_object_box_option_property_set, [ :evas_object, :evas_object_box_option, :int, :varargs ], :bool ],
+        [ :evas_object_box_option_property_set, [ :pointer, :evas_object_box_option, :int, :varargs ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        [ :evas_object_box_option_property_vset, [ :evas_object, :evas_object_box_option, :int, :pointer ], :bool ],
+        [ :evas_object_box_option_property_vset, [ :pointer, :evas_object_box_option, :int, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_get(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...);
-        [ :evas_object_box_option_property_get, [ :evas_object, :evas_object_box_option, :int, :varargs ], :bool ],
+        [ :evas_object_box_option_property_get, [ :pointer, :evas_object_box_option, :int, :varargs ], :bool ],
         # EAPI Eina_Bool evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args);
-        [ :evas_object_box_option_property_vget, [ :evas_object, :evas_object_box_option, :int, :pointer ], :bool ],
+        [ :evas_object_box_option_property_vget, [ :pointer, :evas_object_box_option, :int, :pointer ], :bool ],
         # EAPI Evas_Object *evas_object_table_add(Evas *evas);
-        [ :evas_object_table_add, [ :evas ], :evas_object ],
+        [ :evas_object_table_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_table_add_to(Evas_Object *parent);
-        [ :evas_object_table_add_to, [ :evas_object ], :evas_object ],
+        [ :evas_object_table_add_to, [ :pointer ], :pointer ],
         # EAPI void evas_object_table_homogeneous_set(Evas_Object *o, Evas_Object_Table_Homogeneous_Mode homogeneous);
-        [ :evas_object_table_homogeneous_set, [ :evas_object, :evas_object_table_homogeneous_mode ], :void ],
+        [ :evas_object_table_homogeneous_set, [ :pointer, :evas_object_table_homogeneous_mode ], :void ],
         # EAPI Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get(const Evas_Object *o);
-        [ :evas_object_table_homogeneous_get, [ :evas_object ], :evas_object_table_homogeneous_mode ],
+        [ :evas_object_table_homogeneous_get, [ :pointer ], :evas_object_table_homogeneous_mode ],
         # EAPI void evas_object_table_padding_set(Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical);
-        [ :evas_object_table_padding_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_table_padding_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_table_padding_get(const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical);
-        [ :evas_object_table_padding_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_table_padding_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_table_align_set(Evas_Object *o, double horizontal, double vertical);
-        [ :evas_object_table_align_set, [ :evas_object, :double, :double ], :void ],
+        [ :evas_object_table_align_set, [ :pointer, :double, :double ], :void ],
         # EAPI void evas_object_table_align_get(const Evas_Object *o, double *horizontal, double *vertical);
-        [ :evas_object_table_align_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_table_align_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_table_mirrored_set(Evas_Object *o, Eina_Bool mirrored);
-        [ :evas_object_table_mirrored_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_table_mirrored_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_table_mirrored_get(const Evas_Object *o);
-        [ :evas_object_table_mirrored_get, [ :evas_object ], :bool ],
+        [ :evas_object_table_mirrored_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_table_pack_get(const Evas_Object *o, Evas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan);
-        [ :evas_object_table_pack_get, [ :evas_object, :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        [ :evas_object_table_pack_get, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :evas_object_table_pack, [ :evas_object, :evas_object, :ushort, :ushort, :ushort, :ushort ], :bool ],
+        [ :evas_object_table_pack, [ :pointer, :pointer, :ushort, :ushort, :ushort, :ushort ], :bool ],
         # EAPI Eina_Bool evas_object_table_unpack(Evas_Object *o, Evas_Object *child);
-        [ :evas_object_table_unpack, [ :evas_object, :evas_object ], :bool ],
+        [ :evas_object_table_unpack, [ :pointer, :pointer ], :bool ],
         # EAPI void evas_object_table_clear(Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_table_clear, [ :evas_object, :bool ], :void ],
+        [ :evas_object_table_clear, [ :pointer, :bool ], :void ],
         # EAPI void evas_object_table_col_row_size_get(const Evas_Object *o, int *cols, int *rows);
-        [ :evas_object_table_col_row_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_table_col_row_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI Eina_Iterator *evas_object_table_iterator_new(const Evas_Object *o);
-        [ :evas_object_table_iterator_new, [ :evas_object ], :pointer ],
+        [ :evas_object_table_iterator_new, [ :pointer ], :pointer ],
         # EAPI Eina_Accessor *evas_object_table_accessor_new(const Evas_Object *o);
-        [ :evas_object_table_accessor_new, [ :evas_object ], :pointer ],
+        [ :evas_object_table_accessor_new, [ :pointer ], :pointer ],
         # EAPI Eina_List *evas_object_table_children_get(const Evas_Object *o);
-        [ :evas_object_table_children_get, [ :evas_object ], :eina_list ],
+        [ :evas_object_table_children_get, [ :pointer ], :eina_list ],
         # EAPI Evas_Object *evas_object_table_child_get(const Evas_Object *o, unsigned short col, unsigned short row);
-        [ :evas_object_table_child_get, [ :evas_object, :ushort, :ushort ], :evas_object ],
+        [ :evas_object_table_child_get, [ :pointer, :ushort, :ushort ], :pointer ],
         # EAPI Evas_Object *evas_object_grid_add(Evas *evas);
-        [ :evas_object_grid_add, [ :evas ], :evas_object ],
+        [ :evas_object_grid_add, [ :pointer ], :pointer ],
         # EAPI Evas_Object *evas_object_grid_add_to(Evas_Object *parent);
-        [ :evas_object_grid_add_to, [ :evas_object ], :evas_object ],
+        [ :evas_object_grid_add_to, [ :pointer ], :pointer ],
         # EAPI void evas_object_grid_size_set(Evas_Object *o, int w, int h);
-        [ :evas_object_grid_size_set, [ :evas_object, :int, :int ], :void ],
+        [ :evas_object_grid_size_set, [ :pointer, :int, :int ], :void ],
         # EAPI void evas_object_grid_size_get(const Evas_Object *o, int *w, int *h);
-        [ :evas_object_grid_size_get, [ :evas_object, :pointer, :pointer ], :void ],
+        [ :evas_object_grid_size_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void evas_object_grid_mirrored_set(Evas_Object *o, Eina_Bool mirrored);
-        [ :evas_object_grid_mirrored_set, [ :evas_object, :bool ], :void ],
+        [ :evas_object_grid_mirrored_set, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_grid_mirrored_get(const Evas_Object *o);
-        [ :evas_object_grid_mirrored_get, [ :evas_object ], :bool ],
+        [ :evas_object_grid_mirrored_get, [ :pointer ], :bool ],
         # EAPI Eina_Bool evas_object_grid_pack(Evas_Object *o, Evas_Object *child, int x, int y, int w, int h);
-        [ :evas_object_grid_pack, [ :evas_object, :evas_object, :int, :int, :int, :int ], :bool ],
+        [ :evas_object_grid_pack, [ :pointer, :pointer, :int, :int, :int, :int ], :bool ],
         # EAPI Eina_Bool evas_object_grid_unpack(Evas_Object *o, Evas_Object *child);
-        [ :evas_object_grid_unpack, [ :evas_object, :evas_object ], :bool ],
+        [ :evas_object_grid_unpack, [ :pointer, :pointer ], :bool ],
         # EAPI void evas_object_grid_clear(Evas_Object *o, Eina_Bool clear);
-        [ :evas_object_grid_clear, [ :evas_object, :bool ], :void ],
+        [ :evas_object_grid_clear, [ :pointer, :bool ], :void ],
         # EAPI Eina_Bool evas_object_grid_pack_get(const Evas_Object *o, Evas_Object *child, int *x, int *y, int *w, int *h);
-        [ :evas_object_grid_pack_get, [ :evas_object, :evas_object, :pointer, :pointer, :pointer, :pointer ], :bool ],
+        [ :evas_object_grid_pack_get, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :bool ],
         # EAPI Eina_Iterator *evas_object_grid_iterator_new(const Evas_Object *o);
-        [ :evas_object_grid_iterator_new, [ :evas_object ], :pointer ],
+        [ :evas_object_grid_iterator_new, [ :pointer ], :pointer ],
         # EAPI Eina_Accessor *evas_object_grid_accessor_new(const Evas_Object *o);
-        [ :evas_object_grid_accessor_new, [ :evas_object ], :pointer ],
+        [ :evas_object_grid_accessor_new, [ :pointer ], :pointer ],
         # EAPI Eina_List *evas_object_grid_children_get(const Evas_Object *o);
-        [ :evas_object_grid_children_get, [ :evas_object ], :eina_list ],
-        # EAPI Eina_Bool evas_cserve_want_get(void);
-        [ :evas_cserve_want_get, [  ], :bool ],
-        # EAPI Eina_Bool evas_cserve_connected_get(void);
-        [ :evas_cserve_connected_get, [  ], :bool ],
-        # EAPI Eina_Bool evas_cserve_stats_get(Evas_Cserve_Stats *stats);
-        [ :evas_cserve_stats_get, [ :evas_cserve_stats ], :bool ],
-        # EAPI void evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache);
-        [ :evas_cserve_image_cache_contents_clean, [ :evas_cserve_image_cache ], :void ],
-        # EAPI Eina_Bool evas_cserve_config_get(Evas_Cserve_Config *config);
-        [ :evas_cserve_config_get, [ :evas_cserve_config ], :bool ],
-        # EAPI Eina_Bool evas_cserve_config_set(const Evas_Cserve_Config *config);
-        [ :evas_cserve_config_set, [ :evas_cserve_config ], :bool ],
-        # EAPI void evas_cserve_disconnect(void);
-        [ :evas_cserve_disconnect, [  ], :void ],
-        # EAPI const char *evas_load_error_str(Evas_Load_Error error);
-        [ :evas_load_error_str, [ :evas_load_error ], :string ],
-        # EAPI void evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b);
-        [ :evas_color_hsv_to_rgb, [ :float, :float, :float, :pointer, :pointer, :pointer ], :void ],
-        # EAPI void evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v);
-        [ :evas_color_rgb_to_hsv, [ :int, :int, :int, :pointer, :pointer, :pointer ], :void ],
-        # EAPI void evas_color_argb_premul(int a, int *r, int *g, int *b);
-        [ :evas_color_argb_premul, [ :int, :pointer, :pointer, :pointer ], :void ],
-        # EAPI void evas_color_argb_unpremul(int a, int *r, int *g, int *b);
-        [ :evas_color_argb_unpremul, [ :int, :pointer, :pointer, :pointer ], :void ],
-        # EAPI void evas_data_argb_premul(unsigned int *data, unsigned int len);
-        [ :evas_data_argb_premul, [ :pointer, :uint ], :void ],
-        # EAPI void evas_data_argb_unpremul(unsigned int *data, unsigned int len);
-        [ :evas_data_argb_unpremul, [ :pointer, :uint ], :void ],
-        # EAPI int evas_string_char_next_get(const char *str, int pos, int *decoded);
-        [ :evas_string_char_next_get, [ :string, :int, :pointer ], :int ],
-        # EAPI int evas_string_char_prev_get(const char *str, int pos, int *decoded);
-        [ :evas_string_char_prev_get, [ :string, :int, :pointer ], :int ],
-        # EAPI int evas_string_char_len_get(const char *str);
-        [ :evas_string_char_len_get, [ :string ], :int ],
+        [ :evas_object_grid_children_get, [ :pointer ], :eina_list ],
         # EAPI const Evas_Modifier *evas_key_modifier_get(const Evas *e);
-        [ :evas_key_modifier_get, [ :evas ], :evas_modifier ],
+        [ :evas_key_modifier_get, [ :pointer ], :evas_modifier ],
         # EAPI const Evas_Lock *evas_key_lock_get(const Evas *e);
-        [ :evas_key_lock_get, [ :evas ], :evas_lock ],
-        # EAPI Eina_Bool evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname);
-        [ :evas_key_modifier_is_set, [ :evas_modifier, :string ], :bool ],
-        # EAPI Eina_Bool evas_key_lock_is_set(const Evas_Lock *l, const char *keyname);
-        [ :evas_key_lock_is_set, [ :evas_lock, :string ], :bool ],
+        [ :evas_key_lock_get, [ :pointer ], :evas_lock ],
         # EAPI void evas_key_modifier_add(Evas *e, const char *keyname);
-        [ :evas_key_modifier_add, [ :evas, :string ], :void ],
+        [ :evas_key_modifier_add, [ :pointer, :string ], :void ],
         # EAPI void evas_key_modifier_del(Evas *e, const char *keyname);
-        [ :evas_key_modifier_del, [ :evas, :string ], :void ],
+        [ :evas_key_modifier_del, [ :pointer, :string ], :void ],
         # EAPI void evas_key_lock_add(Evas *e, const char *keyname);
-        [ :evas_key_lock_add, [ :evas, :string ], :void ],
+        [ :evas_key_lock_add, [ :pointer, :string ], :void ],
         # EAPI void evas_key_lock_del(Evas *e, const char *keyname);
-        [ :evas_key_lock_del, [ :evas, :string ], :void ],
+        [ :evas_key_lock_del, [ :pointer, :string ], :void ],
         # EAPI void evas_key_modifier_on(Evas *e, const char *keyname);
-        [ :evas_key_modifier_on, [ :evas, :string ], :void ],
+        [ :evas_key_modifier_on, [ :pointer, :string ], :void ],
         # EAPI void evas_key_modifier_off(Evas *e, const char *keyname);
-        [ :evas_key_modifier_off, [ :evas, :string ], :void ],
+        [ :evas_key_modifier_off, [ :pointer, :string ], :void ],
         # EAPI void evas_key_lock_on(Evas *e, const char *keyname);
-        [ :evas_key_lock_on, [ :evas, :string ], :void ],
+        [ :evas_key_lock_on, [ :pointer, :string ], :void ],
         # EAPI void evas_key_lock_off(Evas *e, const char *keyname);
-        [ :evas_key_lock_off, [ :evas, :string ], :void ],
+        [ :evas_key_lock_off, [ :pointer, :string ], :void ],
         # EAPI Evas_Modifier_Mask evas_key_modifier_mask_get(const Evas *e, const char *keyname);
-        [ :evas_key_modifier_mask_get, [ :evas, :string ], :ulong_long ],
+        [ :evas_key_modifier_mask_get, [ :pointer, :string ], :ulong_long ],
         # EAPI Eina_Bool evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
-        [ :evas_object_key_grab, [ :evas_object, :string, :ulong_long, :ulong_long, :bool ], :bool ],
+        [ :evas_object_key_grab, [ :pointer, :string, :ulong_long, :ulong_long, :bool ], :bool ],
         # EAPI void evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
-        [ :evas_object_key_ungrab, [ :evas_object, :string, :ulong_long, :ulong_long ], :void ],
+        [ :evas_object_key_ungrab, [ :pointer, :string, :ulong_long, :ulong_long ], :void ],
         # EAPI unsigned int evas_touch_point_list_count(Evas *e);
-        [ :evas_touch_point_list_count, [ :evas ], :uint ],
+        [ :evas_touch_point_list_count, [ :pointer ], :uint ],
         # EAPI void evas_touch_point_list_nth_xy_get(Evas *e, unsigned int n, Evas_Coord *x, Evas_Coord *y);
-        [ :evas_touch_point_list_nth_xy_get, [ :evas, :uint, :pointer, :pointer ], :void ],
+        [ :evas_touch_point_list_nth_xy_get, [ :pointer, :uint, :pointer, :pointer ], :void ],
         # EAPI int evas_touch_point_list_nth_id_get(Evas *e, unsigned int n);
-        [ :evas_touch_point_list_nth_id_get, [ :evas, :uint ], :int ],
+        [ :evas_touch_point_list_nth_id_get, [ :pointer, :uint ], :int ],
         # EAPI Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *e, unsigned int n);
-        [ :evas_touch_point_list_nth_state_get, [ :evas, :uint ], :evas_touch_point_state ],
+        [ :evas_touch_point_list_nth_state_get, [ :pointer, :uint ], :evas_touch_point_state ],
+        # EAPI Evas_Out *evas_out_add(Evas *e);
+        [ :evas_out_add, [ :pointer ], :pointer ],
+        # EAPI void evas_output_del(Evas_Out *evo);
+        [ :evas_output_del, [ :pointer ], :void ],
+        # EAPI void evas_output_view_set(Evas_Out *evo, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+        [ :evas_output_view_set, [ :pointer, :int, :int, :int, :int ], :void ],
+        # EAPI void evas_output_view_get(const Evas_Out *evo, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+        [ :evas_output_view_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI Eina_Bool evas_output_engine_info_set(Evas_Out *evo, Evas_Engine_Info *info);
+        [ :evas_output_engine_info_set, [ :pointer, :evas_engine_info ], :bool ],
+        # EAPI Evas_Engine_Info *evas_output_engine_info_get(const Evas_Out *evo);
+        [ :evas_output_engine_info_get, [ :pointer ], :evas_engine_info ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/evas_loader.rb b/lib/efl/native/evas_loader.rb
new file mode 100644
index 0000000..173bdc8
--- /dev/null
+++ b/lib/efl/native/evas_loader.rb
@@ -0,0 +1,70 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native'
+#
+module Efl
+    #
+    module Evas_Loader
+        #
+        FCT_PREFIX = 'evas_loader_' unless const_defined? :FCT_PREFIX
+        #
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
+        end
+        #
+    end
+    #
+    module Native
+        #
+        ffi_lib 'evas.so.1'
+        #
+        # ENUMS
+        # typedef enum _Evas_Module_Type {...} Evas_Module_Type;
+        enum :evas_module_type, [ :evas_module_type_engine, 0, :evas_module_type_image_loader, 1, :evas_module_type_image_saver, 2,
+            :evas_module_type_object, 3 ]
+        # typedef enum _Evas_Load_Error {...} Evas_Load_Error;
+        enum :evas_load_error, [ :evas_load_error_none, 0, :evas_load_error_generic, 1, :evas_load_error_does_not_exist, 2,
+            :evas_load_error_permission_denied, 3, :evas_load_error_resource_allocation_failed, 4, :evas_load_error_corrupt_file, 5,
+            :evas_load_error_unknown_format, 6 ]
+        # typedef enum _Evas_Image_Animated_Loop_Hint {...} Evas_Image_Animated_Loop_Hint;
+        enum :evas_image_animated_loop_hint, [ :evas_image_animated_hint_none, 0, :evas_image_animated_hint_loop, 1,
+            :evas_image_animated_hint_pingpong, 2 ]
+        # typedef enum _Evas_Image_Scale_Hint {...} Evas_Image_Scale_Hint;
+        enum :evas_image_scale_hint, [ :evas_image_scale_hint_none, 0, :evas_image_scale_hint_dynamic, 1, :evas_image_scale_hint_static, 2 ]
+        #
+        # TYPEDEFS
+        # typedef struct _Evas_Module_Api Evas_Module_Api;
+        typedef :pointer, :evas_module_api
+        # typedef struct _Evas_Module Evas_Module;
+        typedef :pointer, :evas_module
+        # typedef struct _Evas_Module_Path Evas_Module_Path;
+        typedef :pointer, :evas_module_path
+        # typedef struct _Evas_Module_Engine Evas_Module_Engine;
+        typedef :pointer, :evas_module_engine
+        # typedef struct _Evas_Module_Public Evas_Module_Public;
+        typedef :pointer, :evas_module_public
+        # typedef struct _Evas_Image_Load_Opts Evas_Image_Load_Opts;
+        typedef :pointer, :evas_image_load_opts
+        # typedef struct _Evas_Image_Animated Evas_Image_Animated;
+        typedef :pointer, :evas_image_animated
+        # typedef struct _Evas_Image_Property Evas_Image_Property;
+        typedef :pointer, :evas_image_property
+        # typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
+        typedef :pointer, :evas_image_load_func
+        #
+        # FUNCTIONS
+        fcts = [
+        # EAPI Eina_Bool evas_module_register (const Evas_Module_Api *module, Evas_Module_Type type);
+        [ :evas_module_register, [ :evas_module_api, :evas_module_type ], :bool ],
+        # EAPI Eina_Bool evas_module_unregister (const Evas_Module_Api *module, Evas_Module_Type type);
+        [ :evas_module_unregister, [ :evas_module_api, :evas_module_type ], :bool ],
+        ]
+        #
+        attach_fcts fcts
+        #
+    end
+end
+#
+# EOF
diff --git a/tools/check_loading b/tools/check_loading
index 0d082ed..5cd31dd 100755
--- a/tools/check_loading
+++ b/tools/check_loading
@@ -30,7 +30,7 @@ function each () {
 RUBY=/usr/bin/ruby
 time each
 echo
-RUBY=/opt/ruby1.8/bin/ruby
-time each
-echo
+# RUBY=/opt/ruby1.8/bin/ruby
+# time each
+# echo
 #
diff --git a/tools/extract-api.sh b/tools/extract-api.sh
index c6033c9..e7dbdf7 100755
--- a/tools/extract-api.sh
+++ b/tools/extract-api.sh
@@ -23,6 +23,8 @@ else
     echo "new api will be stored in $NEXT"
 fi
 #
+rm $NEXT/*
+#
 ELM_INCLUDE_DIR=$(find ${INCLUDE} -name elementary-* | sort | tail -n1)
 #
 for header in \
@@ -35,14 +37,15 @@ for header in \
     "${INCLUDE}/eina-1/eina/eina_file.h" \
     "${INCLUDE}/eet-1/Eet.h" \
     "${INCLUDE}/evas-1/Evas.h" \
+    "${INCLUDE}/evas-1/Evas_Loader.h" \
     "${INCLUDE}/evas-1/Evas_GL.h" \
     "${INCLUDE}/ecore-1/Ecore.h" \
-    "${INCLUDE}/ecore-1/Ecore_Con.h" \
-    "${INCLUDE}/ecore-1/Ecore_Input.h" \
+    "${INCLUDE}/ecore-con-1/Ecore_Con.h" \
+    "${INCLUDE}/ecore-input-1/Ecore_Input.h" \
     "${INCLUDE}/ecore-1/Ecore_Getopt.h" \
-    "${INCLUDE}/ecore-1/Ecore_Evas.h" \
-    "${INCLUDE}/ecore-1/Ecore_Fb.h" \
-    "${INCLUDE}/ecore-1/Ecore_File.h" \
+    "${INCLUDE}/ecore-evas-1/Ecore_Evas_Types.h" \
+    "${INCLUDE}/ecore-evas-1/Ecore_Evas.h" \
+    "${INCLUDE}/ecore-file-1/Ecore_File.h" \
     "${INCLUDE}/eio-1/Eio.h" \
     "${INCLUDE}/embryo-1/Embryo.h" \
     "${INCLUDE}/edje-1/Edje.h" \
@@ -56,21 +59,12 @@ for header in \
     "${INCLUDE}/efreet-1/efreet_utils.h" \
     "${INCLUDE}/efreet-1/Efreet_Mime.h" \
     "${INCLUDE}/efreet-1/Efreet_Trash.h" \
-    "${INCLUDE}/e_dbus-1/E_DBus.h" \
-    "${INCLUDE}/e_dbus-1/E_Notify.h" \
-    "${INCLUDE}/e_dbus-1/E_Notification_Daemon.h" \
-    "${INCLUDE}/e_dbus-1/E_Bluez.h" \
-    "${INCLUDE}/e_dbus-1/E_Hal.h" \
-    "${INCLUDE}/e_dbus-1/E_Ofono.h" \
-    "${INCLUDE}/e_dbus-1/E_Ukit.h" \
-    "${INCLUDE}/e_dbus-1/connman0_7x/E_Connman.h" \
     "${INCLUDE}/eeze-1/Eeze.h" \
     "${INCLUDE}/eeze-1/Eeze_Disk.h" \
     "${INCLUDE}/eeze-1/Eeze_Net.h" \
     "${INCLUDE}/emotion-1/Emotion.h" \
     "${INCLUDE}/ethumb-1/Ethumb.h" \
-    "${INCLUDE}/ethumb-1/Ethumb_Client.h" \
-    "${INCLUDE}/ethumb-1/Ethumb_Plugin.h" \
+    "${INCLUDE}/ethumb-client-1/Ethumb_Client.h" \
     "${ELM_INCLUDE_DIR}/Elementary.h" \
     "${ELM_INCLUDE_DIR}/elm_general.h" \
     "${ELM_INCLUDE_DIR}/elm_tooltip.h" \
@@ -158,28 +152,30 @@ for header in \
     "${ELM_INCLUDE_DIR}/elm_win.h" \
     ; do
     #
+    DIR=$(dirname $header)
+    FILE=$(basename $header)
+    BASE=${header%.h}
+    #
     if [ ! -e "$header" ]; then
         echo "$header not found, we won't generate bindings for this header."
         continue
-    else
-        echo "extracting API from $header"
     fi
     #
-    DIR=$(dirname $header)
-    FILE=$(basename $header)
-    BASE=${header%.h}
-    #
-    for what in functions enums types callbacks variables; do
-        F=$FILE-$what
-        sed -r -n -f "$P/sed-$what" $header > $NEXT/$F
-        for more_header in "${BASE}_common.h" "${BASE}_legacy.h"; do
-            [ -e $more_header ] && sed -r -n -f "$P/sed-$what" $more_header >> $NEXT/$F
+    echo "extracting API from $header"
+    for header in "$header" "${BASE}_common.h" "${BASE}_legacy.h" "${BASE}_Common.h" "${BASE}_Legacy.h"; do
+        [ -f "$header" ] || continue
+        echo "extracting API from $header"
+        for what in functions enums types callbacks variables; do
+            prev="$NEXT/$FILE-$what"
+            next="$NEXT/$FILE-$what"
+            difff="$P/$FILE-$what-diff"
+            sed -r -n -f "$P/sed-$what" $header >> $next
+            if [ -f "$prev" ]; then
+                diff -u0 "$prev" "$next" > $difff
+                N=$(cat $difff | wc -l)
+                [ $N -eq 0 ] && rm $difff || echo "see $difff"
+            fi
         done
-        if [ -f $PREV/$F ]; then
-            diff -u0 $PREV/$F $NEXT/$F > $P/$F-diff
-            N=$(cat $P/$F-diff | wc -l)
-            [ $N -eq 0 ] && rm $P/$F-diff || echo "see $P/$F-diff"
-        fi
     done
     #
 done
diff --git a/tools/genruby.rb b/tools/genruby.rb
index 4404b89..3cfa2f1 100755
--- a/tools/genruby.rb
+++ b/tools/genruby.rb
@@ -7,16 +7,16 @@ WRAP_LEN=150
 #
 def set_type t, sym
     return ETYPES['Eina_Bool'] if t=='Eina_Bool'
+#    v = ( ETYPES[sym].nil? ? ( TYPES[sym].nil? ? ':'+sym.downcase : TYPES[sym] ) : ETYPES[sym] )
+    v = ( TYPES[sym].nil? ? ':'+sym.downcase : TYPES[sym] )
     if ETYPES[t].nil?
-#        v = ( ETYPES[sym].nil? ? ( TYPES[sym].nil? ? ':'+sym.downcase : TYPES[sym] ) : ETYPES[sym] )
-        v = ( TYPES[sym].nil? ? ':'+sym.downcase : TYPES[sym] )
         ETYPES[t] = v
         printf "\033[0;35m%40s\033[0m => \033[0;36m%s\033[0m\n",t,v
-        return v
     else
         printf "\033[0;31mERROR type #{t} => #{sym} already exists!\033[0m\n"
-        # exit 1
+        exit 1 if ETYPES[t] != v
     end
+    return v
 end
 #
 def get_type t
@@ -128,6 +128,12 @@ def gen_typedefs path, indent
             next
         end
         tsym = set_type t, sym
+        if tsym.nil?
+            puts l
+            puts t
+            puts sym
+            exit 1
+        end
         r << indent+"# #{l}"
         r << indent+"typedef #{tsym}, :#{t.downcase}"
     end
@@ -291,10 +297,12 @@ libs << efl_h('eina'+SO_MAJ,'eina_list.h','EinaList')
 libs << efl_h('eina'+SO_MAJ,'eina_hash.h','EinaHash')
 libs << efl_h('eina'+SO_MAJ,'eina_file.h','EinaFile')
 libs << efl_h('eet'+SO_MAJ,'Eet.h','Eet',nil,nil,["#{NATIVE}/eina_xattr","#{NATIVE}/eina_list"])
+libs << efl_h('evas'+SO_MAJ,'Evas_Loader.h','Evas_Loader',nil,nil)
 libs << efl_h('evas'+SO_MAJ,'Evas.h','Evas',nil,nil,["#{NATIVE}/eina_list"],['EVAS_LAYER_MIN','EVAS_LAYER_MAX'])
 libs << efl_h('ecore'+SO_MAJ,'Ecore.h','Ecore')
 libs << efl_h('ecore_input'+SO_MAJ,'Ecore_Input.h','EcoreInput','ecore_event',nil,["#{NATIVE}/eina_list"])
 libs << efl_h('ecore'+SO_MAJ,'Ecore_Getopt.h','EcoreGetopt',nil,nil,["#{NATIVE}/eina_list"])
+libs << efl_h('ecore_evas'+SO_MAJ,'Ecore_Evas_Types.h','EcoreEvasTypes',nil,nil)
 libs << efl_h('ecore_evas'+SO_MAJ,'Ecore_Evas.h','EcoreEvas',nil,nil,["#{NATIVE}/ecore_getopt","#{NATIVE}/evas"])
 libs << efl_h('eio'+SO_MAJ,'Eio.h','Eio',nil,nil,["#{NATIVE}/eina_file","#{NATIVE}/eet"])
 libs << efl_h('embryo'+SO_MAJ,'Embryo.h','Embryo')
@@ -309,21 +317,12 @@ libs << efl_h('efreet'+SO_MAJ,'efreet_ini.h','EfreetIni','efreet_ini')
 libs << efl_h('efreet'+SO_MAJ,'efreet_utils.h','EfreetUtils','efreet_utils',nil,["#{NATIVE}/efreet_desktop"])
 libs << efl_h('efreet_mime'+SO_MAJ,'Efreet_Mime.h','EfreetMime')
 libs << efl_h('efreet_trash'+SO_MAJ,'Efreet_Trash.h','EfreetTrash',nil,nil,["#{NATIVE}/eina_list","#{NATIVE}/efreet_uri"])
-libs << efl_h('edbus'+SO_MAJ,'E_DBus.h','Edbus',nil,'edbus.rb',["#{NATIVE}/eina_list"])
-libs << efl_h('enotify'+SO_MAJ,'E_Notify.h','Enotify','e_notification','enotify.rb',["#{NATIVE}/evas","#{NATIVE}/edbus"])
-libs << efl_h('enotify'+SO_MAJ,'E_Notification_Daemon.h','EnotificationDaemon','e_notification_daemon','enotification_daemon.rb',["#{NATIVE}/enotify"])
-libs << efl_h('ebluez'+SO_MAJ,'E_Bluez.h','Ebluez','e_bluez','ebluez.rb',["#{NATIVE}/edbus"])
-libs << efl_h('eofono'+SO_MAJ,'E_Ofono.h','Eofono','e_ofono','eofono.rb',["#{NATIVE}/edbus"])
-libs << efl_h('eukit'+SO_MAJ,'E_Ukit.h','Eukit','e_ukit','eukit.rb',["#{NATIVE}/edbus"])
-libs << efl_h('ehal'+SO_MAJ,'E_Hal.h','Ehal','e_hal','ehal.rb',["#{NATIVE}/edbus"])
-libs << efl_h('econnman0_7x'+SO_MAJ,'E_Connman.h','EConnman','e_connman','econnman.rb',["#{NATIVE}/edbus"])
 libs << efl_h('eeze'+SO_MAJ,'Eeze.h','Eeze',nil,nil,["#{NATIVE}/eina_list"])
 libs << efl_h('eeze'+SO_MAJ,'Eeze_Disk.h','EezeDisk')
 libs << efl_h('eeze'+SO_MAJ,'Eeze_Net.h','EezeNet',nil,nil,["#{NATIVE}/eina_list"])
 libs << efl_h('emotion'+SO_MAJ,'Emotion.h','Emotion',nil,nil,["#{NATIVE}/evas"])
 libs << efl_h('ethumb'+SO_MAJ,'Ethumb.h','Ethumb')
 libs << efl_h('ethumb_client'+SO_MAJ,'Ethumb_Client.h','EthumbClient',nil,nil,["#{NATIVE}/ethumb"])
-libs << efl_h('ethumb'+SO_MAJ,'Ethumb_Plugin.h','EthumbPlugin',nil,nil,["#{NATIVE}/evas","#{NATIVE}/ecore_evas","#{NATIVE}/ethumb"])
 #
 ELM_LIB='elementary'+SO_MAJ
 #