[EflSharp] Update Circle and efl cs files (#819)
[platform/core/csapi/tizenfx.git] / internals / src / EflSharp / EflSharp / efl / elm_interface_scrollable.eo.cs
index 9e7e079..1c9f6cf 100644 (file)
@@ -3,10 +3,12 @@ using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.ComponentModel;
-namespace Elm { 
+namespace Elm {
+
 /// <summary>Elm scrollable mixin</summary>
-[IInterfaceScrollableNativeInherit]
+[Elm.IInterfaceScrollableConcrete.NativeMethods]
 public interface IInterfaceScrollable : 
     Efl.Ui.IScrollable ,
     Efl.Ui.IWidgetFocusManager ,
@@ -23,8 +25,7 @@ public interface IInterfaceScrollable :
 /// Default values for x and y are 0.0</summary>
 /// <param name="x">Horizontal scrolling gravity</param>
 /// <param name="y">Vertical scrolling gravity</param>
-/// <returns></returns>
-void GetGravity( out double x,  out double y);
+void GetGravity(out double x, out double y);
     /// <summary>Control scrolling gravity on the scrollable
 /// The gravity defines how the scroller will adjust its view when the size of the scroller contents increases.
 /// 
@@ -35,27 +36,23 @@ void GetGravity( out double x,  out double y);
 /// Default values for x and y are 0.0</summary>
 /// <param name="x">Horizontal scrolling gravity</param>
 /// <param name="y">Vertical scrolling gravity</param>
-/// <returns></returns>
-void SetGravity( double x,  double y);
+void SetGravity(double x, double y);
     /// <summary>Bouncing behavior
 /// When scrolling, the scroller may &quot;bounce&quot; when reaching an edge of the content object. This is a visual way to indicate the end has been reached. This is enabled by default for both axis. This API will set if it is enabled for the given axis with the boolean parameters for each axis.</summary>
 /// <param name="horiz">Horizontal bounce policy.</param>
 /// <param name="vert">Vertical bounce policy.</param>
-/// <returns></returns>
-void GetBounceAllow( out bool horiz,  out bool vert);
+void GetBounceAllow(out bool horiz, out bool vert);
     /// <summary>Bouncing behavior
 /// When scrolling, the scroller may &quot;bounce&quot; when reaching an edge of the content object. This is a visual way to indicate the end has been reached. This is enabled by default for both axis. This API will set if it is enabled for the given axis with the boolean parameters for each axis.</summary>
 /// <param name="horiz">Horizontal bounce policy.</param>
 /// <param name="vert">Vertical bounce policy.</param>
-/// <returns></returns>
-void SetBounceAllow( bool horiz,  bool vert);
+void SetBounceAllow(bool horiz, bool vert);
     /// <summary>Control Wheel disable Enable or disable mouse wheel to be used to scroll the scroller content. heel is enabled by default.</summary>
 /// <returns><c>true</c> if wheel is disabled, <c>false</c> otherwise</returns>
 bool GetWheelDisabled();
     /// <summary>Control Wheel disable Enable or disable mouse wheel to be used to scroll the scroller content. heel is enabled by default.</summary>
 /// <param name="disabled"><c>true</c> if wheel is disabled, <c>false</c> otherwise</param>
-/// <returns></returns>
-void SetWheelDisabled( bool disabled);
+void SetWheelDisabled(bool disabled);
     /// <summary>Blocking of scrolling (per axis)
 /// This function will block scrolling movement (by input of a user) in a given direction. One can disable movements in the X axis, the Y axis or both. The default value is <c>none</c>, where movements are allowed in both directions.
 /// 
@@ -67,27 +64,23 @@ Efl.Ui.ScrollBlock GetMovementBlock();
 /// 
 /// What makes this function different from freeze_push(), hold_push() and lock_x_set() (or lock_y_set()) is that it doesn&apos;t propagate its effects to any parent or child widget of <c>obj</c>. Only the target scrollable widget will be locked with regard to scrolling.</summary>
 /// <param name="block">Which axis (or axes) to block</param>
-/// <returns></returns>
-void SetMovementBlock( Efl.Ui.ScrollBlock block);
+void SetMovementBlock(Efl.Ui.ScrollBlock block);
     /// <summary>Momentum animator</summary>
 /// <returns><c>true</c> if disabled, <c>false</c> otherwise</returns>
 bool GetMomentumAnimatorDisabled();
     /// <summary>Momentum animator</summary>
 /// <param name="disabled"><c>true</c> if disabled, <c>false</c> otherwise</param>
-/// <returns></returns>
-void SetMomentumAnimatorDisabled( bool disabled);
+void SetMomentumAnimatorDisabled(bool disabled);
     /// <summary>Scrollbar visibility policy
 /// #ELM_SCROLLER_POLICY_AUTO means the scrollbar is made visible if it is needed, and otherwise kept hidden. #ELM_SCROLLER_POLICY_ON turns it on all the time, and #ELM_SCROLLER_POLICY_OFF always keeps it off. This applies respectively for the horizontal and vertical scrollbars.</summary>
 /// <param name="hbar">Horizontal scrollbar policy</param>
 /// <param name="vbar">Vertical scrollbar policy</param>
-/// <returns></returns>
-void GetPolicy( out Elm.Scroller.Policy hbar,  out Elm.Scroller.Policy vbar);
+void GetPolicy(out Elm.Scroller.Policy hbar, out Elm.Scroller.Policy vbar);
     /// <summary>Scrollbar visibility policy
 /// #ELM_SCROLLER_POLICY_AUTO means the scrollbar is made visible if it is needed, and otherwise kept hidden. #ELM_SCROLLER_POLICY_ON turns it on all the time, and #ELM_SCROLLER_POLICY_OFF always keeps it off. This applies respectively for the horizontal and vertical scrollbars.</summary>
 /// <param name="hbar">Horizontal scrollbar policy</param>
 /// <param name="vbar">Vertical scrollbar policy</param>
-/// <returns></returns>
-void SetPolicy( Elm.Scroller.Policy hbar,  Elm.Scroller.Policy vbar);
+void SetPolicy(Elm.Scroller.Policy hbar, Elm.Scroller.Policy vbar);
     /// <summary>Currently visible content region
 /// This gets the current region in the content object that is visible through the scroller. The region co-ordinates are returned in the <c>x</c>, <c>y</c>, <c>w</c>, <c>h</c> values pointed to.
 /// 
@@ -98,8 +91,7 @@ void SetPolicy( Elm.Scroller.Policy hbar,  Elm.Scroller.Policy vbar);
 /// <param name="y">Y coordinate of the region</param>
 /// <param name="w">Width of the region</param>
 /// <param name="h">Height of the region</param>
-/// <returns></returns>
-void GetContentRegion( out int x,  out int y,  out int w,  out int h);
+void GetContentRegion(out int x, out int y, out int w, out int h);
     /// <summary>Currently visible content region
 /// This gets the current region in the content object that is visible through the scroller. The region co-ordinates are returned in the <c>x</c>, <c>y</c>, <c>w</c>, <c>h</c> values pointed to.
 /// 
@@ -110,74 +102,63 @@ void GetContentRegion( out int x,  out int y,  out int w,  out int h);
 /// <param name="y">Y coordinate of the region</param>
 /// <param name="w">Width of the region</param>
 /// <param name="h">Height of the region</param>
-/// <returns></returns>
-void SetContentRegion( int x,  int y,  int w,  int h);
+void SetContentRegion(int x, int y, int w, int h);
     /// <summary>It decides whether the scrollable object propagates the events to content object or not.</summary>
 /// <returns><c>true</c> if events are propagated, <c>false</c> otherwise</returns>
 bool GetContentEvents();
     /// <summary>It decides whether the scrollable object propagates the events to content object or not.</summary>
 /// <param name="repeat_events"><c>true</c> if events are propagated, <c>false</c> otherwise</param>
-/// <returns></returns>
-void SetContentEvents( bool repeat_events);
+void SetContentEvents(bool repeat_events);
     /// <summary>Scroll page size relative to viewport size.
 /// The scroller is capable of limiting scrolling by the user to &quot;pages&quot;. That is to jump by and only show a &quot;whole page&quot; at a time as if the continuous area of the scroller content is split into page sized pieces. This sets the size of a page relative to the viewport of the scroller. 1.0 is &quot;1 viewport&quot; is size (horizontally or vertically). 0.0 turns it off in that axis. This is mutually exclusive with page size (see <see cref="Elm.IInterfaceScrollable.GetPageSize"/> for more information). Likewise 0.5 is &quot;half a viewport&quot;. Sane usable values are normally between 0.0 and 1.0 including 1.0. If you only want 1 axis to be page &quot;limited&quot;, use 0.0 for the other axis.</summary>
 /// <param name="x">The horizontal page relative size</param>
 /// <param name="y">The vertical page relative size</param>
-/// <returns></returns>
-void GetPageSize( out int x,  out int y);
+void GetPageSize(out int x, out int y);
     /// <summary>Scroll page size relative to viewport size.
 /// The scroller is capable of limiting scrolling by the user to &quot;pages&quot;. That is to jump by and only show a &quot;whole page&quot; at a time as if the continuous area of the scroller content is split into page sized pieces. This sets the size of a page relative to the viewport of the scroller. 1.0 is &quot;1 viewport&quot; is size (horizontally or vertically). 0.0 turns it off in that axis. This is mutually exclusive with page size (see <see cref="Elm.IInterfaceScrollable.GetPageSize"/> for more information). Likewise 0.5 is &quot;half a viewport&quot;. Sane usable values are normally between 0.0 and 1.0 including 1.0. If you only want 1 axis to be page &quot;limited&quot;, use 0.0 for the other axis.</summary>
 /// <param name="x">The horizontal page relative size</param>
 /// <param name="y">The vertical page relative size</param>
-/// <returns></returns>
-void SetPageSize( int x,  int y);
+void SetPageSize(int x, int y);
     /// <summary>Bounce animator</summary>
 /// <returns><c>true</c> if bounce animation is disabled, <c>false</c> otherwise</returns>
 bool GetBounceAnimatorDisabled();
     /// <summary>Bounce animator</summary>
 /// <param name="disabled"><c>true</c> if bounce animation is disabled, <c>false</c> otherwise</param>
-/// <returns></returns>
-void SetBounceAnimatorDisabled( bool disabled);
+void SetBounceAnimatorDisabled(bool disabled);
     /// <summary>Page scroll limit</summary>
 /// <param name="page_limit_h">Page limit horizontal</param>
 /// <param name="page_limit_v">Page limit vertical</param>
-/// <returns></returns>
-void GetPageScrollLimit( out int page_limit_h,  out int page_limit_v);
+void GetPageScrollLimit(out int page_limit_h, out int page_limit_v);
     /// <summary>Page scroll limit</summary>
 /// <param name="page_limit_h">Page limit horizontal</param>
 /// <param name="page_limit_v">Page limit vertical</param>
-/// <returns></returns>
-void SetPageScrollLimit( int page_limit_h,  int page_limit_v);
+void SetPageScrollLimit(int page_limit_h, int page_limit_v);
     /// <summary>Page snapping behavior
 /// When scrolling, if a scroller is paged (see elm_scroller_page_size_set() and elm_scroller_page_relative_set()), the scroller may snap to pages when being scrolled, i.e., even if it had momentum to scroll further, it will stop at the next page boundaries. This is disabled, by default, for both axis. This function will set if it that is enabled or not, for each axis.
 /// 
 /// Note: If <c>obj</c> is not set to have pages, nothing will happen after this call.</summary>
 /// <param name="horiz">Allow snap horizontally</param>
 /// <param name="vert">Allow snap vertically</param>
-/// <returns></returns>
-void GetPageSnapAllow( out bool horiz,  out bool vert);
+void GetPageSnapAllow(out bool horiz, out bool vert);
     /// <summary>Page snapping behavior
 /// When scrolling, if a scroller is paged (see elm_scroller_page_size_set() and elm_scroller_page_relative_set()), the scroller may snap to pages when being scrolled, i.e., even if it had momentum to scroll further, it will stop at the next page boundaries. This is disabled, by default, for both axis. This function will set if it that is enabled or not, for each axis.
 /// 
 /// Note: If <c>obj</c> is not set to have pages, nothing will happen after this call.</summary>
 /// <param name="horiz">Allow snap horizontally</param>
 /// <param name="vert">Allow snap vertically</param>
-/// <returns></returns>
-void SetPageSnapAllow( bool horiz,  bool vert);
+void SetPageSnapAllow(bool horiz, bool vert);
     /// <summary>Pagin property</summary>
 /// <param name="pagerel_h">Page relation horizontal</param>
 /// <param name="pagerel_v">Page relation vertical</param>
 /// <param name="pagesize_h">Page size horizontal</param>
 /// <param name="pagesize_v">Page size vertical</param>
-/// <returns></returns>
-void GetPaging( out double pagerel_h,  out double pagerel_v,  out int pagesize_h,  out int pagesize_v);
+void GetPaging(out double pagerel_h, out double pagerel_v, out int pagesize_h, out int pagesize_v);
     /// <summary>Pagin property</summary>
 /// <param name="pagerel_h">Page relation horizontal</param>
 /// <param name="pagerel_v">Page relation vertical</param>
 /// <param name="pagesize_h">Page size horizontal</param>
 /// <param name="pagesize_v">Page size vertical</param>
-/// <returns></returns>
-void SetPaging( double pagerel_h,  double pagerel_v,  int pagesize_h,  int pagesize_v);
+void SetPaging(double pagerel_h, double pagerel_v, int pagesize_h, int pagesize_v);
     /// <summary>Single direction scroll configuration
 /// This makes it possible to restrict scrolling to a single direction, with a &quot;soft&quot; or &quot;hard&quot; behavior.
 /// 
@@ -189,205 +170,162 @@ Elm.Scroller.SingleDirection GetSingleDirection();
 /// 
 /// The hard behavior restricts the scrolling to a single direction all of the time while the soft one will restrict depending on factors such as the movement angle. If the user scrolls roughly in one direction only, it will only move according to it while if the move was clearly wanted on both axes, it will happen on both of them.</summary>
 /// <param name="single_dir">The single direction scroll policy</param>
-/// <returns></returns>
-void SetSingleDirection( Elm.Scroller.SingleDirection single_dir);
+void SetSingleDirection(Elm.Scroller.SingleDirection single_dir);
     /// <summary>Step size</summary>
 /// <param name="x">X coordinate</param>
 /// <param name="y">Y coordinate</param>
-/// <returns></returns>
-void GetStepSize( out int x,  out int y);
+void GetStepSize(out int x, out int y);
     /// <summary>Step size</summary>
 /// <param name="x">X coordinate</param>
 /// <param name="y">Y coordinate</param>
-/// <returns></returns>
-void SetStepSize( int x,  int y);
+void SetStepSize(int x, int y);
     /// <summary>Controls an infinite loop for a scroller.</summary>
 /// <param name="loop_h">The scrolling horizontal loop</param>
 /// <param name="loop_v">The scrolling vertical loop</param>
-/// <returns></returns>
-void GetContentLoop( out bool loop_h,  out bool loop_v);
+void GetContentLoop(out bool loop_h, out bool loop_v);
     /// <summary>Controls an infinite loop for a scroller.</summary>
 /// <param name="loop_h">The scrolling horizontal loop</param>
 /// <param name="loop_v">The scrolling vertical loop</param>
-/// <returns></returns>
-void SetContentLoop( bool loop_h,  bool loop_v);
+void SetContentLoop(bool loop_h, bool loop_v);
     /// <summary>Set the callback to run when the content has been moved up.</summary>
 /// <param name="scroll_up_cb">The callback</param>
-/// <returns></returns>
-void SetScrollUpCb( ElmInterfaceScrollableCb scroll_up_cb);
+void SetScrollUpCb(ElmInterfaceScrollableCb scroll_up_cb);
     /// <summary>Set the callback to run when the horizontal scrollbar is dragged.</summary>
 /// <param name="hbar_drag_cb">The callback</param>
-/// <returns></returns>
-void SetHbarDragCb( ElmInterfaceScrollableCb hbar_drag_cb);
+void SetHbarDragCb(ElmInterfaceScrollableCb hbar_drag_cb);
     /// <summary>Set the callback to run when dragging of the contents has started.</summary>
 /// <param name="drag_start_cb">The callback</param>
-/// <returns></returns>
-void SetDragStartCb( ElmInterfaceScrollableCb drag_start_cb);
+void SetDragStartCb(ElmInterfaceScrollableCb drag_start_cb);
     /// <summary>Set the callback to run when scrolling of the contents has started.</summary>
 /// <param name="scroll_start_cb">The callback</param>
-/// <returns></returns>
-void SetScrollStartCb( ElmInterfaceScrollableCb scroll_start_cb);
+void SetScrollStartCb(ElmInterfaceScrollableCb scroll_start_cb);
     /// <summary>Freeze property</summary>
 /// <param name="freeze"><c>true</c> if freeze, <c>false</c> otherwise</param>
-/// <returns></returns>
-void SetFreeze( bool freeze);
+void SetFreeze(bool freeze);
     /// <summary>When the viewport is resized, the callback is called.</summary>
 /// <param name="viewport_resize_cb">The callback</param>
-/// <returns></returns>
-void SetContentViewportResizeCb( ElmInterfaceScrollableResizeCb viewport_resize_cb);
+void SetContentViewportResizeCb(ElmInterfaceScrollableResizeCb viewport_resize_cb);
     /// <summary>Set the callback to run when the content has been moved to the left</summary>
 /// <param name="scroll_left_cb">The callback</param>
-/// <returns></returns>
-void SetScrollLeftCb( ElmInterfaceScrollableCb scroll_left_cb);
+void SetScrollLeftCb(ElmInterfaceScrollableCb scroll_left_cb);
     /// <summary>Set the callback to run when the vertical scrollbar is pressed.</summary>
 /// <param name="vbar_press_cb">The callback</param>
-/// <returns></returns>
-void SetVbarPressCb( ElmInterfaceScrollableCb vbar_press_cb);
+void SetVbarPressCb(ElmInterfaceScrollableCb vbar_press_cb);
     /// <summary>Set the callback to run when the horizontal scrollbar is pressed.</summary>
 /// <param name="hbar_press_cb">The callback</param>
-/// <returns></returns>
-void SetHbarPressCb( ElmInterfaceScrollableCb hbar_press_cb);
+void SetHbarPressCb(ElmInterfaceScrollableCb hbar_press_cb);
     /// <summary>Set the callback to run when the horizontal scrollbar is unpressed.</summary>
 /// <param name="hbar_unpress_cb">The callback</param>
-/// <returns></returns>
-void SetHbarUnpressCb( ElmInterfaceScrollableCb hbar_unpress_cb);
+void SetHbarUnpressCb(ElmInterfaceScrollableCb hbar_unpress_cb);
     /// <summary>Set the callback to run when dragging of the contents has stopped.</summary>
 /// <param name="drag_stop_cb">The callback</param>
-/// <returns></returns>
-void SetDragStopCb( ElmInterfaceScrollableCb drag_stop_cb);
+void SetDragStopCb(ElmInterfaceScrollableCb drag_stop_cb);
     /// <summary>Set the callback to run when scrolling of the contents has stopped.</summary>
 /// <param name="scroll_stop_cb">The callback</param>
-/// <returns></returns>
-void SetScrollStopCb( ElmInterfaceScrollableCb scroll_stop_cb);
+void SetScrollStopCb(ElmInterfaceScrollableCb scroll_stop_cb);
     /// <summary>Extern pan</summary>
 /// <param name="pan">Pan object</param>
-/// <returns></returns>
-void SetExternPan( Efl.Canvas.Object pan);
+void SetExternPan(Efl.Canvas.Object pan);
     /// <summary>Set the callback to run when the visible page changes.</summary>
 /// <param name="page_change_cb">The callback</param>
-/// <returns></returns>
-void SetPageChangeCb( ElmInterfaceScrollableCb page_change_cb);
+void SetPageChangeCb(ElmInterfaceScrollableCb page_change_cb);
     /// <summary>Hold property</summary>
 /// <param name="hold"><c>true</c> if hold, <c>false</c> otherwise</param>
-/// <returns></returns>
-void SetHold( bool hold);
+void SetHold(bool hold);
     /// <summary>Set the callback to run when the scrolling animation has started.</summary>
 /// <param name="animate_start_cb">The callback</param>
-/// <returns></returns>
-void SetAnimateStartCb( ElmInterfaceScrollableCb animate_start_cb);
+void SetAnimateStartCb(ElmInterfaceScrollableCb animate_start_cb);
     /// <summary>Set the callback to run when the content has been moved down.</summary>
 /// <param name="scroll_down_cb">The callback</param>
-/// <returns></returns>
-void SetScrollDownCb( ElmInterfaceScrollableCb scroll_down_cb);
+void SetScrollDownCb(ElmInterfaceScrollableCb scroll_down_cb);
     /// <summary>Set scroll page size relative to viewport size.</summary>
 /// <param name="h_pagerel">Page relation horizontal</param>
 /// <param name="v_pagerel">Page relation vertical</param>
-/// <returns></returns>
-void SetPageRelative( double h_pagerel,  double v_pagerel);
+void SetPageRelative(double h_pagerel, double v_pagerel);
     /// <summary>Set the callback to run when the content has been moved.</summary>
 /// <param name="scroll_cb">The callback</param>
-/// <returns></returns>
-void SetScrollCb( ElmInterfaceScrollableCb scroll_cb);
+void SetScrollCb(ElmInterfaceScrollableCb scroll_cb);
     /// <summary>Set the callback to run when the scrolling animation has stopped.</summary>
 /// <param name="animate_stop_cb">The callback</param>
-/// <returns></returns>
-void SetAnimateStopCb( ElmInterfaceScrollableCb animate_stop_cb);
+void SetAnimateStopCb(ElmInterfaceScrollableCb animate_stop_cb);
     /// <summary>set the callback to run on minimal limit content</summary>
 /// <param name="min_limit_cb">The callback</param>
-/// <returns></returns>
-void SetContentMinLimitCb( ElmInterfaceScrollableMinLimitCb min_limit_cb);
+void SetContentMinLimitCb(ElmInterfaceScrollableMinLimitCb min_limit_cb);
     /// <summary>Set the callback to run when the content has been moved to the right.</summary>
 /// <param name="scroll_right_cb">The callback</param>
-/// <returns></returns>
-void SetScrollRightCb( ElmInterfaceScrollableCb scroll_right_cb);
+void SetScrollRightCb(ElmInterfaceScrollableCb scroll_right_cb);
     /// <summary>Content property</summary>
 /// <param name="content">Content object</param>
-/// <returns></returns>
-void SetScrollableContent( Efl.Canvas.Object content);
+void SetScrollableContent(Efl.Canvas.Object content);
     /// <summary>Set the callback to run when the left edge of the content has been reached.</summary>
 /// <param name="edge_left_cb">The callback</param>
-/// <returns></returns>
-void SetEdgeLeftCb( ElmInterfaceScrollableCb edge_left_cb);
+void SetEdgeLeftCb(ElmInterfaceScrollableCb edge_left_cb);
     /// <summary>Set the callback to run when the horizontal scrollbar is dragged.</summary>
 /// <param name="vbar_drag_cb">The callback</param>
-/// <returns></returns>
-void SetVbarDragCb( ElmInterfaceScrollableCb vbar_drag_cb);
+void SetVbarDragCb(ElmInterfaceScrollableCb vbar_drag_cb);
     /// <summary>Set the callback to run when the horizontal scrollbar is unpressed.</summary>
 /// <param name="vbar_unpress_cb">The callback</param>
-/// <returns></returns>
-void SetVbarUnpressCb( ElmInterfaceScrollableCb vbar_unpress_cb);
+void SetVbarUnpressCb(ElmInterfaceScrollableCb vbar_unpress_cb);
     /// <summary>Set the callback to run when the bottom edge of the content has been reached.</summary>
 /// <param name="edge_bottom_cb">The callback</param>
-/// <returns></returns>
-void SetEdgeBottomCb( ElmInterfaceScrollableCb edge_bottom_cb);
+void SetEdgeBottomCb(ElmInterfaceScrollableCb edge_bottom_cb);
     /// <summary>Set the callback to run when the right edge of the content has been reached.</summary>
 /// <param name="edge_right_cb">The callback</param>
-/// <returns></returns>
-void SetEdgeRightCb( ElmInterfaceScrollableCb edge_right_cb);
+void SetEdgeRightCb(ElmInterfaceScrollableCb edge_right_cb);
     /// <summary>Set the callback to run when the top edge of the content has been reached.</summary>
 /// <param name="edge_top_cb">The callback</param>
-/// <returns></returns>
-void SetEdgeTopCb( ElmInterfaceScrollableCb edge_top_cb);
+void SetEdgeTopCb(ElmInterfaceScrollableCb edge_top_cb);
     /// <summary>Object property</summary>
 /// <param name="edje_object">Edje object</param>
 /// <param name="hit_rectangle">Evas object</param>
-/// <returns></returns>
-void SetObjects( Efl.Canvas.Object edje_object,  Efl.Canvas.Object hit_rectangle);
+void SetObjects(Efl.Canvas.Object edje_object, Efl.Canvas.Object hit_rectangle);
     /// <summary>Get scroll last page number.
 /// The page number starts from 0. 0 is the first page. This returns the last page number among the pages.
 /// 
 /// See: <see cref="Elm.IInterfaceScrollable.GetCurrentPage"/>, <see cref="Elm.IInterfaceScrollable.ShowPage"/> and <see cref="Elm.IInterfaceScrollable.PageBringIn"/>.</summary>
 /// <param name="pagenumber_h">The horizontal page number</param>
 /// <param name="pagenumber_v">The vertical page number</param>
-/// <returns></returns>
-void GetLastPage( out int pagenumber_h,  out int pagenumber_v);
+void GetLastPage(out int pagenumber_h, out int pagenumber_v);
     /// <summary>Get scroll current page number.
 /// The page number starts from 0. 0 is the first page. Current page means the page which meets the top-left of the viewport. If there are two or more pages in the viewport, it returns the number of the page which meets the top-left of the viewport.
 /// 
 /// See: <see cref="Elm.IInterfaceScrollable.GetLastPage"/>, <see cref="Elm.IInterfaceScrollable.ShowPage"/> and <see cref="Elm.IInterfaceScrollable.PageBringIn"/>.</summary>
 /// <param name="pagenumber_h">The horizontal page number</param>
 /// <param name="pagenumber_v">The vertical page number</param>
-/// <returns></returns>
-void GetCurrentPage( out int pagenumber_h,  out int pagenumber_v);
+void GetCurrentPage(out int pagenumber_h, out int pagenumber_v);
     /// <summary>Content viewport geometry</summary>
 /// <param name="x">X coordinate</param>
 /// <param name="y">Y coordinate</param>
 /// <param name="w">Width</param>
 /// <param name="h">Height</param>
-/// <returns></returns>
-void GetContentViewportGeometry( out int x,  out int y,  out int w,  out int h);
+void GetContentViewportGeometry(out int x, out int y, out int w, out int h);
     /// <summary>Get the size of the content object
 /// This gets the size of the content object of the scroller.</summary>
 /// <param name="w">Width of the content object.</param>
 /// <param name="h">Height of the content object.</param>
-/// <returns></returns>
-void GetContentSize( out int w,  out int h);
+void GetContentSize(out int w, out int h);
     /// <summary>Whether scrolling should loop around.</summary>
 /// <returns>True to enable looping.</returns>
 bool GetItemLoopEnabled();
     /// <summary>Whether scrolling should loop around.</summary>
 /// <param name="enable">True to enable looping.</param>
-/// <returns></returns>
-void SetItemLoopEnabled( bool enable);
+void SetItemLoopEnabled(bool enable);
     /// <summary>Set the content position</summary>
 /// <param name="x">X coordinate</param>
 /// <param name="y">Y coordinate</param>
 /// <param name="sig">Send signals to the theme corresponding to the scroll direction, or if an edge was reached.</param>
-/// <returns></returns>
-void SetContentPos( int x,  int y,  bool sig);
+void SetContentPos(int x, int y, bool sig);
     /// <summary>Get content position</summary>
 /// <param name="x">X coordinate</param>
 /// <param name="y">Y coordinate</param>
-/// <returns></returns>
-void GetContentPos( out int x,  out int y);
+void GetContentPos(out int x, out int y);
     /// <summary>Show a specific virtual region within the scroller content object by page number.
 /// 0, 0 of the indicated page is located at the top-left of the viewport. This will jump to the page directly without animation.
 /// 
 /// See <see cref="Elm.IInterfaceScrollable.PageBringIn"/>.</summary>
 /// <param name="pagenumber_h">The horizontal page number</param>
 /// <param name="pagenumber_v">The vertical page number</param>
-/// <returns></returns>
-void ShowPage( int pagenumber_h,  int pagenumber_v);
+void ShowPage(int pagenumber_h, int pagenumber_v);
     /// <summary>Show a specific virtual region within the scroller content object.
 /// This will ensure all (or part if it does not fit) of the designated region in the virtual content object (0, 0 starting at the top-left of the virtual content object) is shown within the scroller. Unlike elm_scroller_region_show(), this allows the scroller to &quot;smoothly slide&quot; to this location (if configuration in general calls for transitions). It may not jump immediately to the new location and make take a while and show other content along the way.
 /// 
@@ -396,40 +334,28 @@ void ShowPage( int pagenumber_h,  int pagenumber_v);
 /// <param name="y">Y coordinate of the region</param>
 /// <param name="w">Width of the region</param>
 /// <param name="h">Height of the region</param>
-/// <returns></returns>
-void RegionBringIn( int x,  int y,  int w,  int h);
+void RegionBringIn(int x, int y, int w, int h);
     /// <summary>Show a specific virtual region within the scroller content object by page number.
 /// 0, 0 of the indicated page is located at the top-left of the viewport. This will slide to the page with animation.
 /// 
 /// <see cref="Elm.IInterfaceScrollable.ShowPage"/></summary>
 /// <param name="pagenumber_h">The horizontal page number</param>
 /// <param name="pagenumber_v">The vertical page number</param>
-/// <returns></returns>
-void PageBringIn( int pagenumber_h,  int pagenumber_v);
+void PageBringIn(int pagenumber_h, int pagenumber_v);
     /// <summary>Show a specific virtual region within the scroller content object
 /// This will ensure all (or part if it does not fit) of the designated region in the virtual content object (0, 0 starting at the top-left of the virtual content object) is shown within the scroller.</summary>
 /// <param name="x">X coordinate of the region</param>
 /// <param name="y">Y coordinate of the region</param>
 /// <param name="w">Width of the region</param>
 /// <param name="h">Height of the region</param>
-/// <returns></returns>
-void ShowContentRegion( int x,  int y,  int w,  int h);
+void ShowContentRegion(int x, int y, int w, int h);
     /// <summary>Prevent the scrollable from being smaller than the minimum size of the content.
 /// By default the scroller will be as small as its design allows, irrespective of its content. This will make the scroller minimum size the right size horizontally and/or vertically to perfectly fit its content in that direction.</summary>
 /// <param name="w">Whether to limit the minimum horizontal size</param>
 /// <param name="h">Whether to limit the minimum vertical size</param>
-/// <returns></returns>
-void ContentMinLimit( bool w,  bool h);
-    /// <summary></summary>
-/// <param name="x"></param>
-/// <param name="y"></param>
-/// <returns></returns>
-void SetWantedRegion( int x,  int y);
-    /// <summary></summary>
-/// <param name="x"></param>
-/// <param name="y"></param>
-/// <returns></returns>
-void CustomPanPosAdjust( int x,  int y);
+void ContentMinLimit(bool w, bool h);
+    void SetWantedRegion(int x, int y);
+    void CustomPanPosAdjust(int x, int y);
                                                                                                                                                                                                                                                                                                                         /// <summary>Called when content changed</summary>
     event EventHandler ChangedEvt;
     /// <summary>Control Wheel disable Enable or disable mouse wheel to be used to scroll the scroller content. heel is enabled by default.</summary>
@@ -628,1075 +554,1302 @@ IInterfaceScrollable
     , Efl.Ui.IScrollable, Efl.Ui.IWidgetFocusManager, Efl.Ui.Focus.IManager, Efl.Ui.Focus.IManagerSub
 {
     ///<summary>Pointer to the native class description.</summary>
-    public System.IntPtr NativeClass {
-        get {
-            if (((object)this).GetType() == typeof (IInterfaceScrollableConcrete))
-                return Elm.IInterfaceScrollableNativeInherit.GetEflClassStatic();
+    public System.IntPtr NativeClass
+    {
+        get
+        {
+            if (((object)this).GetType() == typeof(IInterfaceScrollableConcrete))
+            {
+                return GetEflClassStatic();
+            }
             else
+            {
                 return Efl.Eo.ClassRegister.klassFromType[((object)this).GetType()];
+            }
         }
     }
-    private EventHandlerList eventHandlers = new EventHandlerList();
+
+    private Dictionary<(IntPtr desc, object evtDelegate), (IntPtr evtCallerPtr, Efl.EventCb evtCaller)> eoEvents = new Dictionary<(IntPtr desc, object evtDelegate), (IntPtr evtCallerPtr, Efl.EventCb evtCaller)>();
+    private readonly object eventLock = new object();
     private  System.IntPtr handle;
     ///<summary>Pointer to the native instance.</summary>
-    public System.IntPtr NativeHandle {
+    public System.IntPtr NativeHandle
+    {
         get { return handle; }
     }
+
     [System.Runtime.InteropServices.DllImport(efl.Libs.Elementary)] internal static extern System.IntPtr
         elm_interface_scrollable_mixin_get();
-    ///<summary>Internal usage: Constructs an instance from a native pointer. This is used when interacting with C code and should not be used directly.</summary>
+    /// <summary>Initializes a new instance of the <see cref="IInterfaceScrollable"/> class.
+    /// Internal usage: This is used when interacting with C code and should not be used directly.</summary>
     private IInterfaceScrollableConcrete(System.IntPtr raw)
     {
         handle = raw;
-        RegisterEventProxies();
     }
     ///<summary>Destructor.</summary>
     ~IInterfaceScrollableConcrete()
     {
         Dispose(false);
     }
+
     ///<summary>Releases the underlying native instance.</summary>
-    void Dispose(bool disposing)
+    private void Dispose(bool disposing)
     {
-        if (handle != System.IntPtr.Zero) {
-            Efl.Eo.Globals.efl_unref(handle);
-            handle = System.IntPtr.Zero;
+        if (handle != System.IntPtr.Zero)
+        {
+            IntPtr h = handle;
+            handle = IntPtr.Zero;
+
+            IntPtr gcHandlePtr = IntPtr.Zero;
+            if (eoEvents.Count != 0)
+            {
+                GCHandle gcHandle = GCHandle.Alloc(eoEvents);
+                gcHandlePtr = GCHandle.ToIntPtr(gcHandle);
+            }
+
+            if (disposing)
+            {
+                Efl.Eo.Globals.efl_mono_native_dispose(h, gcHandlePtr);
+            }
+            else
+            {
+                Monitor.Enter(Efl.All.InitLock);
+                if (Efl.All.MainLoopInitialized)
+                {
+                    Efl.Eo.Globals.efl_mono_thread_safe_native_dispose(h, gcHandlePtr);
+                }
+
+                Monitor.Exit(Efl.All.InitLock);
+            }
         }
+
     }
+
     ///<summary>Releases the underlying native instance.</summary>
     public void Dispose()
     {
         Dispose(true);
         GC.SuppressFinalize(this);
     }
-    ///<summary>Verifies if the given object is equal to this one.</summary>
-    public override bool Equals(object obj)
+
+    /// <summary>Verifies if the given object is equal to this one.</summary>
+    /// <param name="instance">The object to compare to.</param>
+    /// <returns>True if both objects point to the same native object.</returns>
+    public override bool Equals(object instance)
     {
-        var other = obj as Efl.Object;
+        var other = instance as Efl.Object;
         if (other == null)
+        {
             return false;
+        }
         return this.NativeHandle == other.NativeHandle;
     }
-    ///<summary>Gets the hash code for this object based on the native pointer it points to.</summary>
+
+    /// <summary>Gets the hash code for this object based on the native pointer it points to.</summary>
+    /// <returns>The value of the pointer, to be used as the hash code of this object.</returns>
     public override int GetHashCode()
     {
         return this.NativeHandle.ToInt32();
     }
-    ///<summary>Turns the native pointer into a string representation.</summary>
+
+    /// <summary>Turns the native pointer into a string representation.</summary>
+    /// <returns>A string with the type and the native pointer for this object.</returns>
     public override String ToString()
     {
         return $"{this.GetType().Name}@[{this.NativeHandle.ToInt32():x}]";
     }
-    private readonly object eventLock = new object();
-    private Dictionary<string, int> event_cb_count = new Dictionary<string, int>();
+
     ///<summary>Adds a new event handler, registering it to the native event. For internal use only.</summary>
     ///<param name="lib">The name of the native library definining the event.</param>
     ///<param name="key">The name of the native event.</param>
-    ///<param name="evt_delegate">The delegate to be called on event raising.</param>
-    ///<returns>True if the delegate was successfully registered.</returns>
-    private bool AddNativeEventHandler(string lib, string key, Efl.EventCb evt_delegate) {
-        int event_count = 0;
-        if (!event_cb_count.TryGetValue(key, out event_count))
-            event_cb_count[key] = event_count;
-        if (event_count == 0) {
-            IntPtr desc = Efl.EventDescription.GetNative(lib, key);
-            if (desc == IntPtr.Zero) {
-                Eina.Log.Error($"Failed to get native event {key}");
-                return false;
-            }
-             bool result = Efl.Eo.Globals.efl_event_callback_priority_add(handle, desc, 0, evt_delegate, System.IntPtr.Zero);
-            if (!result) {
-                Eina.Log.Error($"Failed to add event proxy for event {key}");
-                return false;
-            }
-            Eina.Error.RaiseIfUnhandledException();
-        } 
-        event_cb_count[key]++;
-        return true;
+    ///<param name="evtCaller">Delegate to be called by native code on event raising.</param>
+    ///<param name="evtDelegate">Managed delegate that will be called by evtCaller on event raising.</param>
+    private void AddNativeEventHandler(string lib, string key, Efl.EventCb evtCaller, object evtDelegate)
+    {
+        IntPtr desc = Efl.EventDescription.GetNative(lib, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+        }
+
+        if (eoEvents.ContainsKey((desc, evtDelegate)))
+        {
+            Eina.Log.Warning($"Event proxy for event {key} already registered!");
+            return;
+        }
+
+        IntPtr evtCallerPtr = Marshal.GetFunctionPointerForDelegate(evtCaller);
+        if (!Efl.Eo.Globals.efl_event_callback_priority_add(handle, desc, 0, evtCallerPtr, IntPtr.Zero))
+        {
+            Eina.Log.Error($"Failed to add event proxy for event {key}");
+            return;
+        }
+
+        eoEvents[(desc, evtDelegate)] = (evtCallerPtr, evtCaller);
+        Eina.Error.RaiseIfUnhandledException();
     }
+
     ///<summary>Removes the given event handler for the given event. For internal use only.</summary>
+    ///<param name="lib">The name of the native library definining the event.</param>
     ///<param name="key">The name of the native event.</param>
-    ///<param name="evt_delegate">The delegate to be removed.</param>
-    ///<returns>True if the delegate was successfully registered.</returns>
-    private bool RemoveNativeEventHandler(string key, Efl.EventCb evt_delegate) {
-        int event_count = 0;
-        if (!event_cb_count.TryGetValue(key, out event_count))
-            event_cb_count[key] = event_count;
-        if (event_count == 1) {
-            IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
-            if (desc == IntPtr.Zero) {
-                Eina.Log.Error($"Failed to get native event {key}");
-                return false;
-            }
-            bool result = Efl.Eo.Globals.efl_event_callback_del(handle, desc, evt_delegate, System.IntPtr.Zero);
-            if (!result) {
+    ///<param name="evtDelegate">The delegate to be removed.</param>
+    private void RemoveNativeEventHandler(string lib, string key, object evtDelegate)
+    {
+        IntPtr desc = Efl.EventDescription.GetNative(lib, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
+        }
+
+        var evtPair = (desc, evtDelegate);
+        if (eoEvents.TryGetValue(evtPair, out var caller))
+        {
+            if (!Efl.Eo.Globals.efl_event_callback_del(handle, desc, caller.evtCallerPtr, IntPtr.Zero))
+            {
                 Eina.Log.Error($"Failed to remove event proxy for event {key}");
-                return false;
+                return;
             }
+
+            eoEvents.Remove(evtPair);
             Eina.Error.RaiseIfUnhandledException();
-        } else if (event_count == 0) {
-            Eina.Log.Error($"Trying to remove proxy for event {key} when there is nothing registered.");
-            return false;
-        } 
-        event_cb_count[key]--;
-        return true;
+        }
+        else
+        {
+            Eina.Log.Error($"Trying to remove proxy for event {key} when it is nothing registered.");
+        }
     }
-private static object ChangedEvtKey = new object();
+
     /// <summary>Called when content changed</summary>
     public event EventHandler ChangedEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED";
-                if (AddNativeEventHandler(efl.Libs.Elementary, key, this.evt_ChangedEvt_delegate)) {
-                    eventHandlers.AddHandler(ChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Elementary, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED";
-                if (RemoveNativeEventHandler(key, this.evt_ChangedEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Elementary, key, value);
             }
         }
     }
     ///<summary>Method to raise event ChangedEvt.</summary>
-    public void On_ChangedEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ChangedEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ChangedEvt_delegate;
-    private void on_ChangedEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnChangedEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ChangedEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollStartEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scroll operation starts</summary>
     public event EventHandler ScrollStartEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_START";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollStartEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollStartEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_START";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollStartEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollStartEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollStartEvt.</summary>
-    public void On_ScrollStartEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollStartEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollStartEvt_delegate;
-    private void on_ScrollStartEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollStartEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollStartEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_START";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scrolling</summary>
     public event EventHandler ScrollEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollEvt.</summary>
-    public void On_ScrollEvt(EventArgs e)
+    public void OnScrollEvt(EventArgs e)
     {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollEvtKey];
+        var key = "_EFL_UI_EVENT_SCROLL";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollEvt_delegate;
-    private void on_ScrollEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
-    {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-        }
-    }
 
-private static object ScrollStopEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scroll operation stops</summary>
     public event EventHandler ScrollStopEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_STOP";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollStopEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollStopEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_STOP";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollStopEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollStopEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollStopEvt.</summary>
-    public void On_ScrollStopEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollStopEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollStopEvt_delegate;
-    private void on_ScrollStopEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollStopEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollStopEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_STOP";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollUpEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scrolling upwards</summary>
     public event EventHandler ScrollUpEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_UP";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollUpEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollUpEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_UP";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollUpEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollUpEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollUpEvt.</summary>
-    public void On_ScrollUpEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollUpEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollUpEvt_delegate;
-    private void on_ScrollUpEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollUpEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollUpEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_UP";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollDownEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scrolling downwards</summary>
     public event EventHandler ScrollDownEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_DOWN";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollDownEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollDownEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_DOWN";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollDownEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollDownEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollDownEvt.</summary>
-    public void On_ScrollDownEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollDownEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollDownEvt_delegate;
-    private void on_ScrollDownEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollDownEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollDownEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_DOWN";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollLeftEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scrolling left</summary>
     public event EventHandler ScrollLeftEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_LEFT";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollLeftEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollLeftEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_LEFT";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollLeftEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollLeftEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollLeftEvt.</summary>
-    public void On_ScrollLeftEvt(EventArgs e)
+    public void OnScrollLeftEvt(EventArgs e)
     {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollLeftEvtKey];
+        var key = "_EFL_UI_EVENT_SCROLL_LEFT";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollLeftEvt_delegate;
-    private void on_ScrollLeftEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
-    {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollLeftEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-        }
-    }
 
-private static object ScrollRightEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scrolling right</summary>
     public event EventHandler ScrollRightEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_RIGHT";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollRightEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollRightEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_RIGHT";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollRightEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollRightEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollRightEvt.</summary>
-    public void On_ScrollRightEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollRightEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollRightEvt_delegate;
-    private void on_ScrollRightEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollRightEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollRightEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_RIGHT";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object EdgeUpEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when hitting the top edge</summary>
     public event EventHandler EdgeUpEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_EDGE_UP";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_EdgeUpEvt_delegate)) {
-                    eventHandlers.AddHandler(EdgeUpEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_EDGE_UP";
-                if (RemoveNativeEventHandler(key, this.evt_EdgeUpEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(EdgeUpEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event EdgeUpEvt.</summary>
-    public void On_EdgeUpEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[EdgeUpEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_EdgeUpEvt_delegate;
-    private void on_EdgeUpEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnEdgeUpEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_EdgeUpEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_EDGE_UP";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object EdgeDownEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when hitting the bottom edge</summary>
     public event EventHandler EdgeDownEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_EDGE_DOWN";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_EdgeDownEvt_delegate)) {
-                    eventHandlers.AddHandler(EdgeDownEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_EDGE_DOWN";
-                if (RemoveNativeEventHandler(key, this.evt_EdgeDownEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(EdgeDownEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event EdgeDownEvt.</summary>
-    public void On_EdgeDownEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[EdgeDownEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_EdgeDownEvt_delegate;
-    private void on_EdgeDownEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnEdgeDownEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_EdgeDownEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_EDGE_DOWN";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object EdgeLeftEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when hitting the left edge</summary>
     public event EventHandler EdgeLeftEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_EDGE_LEFT";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_EdgeLeftEvt_delegate)) {
-                    eventHandlers.AddHandler(EdgeLeftEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_EDGE_LEFT";
-                if (RemoveNativeEventHandler(key, this.evt_EdgeLeftEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(EdgeLeftEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event EdgeLeftEvt.</summary>
-    public void On_EdgeLeftEvt(EventArgs e)
+    public void OnEdgeLeftEvt(EventArgs e)
     {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[EdgeLeftEvtKey];
+        var key = "_EFL_UI_EVENT_EDGE_LEFT";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_EdgeLeftEvt_delegate;
-    private void on_EdgeLeftEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
-    {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_EdgeLeftEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-        }
-    }
 
-private static object EdgeRightEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when hitting the right edge</summary>
     public event EventHandler EdgeRightEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_EDGE_RIGHT";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_EdgeRightEvt_delegate)) {
-                    eventHandlers.AddHandler(EdgeRightEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_EDGE_RIGHT";
-                if (RemoveNativeEventHandler(key, this.evt_EdgeRightEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(EdgeRightEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event EdgeRightEvt.</summary>
-    public void On_EdgeRightEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[EdgeRightEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_EdgeRightEvt_delegate;
-    private void on_EdgeRightEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnEdgeRightEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_EdgeRightEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_EDGE_RIGHT";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollAnimStartEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scroll animation starts</summary>
     public event EventHandler ScrollAnimStartEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_ANIM_START";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollAnimStartEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollAnimStartEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_ANIM_START";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollAnimStartEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollAnimStartEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollAnimStartEvt.</summary>
-    public void On_ScrollAnimStartEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollAnimStartEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollAnimStartEvt_delegate;
-    private void on_ScrollAnimStartEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollAnimStartEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollAnimStartEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_ANIM_START";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollAnimStopEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scroll animation stopps</summary>
     public event EventHandler ScrollAnimStopEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_ANIM_STOP";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollAnimStopEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollAnimStopEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_ANIM_STOP";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollAnimStopEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollAnimStopEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollAnimStopEvt.</summary>
-    public void On_ScrollAnimStopEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollAnimStopEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollAnimStopEvt_delegate;
-    private void on_ScrollAnimStopEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollAnimStopEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollAnimStopEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_ANIM_STOP";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object ScrollDragStartEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scroll drag starts</summary>
     public event EventHandler ScrollDragStartEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_DRAG_START";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollDragStartEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollDragStartEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_DRAG_START";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollDragStartEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollDragStartEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollDragStartEvt.</summary>
-    public void On_ScrollDragStartEvt(EventArgs e)
+    public void OnScrollDragStartEvt(EventArgs e)
     {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollDragStartEvtKey];
+        var key = "_EFL_UI_EVENT_SCROLL_DRAG_START";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollDragStartEvt_delegate;
-    private void on_ScrollDragStartEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
-    {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollDragStartEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-        }
-    }
 
-private static object ScrollDragStopEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Called when scroll drag stops</summary>
     public event EventHandler ScrollDragStopEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_EVENT_SCROLL_DRAG_STOP";
-                if (AddNativeEventHandler(efl.Libs.Efl, key, this.evt_ScrollDragStopEvt_delegate)) {
-                    eventHandlers.AddHandler(ScrollDragStopEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Efl, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_EVENT_SCROLL_DRAG_STOP";
-                if (RemoveNativeEventHandler(key, this.evt_ScrollDragStopEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ScrollDragStopEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Efl, key, value);
             }
         }
     }
     ///<summary>Method to raise event ScrollDragStopEvt.</summary>
-    public void On_ScrollDragStopEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[ScrollDragStopEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ScrollDragStopEvt_delegate;
-    private void on_ScrollDragStopEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnScrollDragStopEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_ScrollDragStopEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_EVENT_SCROLL_DRAG_STOP";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Efl, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object RedirectChangedEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Redirect object has changed, the old manager is passed as an event argument.
     /// (Since EFL 1.22)</summary>
     public event EventHandler<Efl.Ui.Focus.IManagerRedirectChangedEvt_Args> RedirectChangedEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                                                Efl.Ui.Focus.IManagerRedirectChangedEvt_Args args = new Efl.Ui.Focus.IManagerRedirectChangedEvt_Args();
+                        args.arg = (Efl.Eo.Globals.CreateWrapperFor(evt.Info) as Efl.Ui.Focus.IManagerConcrete);
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED";
-                if (AddNativeEventHandler(efl.Libs.Elementary, key, this.evt_RedirectChangedEvt_delegate)) {
-                    eventHandlers.AddHandler(RedirectChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Elementary, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED";
-                if (RemoveNativeEventHandler(key, this.evt_RedirectChangedEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(RedirectChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Elementary, key, value);
             }
         }
     }
     ///<summary>Method to raise event RedirectChangedEvt.</summary>
-    public void On_RedirectChangedEvt(Efl.Ui.Focus.IManagerRedirectChangedEvt_Args e)
-    {
-        EventHandler<Efl.Ui.Focus.IManagerRedirectChangedEvt_Args> evt;
-        lock (eventLock) {
-        evt = (EventHandler<Efl.Ui.Focus.IManagerRedirectChangedEvt_Args>)eventHandlers[RedirectChangedEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_RedirectChangedEvt_delegate;
-    private void on_RedirectChangedEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnRedirectChangedEvt(Efl.Ui.Focus.IManagerRedirectChangedEvt_Args e)
     {
-        Efl.Ui.Focus.IManagerRedirectChangedEvt_Args args = new Efl.Ui.Focus.IManagerRedirectChangedEvt_Args();
-      args.arg = (Efl.Eo.Globals.CreateWrapperFor(evt.Info) as Efl.Ui.Focus.IManagerConcrete);
-        try {
-            On_RedirectChangedEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_FOCUS_MANAGER_EVENT_REDIRECT_CHANGED";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object FlushPreEvtKey = new object();
+        IntPtr info = e.arg.NativeHandle;
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, info);
+    }
     /// <summary>After this event, the manager object will calculate relations in the graph. Can be used to add / remove children in a lazy fashion.
     /// (Since EFL 1.22)</summary>
     public event EventHandler FlushPreEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE";
-                if (AddNativeEventHandler(efl.Libs.Elementary, key, this.evt_FlushPreEvt_delegate)) {
-                    eventHandlers.AddHandler(FlushPreEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Elementary, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE";
-                if (RemoveNativeEventHandler(key, this.evt_FlushPreEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(FlushPreEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Elementary, key, value);
             }
         }
     }
     ///<summary>Method to raise event FlushPreEvt.</summary>
-    public void On_FlushPreEvt(EventArgs e)
-    {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[FlushPreEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_FlushPreEvt_delegate;
-    private void on_FlushPreEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnFlushPreEvt(EventArgs e)
     {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_FlushPreEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_FOCUS_MANAGER_EVENT_FLUSH_PRE";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object CoordsDirtyEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>Cached relationship calculation results have been invalidated.
     /// (Since EFL 1.22)</summary>
     public event EventHandler CoordsDirtyEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                        EventArgs args = EventArgs.Empty;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY";
-                if (AddNativeEventHandler(efl.Libs.Elementary, key, this.evt_CoordsDirtyEvt_delegate)) {
-                    eventHandlers.AddHandler(CoordsDirtyEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Elementary, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY";
-                if (RemoveNativeEventHandler(key, this.evt_CoordsDirtyEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(CoordsDirtyEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Elementary, key, value);
             }
         }
     }
     ///<summary>Method to raise event CoordsDirtyEvt.</summary>
-    public void On_CoordsDirtyEvt(EventArgs e)
+    public void OnCoordsDirtyEvt(EventArgs e)
     {
-        EventHandler evt;
-        lock (eventLock) {
-        evt = (EventHandler)eventHandlers[CoordsDirtyEvtKey];
+        var key = "_EFL_UI_FOCUS_MANAGER_EVENT_COORDS_DIRTY";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_CoordsDirtyEvt_delegate;
-    private void on_CoordsDirtyEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
-    {
-        EventArgs args = EventArgs.Empty;
-        try {
-            On_CoordsDirtyEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-        }
-    }
 
-private static object ManagerFocusChangedEvtKey = new object();
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, IntPtr.Zero);
+    }
     /// <summary>The manager_focus property has changed. The previously focused object is passed as an event argument.
     /// (Since EFL 1.22)</summary>
     public event EventHandler<Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args> ManagerFocusChangedEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                                                Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args args = new Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args();
+                        args.arg = (Efl.Eo.Globals.CreateWrapperFor(evt.Info) as Efl.Ui.Focus.IObjectConcrete);
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED";
-                if (AddNativeEventHandler(efl.Libs.Elementary, key, this.evt_ManagerFocusChangedEvt_delegate)) {
-                    eventHandlers.AddHandler(ManagerFocusChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Elementary, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED";
-                if (RemoveNativeEventHandler(key, this.evt_ManagerFocusChangedEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(ManagerFocusChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Elementary, key, value);
             }
         }
     }
     ///<summary>Method to raise event ManagerFocusChangedEvt.</summary>
-    public void On_ManagerFocusChangedEvt(Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args e)
-    {
-        EventHandler<Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args> evt;
-        lock (eventLock) {
-        evt = (EventHandler<Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args>)eventHandlers[ManagerFocusChangedEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_ManagerFocusChangedEvt_delegate;
-    private void on_ManagerFocusChangedEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnManagerFocusChangedEvt(Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args e)
     {
-        Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args args = new Efl.Ui.Focus.IManagerManagerFocusChangedEvt_Args();
-      args.arg = (Efl.Eo.Globals.CreateWrapperFor(evt.Info) as Efl.Ui.Focus.IObjectConcrete);
-        try {
-            On_ManagerFocusChangedEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-private static object DirtyLogicFreezeChangedEvtKey = new object();
+        IntPtr info = e.arg.NativeHandle;
+        Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, info);
+    }
     /// <summary>Called when this focus manager is frozen or thawed, even_info being <c>true</c> indicates that it is now frozen, <c>false</c> indicates that it is thawed.
     /// (Since EFL 1.22)</summary>
     public event EventHandler<Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args> DirtyLogicFreezeChangedEvt
     {
-        add {
-            lock (eventLock) {
+        add
+        {
+            lock (eventLock)
+            {
+                var wRef = new WeakReference(this);
+                Efl.EventCb callerCb = (IntPtr data, ref Efl.Event.NativeStruct evt) =>
+                {
+                    var obj = wRef.Target as Efl.Eo.IWrapper;
+                    if (obj != null)
+                    {
+                                                Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args args = new Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args();
+                        args.arg = evt.Info != IntPtr.Zero;
+                        try
+                        {
+                            value?.Invoke(obj, args);
+                        }
+                        catch (Exception e)
+                        {
+                            Eina.Log.Error(e.ToString());
+                            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        }
+                    }
+                };
+
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED";
-                if (AddNativeEventHandler(efl.Libs.Elementary, key, this.evt_DirtyLogicFreezeChangedEvt_delegate)) {
-                    eventHandlers.AddHandler(DirtyLogicFreezeChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error adding proxy for event {key}");
+                AddNativeEventHandler(efl.Libs.Elementary, key, callerCb, value);
             }
         }
-        remove {
-            lock (eventLock) {
+
+        remove
+        {
+            lock (eventLock)
+            {
                 string key = "_EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED";
-                if (RemoveNativeEventHandler(key, this.evt_DirtyLogicFreezeChangedEvt_delegate)) { 
-                    eventHandlers.RemoveHandler(DirtyLogicFreezeChangedEvtKey , value);
-                } else
-                    Eina.Log.Error($"Error removing proxy for event {key}");
+                RemoveNativeEventHandler(efl.Libs.Elementary, key, value);
             }
         }
     }
     ///<summary>Method to raise event DirtyLogicFreezeChangedEvt.</summary>
-    public void On_DirtyLogicFreezeChangedEvt(Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args e)
-    {
-        EventHandler<Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args> evt;
-        lock (eventLock) {
-        evt = (EventHandler<Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args>)eventHandlers[DirtyLogicFreezeChangedEvtKey];
-        }
-        evt?.Invoke(this, e);
-    }
-    Efl.EventCb evt_DirtyLogicFreezeChangedEvt_delegate;
-    private void on_DirtyLogicFreezeChangedEvt_NativeCallback(System.IntPtr data, ref Efl.Event.NativeStruct evt)
+    public void OnDirtyLogicFreezeChangedEvt(Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args e)
     {
-        Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args args = new Efl.Ui.Focus.IManagerDirtyLogicFreezeChangedEvt_Args();
-      args.arg = evt.Info != IntPtr.Zero;
-        try {
-            On_DirtyLogicFreezeChangedEvt(args);
-        } catch (Exception e) {
-            Eina.Log.Error(e.ToString());
-            Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        var key = "_EFL_UI_FOCUS_MANAGER_EVENT_DIRTY_LOGIC_FREEZE_CHANGED";
+        IntPtr desc = Efl.EventDescription.GetNative(efl.Libs.Elementary, key);
+        if (desc == IntPtr.Zero)
+        {
+            Eina.Log.Error($"Failed to get native event {key}");
+            return;
         }
-    }
 
-    ///<summary>Register the Eo event wrappers making the bridge to C# events. Internal usage only.</summary>
-     void RegisterEventProxies()
-    {
-        evt_ChangedEvt_delegate = new Efl.EventCb(on_ChangedEvt_NativeCallback);
-        evt_ScrollStartEvt_delegate = new Efl.EventCb(on_ScrollStartEvt_NativeCallback);
-        evt_ScrollEvt_delegate = new Efl.EventCb(on_ScrollEvt_NativeCallback);
-        evt_ScrollStopEvt_delegate = new Efl.EventCb(on_ScrollStopEvt_NativeCallback);
-        evt_ScrollUpEvt_delegate = new Efl.EventCb(on_ScrollUpEvt_NativeCallback);
-        evt_ScrollDownEvt_delegate = new Efl.EventCb(on_ScrollDownEvt_NativeCallback);
-        evt_ScrollLeftEvt_delegate = new Efl.EventCb(on_ScrollLeftEvt_NativeCallback);
-        evt_ScrollRightEvt_delegate = new Efl.EventCb(on_ScrollRightEvt_NativeCallback);
-        evt_EdgeUpEvt_delegate = new Efl.EventCb(on_EdgeUpEvt_NativeCallback);
-        evt_EdgeDownEvt_delegate = new Efl.EventCb(on_EdgeDownEvt_NativeCallback);
-        evt_EdgeLeftEvt_delegate = new Efl.EventCb(on_EdgeLeftEvt_NativeCallback);
-        evt_EdgeRightEvt_delegate = new Efl.EventCb(on_EdgeRightEvt_NativeCallback);
-        evt_ScrollAnimStartEvt_delegate = new Efl.EventCb(on_ScrollAnimStartEvt_NativeCallback);
-        evt_ScrollAnimStopEvt_delegate = new Efl.EventCb(on_ScrollAnimStopEvt_NativeCallback);
-        evt_ScrollDragStartEvt_delegate = new Efl.EventCb(on_ScrollDragStartEvt_NativeCallback);
-        evt_ScrollDragStopEvt_delegate = new Efl.EventCb(on_ScrollDragStopEvt_NativeCallback);
-        evt_RedirectChangedEvt_delegate = new Efl.EventCb(on_RedirectChangedEvt_NativeCallback);
-        evt_FlushPreEvt_delegate = new Efl.EventCb(on_FlushPreEvt_NativeCallback);
-        evt_CoordsDirtyEvt_delegate = new Efl.EventCb(on_CoordsDirtyEvt_NativeCallback);
-        evt_ManagerFocusChangedEvt_delegate = new Efl.EventCb(on_ManagerFocusChangedEvt_NativeCallback);
-        evt_DirtyLogicFreezeChangedEvt_delegate = new Efl.EventCb(on_DirtyLogicFreezeChangedEvt_NativeCallback);
+        IntPtr info = Eina.PrimitiveConversion.ManagedToPointerAlloc(e.arg ? (byte) 1 : (byte) 0);
+        try
+        {
+            Efl.Eo.Globals.efl_event_callback_call(this.NativeHandle, desc, info);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(info);
+        }
     }
     /// <summary>Control scrolling gravity on the scrollable
     /// The gravity defines how the scroller will adjust its view when the size of the scroller contents increases.
@@ -1708,9 +1861,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// Default values for x and y are 0.0</summary>
     /// <param name="x">Horizontal scrolling gravity</param>
     /// <param name="y">Vertical scrolling gravity</param>
-    /// <returns></returns>
-    public void GetGravity( out double x,  out double y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_gravity_get_ptr.Value.Delegate(this.NativeHandle, out x,  out y);
+    public void GetGravity(out double x, out double y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_gravity_get_ptr.Value.Delegate(this.NativeHandle,out x, out y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Control scrolling gravity on the scrollable
@@ -1723,41 +1875,37 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// Default values for x and y are 0.0</summary>
     /// <param name="x">Horizontal scrolling gravity</param>
     /// <param name="y">Vertical scrolling gravity</param>
-    /// <returns></returns>
-    public void SetGravity( double x,  double y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_gravity_set_ptr.Value.Delegate(this.NativeHandle, x,  y);
+    public void SetGravity(double x, double y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_gravity_set_ptr.Value.Delegate(this.NativeHandle,x, y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Bouncing behavior
     /// When scrolling, the scroller may &quot;bounce&quot; when reaching an edge of the content object. This is a visual way to indicate the end has been reached. This is enabled by default for both axis. This API will set if it is enabled for the given axis with the boolean parameters for each axis.</summary>
     /// <param name="horiz">Horizontal bounce policy.</param>
     /// <param name="vert">Vertical bounce policy.</param>
-    /// <returns></returns>
-    public void GetBounceAllow( out bool horiz,  out bool vert) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_bounce_allow_get_ptr.Value.Delegate(this.NativeHandle, out horiz,  out vert);
+    public void GetBounceAllow(out bool horiz, out bool vert) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_bounce_allow_get_ptr.Value.Delegate(this.NativeHandle,out horiz, out vert);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Bouncing behavior
     /// When scrolling, the scroller may &quot;bounce&quot; when reaching an edge of the content object. This is a visual way to indicate the end has been reached. This is enabled by default for both axis. This API will set if it is enabled for the given axis with the boolean parameters for each axis.</summary>
     /// <param name="horiz">Horizontal bounce policy.</param>
     /// <param name="vert">Vertical bounce policy.</param>
-    /// <returns></returns>
-    public void SetBounceAllow( bool horiz,  bool vert) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_bounce_allow_set_ptr.Value.Delegate(this.NativeHandle, horiz,  vert);
+    public void SetBounceAllow(bool horiz, bool vert) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_bounce_allow_set_ptr.Value.Delegate(this.NativeHandle,horiz, vert);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Control Wheel disable Enable or disable mouse wheel to be used to scroll the scroller content. heel is enabled by default.</summary>
     /// <returns><c>true</c> if wheel is disabled, <c>false</c> otherwise</returns>
     public bool GetWheelDisabled() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_wheel_disabled_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_wheel_disabled_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
     /// <summary>Control Wheel disable Enable or disable mouse wheel to be used to scroll the scroller content. heel is enabled by default.</summary>
     /// <param name="disabled"><c>true</c> if wheel is disabled, <c>false</c> otherwise</param>
-    /// <returns></returns>
-    public void SetWheelDisabled( bool disabled) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_wheel_disabled_set_ptr.Value.Delegate(this.NativeHandle, disabled);
+    public void SetWheelDisabled(bool disabled) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_wheel_disabled_set_ptr.Value.Delegate(this.NativeHandle,disabled);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Blocking of scrolling (per axis)
@@ -1766,7 +1914,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// What makes this function different from freeze_push(), hold_push() and lock_x_set() (or lock_y_set()) is that it doesn&apos;t propagate its effects to any parent or child widget of <c>obj</c>. Only the target scrollable widget will be locked with regard to scrolling.</summary>
     /// <returns>Which axis (or axes) to block</returns>
     public Efl.Ui.ScrollBlock GetMovementBlock() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_movement_block_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_movement_block_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
@@ -1775,41 +1923,37 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// 
     /// What makes this function different from freeze_push(), hold_push() and lock_x_set() (or lock_y_set()) is that it doesn&apos;t propagate its effects to any parent or child widget of <c>obj</c>. Only the target scrollable widget will be locked with regard to scrolling.</summary>
     /// <param name="block">Which axis (or axes) to block</param>
-    /// <returns></returns>
-    public void SetMovementBlock( Efl.Ui.ScrollBlock block) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_movement_block_set_ptr.Value.Delegate(this.NativeHandle, block);
+    public void SetMovementBlock(Efl.Ui.ScrollBlock block) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_movement_block_set_ptr.Value.Delegate(this.NativeHandle,block);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Momentum animator</summary>
     /// <returns><c>true</c> if disabled, <c>false</c> otherwise</returns>
     public bool GetMomentumAnimatorDisabled() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_momentum_animator_disabled_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_momentum_animator_disabled_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
     /// <summary>Momentum animator</summary>
     /// <param name="disabled"><c>true</c> if disabled, <c>false</c> otherwise</param>
-    /// <returns></returns>
-    public void SetMomentumAnimatorDisabled( bool disabled) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_momentum_animator_disabled_set_ptr.Value.Delegate(this.NativeHandle, disabled);
+    public void SetMomentumAnimatorDisabled(bool disabled) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_momentum_animator_disabled_set_ptr.Value.Delegate(this.NativeHandle,disabled);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Scrollbar visibility policy
     /// #ELM_SCROLLER_POLICY_AUTO means the scrollbar is made visible if it is needed, and otherwise kept hidden. #ELM_SCROLLER_POLICY_ON turns it on all the time, and #ELM_SCROLLER_POLICY_OFF always keeps it off. This applies respectively for the horizontal and vertical scrollbars.</summary>
     /// <param name="hbar">Horizontal scrollbar policy</param>
     /// <param name="vbar">Vertical scrollbar policy</param>
-    /// <returns></returns>
-    public void GetPolicy( out Elm.Scroller.Policy hbar,  out Elm.Scroller.Policy vbar) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_policy_get_ptr.Value.Delegate(this.NativeHandle, out hbar,  out vbar);
+    public void GetPolicy(out Elm.Scroller.Policy hbar, out Elm.Scroller.Policy vbar) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_policy_get_ptr.Value.Delegate(this.NativeHandle,out hbar, out vbar);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Scrollbar visibility policy
     /// #ELM_SCROLLER_POLICY_AUTO means the scrollbar is made visible if it is needed, and otherwise kept hidden. #ELM_SCROLLER_POLICY_ON turns it on all the time, and #ELM_SCROLLER_POLICY_OFF always keeps it off. This applies respectively for the horizontal and vertical scrollbars.</summary>
     /// <param name="hbar">Horizontal scrollbar policy</param>
     /// <param name="vbar">Vertical scrollbar policy</param>
-    /// <returns></returns>
-    public void SetPolicy( Elm.Scroller.Policy hbar,  Elm.Scroller.Policy vbar) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_policy_set_ptr.Value.Delegate(this.NativeHandle, hbar,  vbar);
+    public void SetPolicy(Elm.Scroller.Policy hbar, Elm.Scroller.Policy vbar) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_policy_set_ptr.Value.Delegate(this.NativeHandle,hbar, vbar);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Currently visible content region
@@ -1822,9 +1966,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="y">Y coordinate of the region</param>
     /// <param name="w">Width of the region</param>
     /// <param name="h">Height of the region</param>
-    /// <returns></returns>
-    public void GetContentRegion( out int x,  out int y,  out int w,  out int h) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_region_get_ptr.Value.Delegate(this.NativeHandle, out x,  out y,  out w,  out h);
+    public void GetContentRegion(out int x, out int y, out int w, out int h) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_region_get_ptr.Value.Delegate(this.NativeHandle,out x, out y, out w, out h);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>Currently visible content region
@@ -1837,71 +1980,64 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="y">Y coordinate of the region</param>
     /// <param name="w">Width of the region</param>
     /// <param name="h">Height of the region</param>
-    /// <returns></returns>
-    public void SetContentRegion( int x,  int y,  int w,  int h) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_region_set_ptr.Value.Delegate(this.NativeHandle, x,  y,  w,  h);
+    public void SetContentRegion(int x, int y, int w, int h) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_region_set_ptr.Value.Delegate(this.NativeHandle,x, y, w, h);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>It decides whether the scrollable object propagates the events to content object or not.</summary>
     /// <returns><c>true</c> if events are propagated, <c>false</c> otherwise</returns>
     public bool GetContentEvents() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_events_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_events_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
     /// <summary>It decides whether the scrollable object propagates the events to content object or not.</summary>
     /// <param name="repeat_events"><c>true</c> if events are propagated, <c>false</c> otherwise</param>
-    /// <returns></returns>
-    public void SetContentEvents( bool repeat_events) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_events_set_ptr.Value.Delegate(this.NativeHandle, repeat_events);
+    public void SetContentEvents(bool repeat_events) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_events_set_ptr.Value.Delegate(this.NativeHandle,repeat_events);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Scroll page size relative to viewport size.
     /// The scroller is capable of limiting scrolling by the user to &quot;pages&quot;. That is to jump by and only show a &quot;whole page&quot; at a time as if the continuous area of the scroller content is split into page sized pieces. This sets the size of a page relative to the viewport of the scroller. 1.0 is &quot;1 viewport&quot; is size (horizontally or vertically). 0.0 turns it off in that axis. This is mutually exclusive with page size (see <see cref="Elm.IInterfaceScrollable.GetPageSize"/> for more information). Likewise 0.5 is &quot;half a viewport&quot;. Sane usable values are normally between 0.0 and 1.0 including 1.0. If you only want 1 axis to be page &quot;limited&quot;, use 0.0 for the other axis.</summary>
     /// <param name="x">The horizontal page relative size</param>
     /// <param name="y">The vertical page relative size</param>
-    /// <returns></returns>
-    public void GetPageSize( out int x,  out int y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_size_get_ptr.Value.Delegate(this.NativeHandle, out x,  out y);
+    public void GetPageSize(out int x, out int y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_size_get_ptr.Value.Delegate(this.NativeHandle,out x, out y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Scroll page size relative to viewport size.
     /// The scroller is capable of limiting scrolling by the user to &quot;pages&quot;. That is to jump by and only show a &quot;whole page&quot; at a time as if the continuous area of the scroller content is split into page sized pieces. This sets the size of a page relative to the viewport of the scroller. 1.0 is &quot;1 viewport&quot; is size (horizontally or vertically). 0.0 turns it off in that axis. This is mutually exclusive with page size (see <see cref="Elm.IInterfaceScrollable.GetPageSize"/> for more information). Likewise 0.5 is &quot;half a viewport&quot;. Sane usable values are normally between 0.0 and 1.0 including 1.0. If you only want 1 axis to be page &quot;limited&quot;, use 0.0 for the other axis.</summary>
     /// <param name="x">The horizontal page relative size</param>
     /// <param name="y">The vertical page relative size</param>
-    /// <returns></returns>
-    public void SetPageSize( int x,  int y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_size_set_ptr.Value.Delegate(this.NativeHandle, x,  y);
+    public void SetPageSize(int x, int y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_size_set_ptr.Value.Delegate(this.NativeHandle,x, y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Bounce animator</summary>
     /// <returns><c>true</c> if bounce animation is disabled, <c>false</c> otherwise</returns>
     public bool GetBounceAnimatorDisabled() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_bounce_animator_disabled_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_bounce_animator_disabled_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
     /// <summary>Bounce animator</summary>
     /// <param name="disabled"><c>true</c> if bounce animation is disabled, <c>false</c> otherwise</param>
-    /// <returns></returns>
-    public void SetBounceAnimatorDisabled( bool disabled) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_bounce_animator_disabled_set_ptr.Value.Delegate(this.NativeHandle, disabled);
+    public void SetBounceAnimatorDisabled(bool disabled) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_bounce_animator_disabled_set_ptr.Value.Delegate(this.NativeHandle,disabled);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Page scroll limit</summary>
     /// <param name="page_limit_h">Page limit horizontal</param>
     /// <param name="page_limit_v">Page limit vertical</param>
-    /// <returns></returns>
-    public void GetPageScrollLimit( out int page_limit_h,  out int page_limit_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_scroll_limit_get_ptr.Value.Delegate(this.NativeHandle, out page_limit_h,  out page_limit_v);
+    public void GetPageScrollLimit(out int page_limit_h, out int page_limit_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_scroll_limit_get_ptr.Value.Delegate(this.NativeHandle,out page_limit_h, out page_limit_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Page scroll limit</summary>
     /// <param name="page_limit_h">Page limit horizontal</param>
     /// <param name="page_limit_v">Page limit vertical</param>
-    /// <returns></returns>
-    public void SetPageScrollLimit( int page_limit_h,  int page_limit_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_scroll_limit_set_ptr.Value.Delegate(this.NativeHandle, page_limit_h,  page_limit_v);
+    public void SetPageScrollLimit(int page_limit_h, int page_limit_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_scroll_limit_set_ptr.Value.Delegate(this.NativeHandle,page_limit_h, page_limit_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Page snapping behavior
@@ -1910,9 +2046,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// Note: If <c>obj</c> is not set to have pages, nothing will happen after this call.</summary>
     /// <param name="horiz">Allow snap horizontally</param>
     /// <param name="vert">Allow snap vertically</param>
-    /// <returns></returns>
-    public void GetPageSnapAllow( out bool horiz,  out bool vert) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_snap_allow_get_ptr.Value.Delegate(this.NativeHandle, out horiz,  out vert);
+    public void GetPageSnapAllow(out bool horiz, out bool vert) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_snap_allow_get_ptr.Value.Delegate(this.NativeHandle,out horiz, out vert);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Page snapping behavior
@@ -1921,9 +2056,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// Note: If <c>obj</c> is not set to have pages, nothing will happen after this call.</summary>
     /// <param name="horiz">Allow snap horizontally</param>
     /// <param name="vert">Allow snap vertically</param>
-    /// <returns></returns>
-    public void SetPageSnapAllow( bool horiz,  bool vert) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_snap_allow_set_ptr.Value.Delegate(this.NativeHandle, horiz,  vert);
+    public void SetPageSnapAllow(bool horiz, bool vert) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_snap_allow_set_ptr.Value.Delegate(this.NativeHandle,horiz, vert);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Pagin property</summary>
@@ -1931,9 +2065,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="pagerel_v">Page relation vertical</param>
     /// <param name="pagesize_h">Page size horizontal</param>
     /// <param name="pagesize_v">Page size vertical</param>
-    /// <returns></returns>
-    public void GetPaging( out double pagerel_h,  out double pagerel_v,  out int pagesize_h,  out int pagesize_v) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_paging_get_ptr.Value.Delegate(this.NativeHandle, out pagerel_h,  out pagerel_v,  out pagesize_h,  out pagesize_v);
+    public void GetPaging(out double pagerel_h, out double pagerel_v, out int pagesize_h, out int pagesize_v) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_paging_get_ptr.Value.Delegate(this.NativeHandle,out pagerel_h, out pagerel_v, out pagesize_h, out pagesize_v);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>Pagin property</summary>
@@ -1941,9 +2074,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="pagerel_v">Page relation vertical</param>
     /// <param name="pagesize_h">Page size horizontal</param>
     /// <param name="pagesize_v">Page size vertical</param>
-    /// <returns></returns>
-    public void SetPaging( double pagerel_h,  double pagerel_v,  int pagesize_h,  int pagesize_v) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_paging_set_ptr.Value.Delegate(this.NativeHandle, pagerel_h,  pagerel_v,  pagesize_h,  pagesize_v);
+    public void SetPaging(double pagerel_h, double pagerel_v, int pagesize_h, int pagesize_v) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_paging_set_ptr.Value.Delegate(this.NativeHandle,pagerel_h, pagerel_v, pagesize_h, pagesize_v);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>Single direction scroll configuration
@@ -1952,7 +2084,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// The hard behavior restricts the scrolling to a single direction all of the time while the soft one will restrict depending on factors such as the movement angle. If the user scrolls roughly in one direction only, it will only move according to it while if the move was clearly wanted on both axes, it will happen on both of them.</summary>
     /// <returns>The single direction scroll policy</returns>
     public Elm.Scroller.SingleDirection GetSingleDirection() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_single_direction_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_single_direction_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
@@ -1961,253 +2093,218 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// 
     /// The hard behavior restricts the scrolling to a single direction all of the time while the soft one will restrict depending on factors such as the movement angle. If the user scrolls roughly in one direction only, it will only move according to it while if the move was clearly wanted on both axes, it will happen on both of them.</summary>
     /// <param name="single_dir">The single direction scroll policy</param>
-    /// <returns></returns>
-    public void SetSingleDirection( Elm.Scroller.SingleDirection single_dir) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_single_direction_set_ptr.Value.Delegate(this.NativeHandle, single_dir);
+    public void SetSingleDirection(Elm.Scroller.SingleDirection single_dir) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_single_direction_set_ptr.Value.Delegate(this.NativeHandle,single_dir);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Step size</summary>
     /// <param name="x">X coordinate</param>
     /// <param name="y">Y coordinate</param>
-    /// <returns></returns>
-    public void GetStepSize( out int x,  out int y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_step_size_get_ptr.Value.Delegate(this.NativeHandle, out x,  out y);
+    public void GetStepSize(out int x, out int y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_step_size_get_ptr.Value.Delegate(this.NativeHandle,out x, out y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Step size</summary>
     /// <param name="x">X coordinate</param>
     /// <param name="y">Y coordinate</param>
-    /// <returns></returns>
-    public void SetStepSize( int x,  int y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_step_size_set_ptr.Value.Delegate(this.NativeHandle, x,  y);
+    public void SetStepSize(int x, int y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_step_size_set_ptr.Value.Delegate(this.NativeHandle,x, y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Controls an infinite loop for a scroller.</summary>
     /// <param name="loop_h">The scrolling horizontal loop</param>
     /// <param name="loop_v">The scrolling vertical loop</param>
-    /// <returns></returns>
-    public void GetContentLoop( out bool loop_h,  out bool loop_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_loop_get_ptr.Value.Delegate(this.NativeHandle, out loop_h,  out loop_v);
+    public void GetContentLoop(out bool loop_h, out bool loop_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_loop_get_ptr.Value.Delegate(this.NativeHandle,out loop_h, out loop_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Controls an infinite loop for a scroller.</summary>
     /// <param name="loop_h">The scrolling horizontal loop</param>
     /// <param name="loop_v">The scrolling vertical loop</param>
-    /// <returns></returns>
-    public void SetContentLoop( bool loop_h,  bool loop_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_loop_set_ptr.Value.Delegate(this.NativeHandle, loop_h,  loop_v);
+    public void SetContentLoop(bool loop_h, bool loop_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_loop_set_ptr.Value.Delegate(this.NativeHandle,loop_h, loop_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Set the callback to run when the content has been moved up.</summary>
     /// <param name="scroll_up_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollUpCb( ElmInterfaceScrollableCb scroll_up_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_up_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_up_cb);
+    public void SetScrollUpCb(ElmInterfaceScrollableCb scroll_up_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_up_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_up_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the horizontal scrollbar is dragged.</summary>
     /// <param name="hbar_drag_cb">The callback</param>
-    /// <returns></returns>
-    public void SetHbarDragCb( ElmInterfaceScrollableCb hbar_drag_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_hbar_drag_cb_set_ptr.Value.Delegate(this.NativeHandle, hbar_drag_cb);
+    public void SetHbarDragCb(ElmInterfaceScrollableCb hbar_drag_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_hbar_drag_cb_set_ptr.Value.Delegate(this.NativeHandle,hbar_drag_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when dragging of the contents has started.</summary>
     /// <param name="drag_start_cb">The callback</param>
-    /// <returns></returns>
-    public void SetDragStartCb( ElmInterfaceScrollableCb drag_start_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_drag_start_cb_set_ptr.Value.Delegate(this.NativeHandle, drag_start_cb);
+    public void SetDragStartCb(ElmInterfaceScrollableCb drag_start_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_drag_start_cb_set_ptr.Value.Delegate(this.NativeHandle,drag_start_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when scrolling of the contents has started.</summary>
     /// <param name="scroll_start_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollStartCb( ElmInterfaceScrollableCb scroll_start_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_start_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_start_cb);
+    public void SetScrollStartCb(ElmInterfaceScrollableCb scroll_start_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_start_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_start_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Freeze property</summary>
     /// <param name="freeze"><c>true</c> if freeze, <c>false</c> otherwise</param>
-    /// <returns></returns>
-    public void SetFreeze( bool freeze) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_freeze_set_ptr.Value.Delegate(this.NativeHandle, freeze);
+    public void SetFreeze(bool freeze) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_freeze_set_ptr.Value.Delegate(this.NativeHandle,freeze);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>When the viewport is resized, the callback is called.</summary>
     /// <param name="viewport_resize_cb">The callback</param>
-    /// <returns></returns>
-    public void SetContentViewportResizeCb( ElmInterfaceScrollableResizeCb viewport_resize_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_viewport_resize_cb_set_ptr.Value.Delegate(this.NativeHandle, viewport_resize_cb);
+    public void SetContentViewportResizeCb(ElmInterfaceScrollableResizeCb viewport_resize_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_viewport_resize_cb_set_ptr.Value.Delegate(this.NativeHandle,viewport_resize_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the content has been moved to the left</summary>
     /// <param name="scroll_left_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollLeftCb( ElmInterfaceScrollableCb scroll_left_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_left_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_left_cb);
+    public void SetScrollLeftCb(ElmInterfaceScrollableCb scroll_left_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_left_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_left_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the vertical scrollbar is pressed.</summary>
     /// <param name="vbar_press_cb">The callback</param>
-    /// <returns></returns>
-    public void SetVbarPressCb( ElmInterfaceScrollableCb vbar_press_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_vbar_press_cb_set_ptr.Value.Delegate(this.NativeHandle, vbar_press_cb);
+    public void SetVbarPressCb(ElmInterfaceScrollableCb vbar_press_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_vbar_press_cb_set_ptr.Value.Delegate(this.NativeHandle,vbar_press_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the horizontal scrollbar is pressed.</summary>
     /// <param name="hbar_press_cb">The callback</param>
-    /// <returns></returns>
-    public void SetHbarPressCb( ElmInterfaceScrollableCb hbar_press_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_hbar_press_cb_set_ptr.Value.Delegate(this.NativeHandle, hbar_press_cb);
+    public void SetHbarPressCb(ElmInterfaceScrollableCb hbar_press_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_hbar_press_cb_set_ptr.Value.Delegate(this.NativeHandle,hbar_press_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the horizontal scrollbar is unpressed.</summary>
     /// <param name="hbar_unpress_cb">The callback</param>
-    /// <returns></returns>
-    public void SetHbarUnpressCb( ElmInterfaceScrollableCb hbar_unpress_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_hbar_unpress_cb_set_ptr.Value.Delegate(this.NativeHandle, hbar_unpress_cb);
+    public void SetHbarUnpressCb(ElmInterfaceScrollableCb hbar_unpress_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_hbar_unpress_cb_set_ptr.Value.Delegate(this.NativeHandle,hbar_unpress_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when dragging of the contents has stopped.</summary>
     /// <param name="drag_stop_cb">The callback</param>
-    /// <returns></returns>
-    public void SetDragStopCb( ElmInterfaceScrollableCb drag_stop_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_drag_stop_cb_set_ptr.Value.Delegate(this.NativeHandle, drag_stop_cb);
+    public void SetDragStopCb(ElmInterfaceScrollableCb drag_stop_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_drag_stop_cb_set_ptr.Value.Delegate(this.NativeHandle,drag_stop_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when scrolling of the contents has stopped.</summary>
     /// <param name="scroll_stop_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollStopCb( ElmInterfaceScrollableCb scroll_stop_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_stop_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_stop_cb);
+    public void SetScrollStopCb(ElmInterfaceScrollableCb scroll_stop_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_stop_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_stop_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Extern pan</summary>
     /// <param name="pan">Pan object</param>
-    /// <returns></returns>
-    public void SetExternPan( Efl.Canvas.Object pan) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_extern_pan_set_ptr.Value.Delegate(this.NativeHandle, pan);
+    public void SetExternPan(Efl.Canvas.Object pan) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_extern_pan_set_ptr.Value.Delegate(this.NativeHandle,pan);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the visible page changes.</summary>
     /// <param name="page_change_cb">The callback</param>
-    /// <returns></returns>
-    public void SetPageChangeCb( ElmInterfaceScrollableCb page_change_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_change_cb_set_ptr.Value.Delegate(this.NativeHandle, page_change_cb);
+    public void SetPageChangeCb(ElmInterfaceScrollableCb page_change_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_change_cb_set_ptr.Value.Delegate(this.NativeHandle,page_change_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Hold property</summary>
     /// <param name="hold"><c>true</c> if hold, <c>false</c> otherwise</param>
-    /// <returns></returns>
-    public void SetHold( bool hold) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_hold_set_ptr.Value.Delegate(this.NativeHandle, hold);
+    public void SetHold(bool hold) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_hold_set_ptr.Value.Delegate(this.NativeHandle,hold);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the scrolling animation has started.</summary>
     /// <param name="animate_start_cb">The callback</param>
-    /// <returns></returns>
-    public void SetAnimateStartCb( ElmInterfaceScrollableCb animate_start_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_animate_start_cb_set_ptr.Value.Delegate(this.NativeHandle, animate_start_cb);
+    public void SetAnimateStartCb(ElmInterfaceScrollableCb animate_start_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_animate_start_cb_set_ptr.Value.Delegate(this.NativeHandle,animate_start_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the content has been moved down.</summary>
     /// <param name="scroll_down_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollDownCb( ElmInterfaceScrollableCb scroll_down_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_down_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_down_cb);
+    public void SetScrollDownCb(ElmInterfaceScrollableCb scroll_down_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_down_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_down_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set scroll page size relative to viewport size.</summary>
     /// <param name="h_pagerel">Page relation horizontal</param>
     /// <param name="v_pagerel">Page relation vertical</param>
-    /// <returns></returns>
-    public void SetPageRelative( double h_pagerel,  double v_pagerel) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_relative_set_ptr.Value.Delegate(this.NativeHandle, h_pagerel,  v_pagerel);
+    public void SetPageRelative(double h_pagerel, double v_pagerel) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_relative_set_ptr.Value.Delegate(this.NativeHandle,h_pagerel, v_pagerel);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Set the callback to run when the content has been moved.</summary>
     /// <param name="scroll_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollCb( ElmInterfaceScrollableCb scroll_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_cb);
+    public void SetScrollCb(ElmInterfaceScrollableCb scroll_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the scrolling animation has stopped.</summary>
     /// <param name="animate_stop_cb">The callback</param>
-    /// <returns></returns>
-    public void SetAnimateStopCb( ElmInterfaceScrollableCb animate_stop_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_animate_stop_cb_set_ptr.Value.Delegate(this.NativeHandle, animate_stop_cb);
+    public void SetAnimateStopCb(ElmInterfaceScrollableCb animate_stop_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_animate_stop_cb_set_ptr.Value.Delegate(this.NativeHandle,animate_stop_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>set the callback to run on minimal limit content</summary>
     /// <param name="min_limit_cb">The callback</param>
-    /// <returns></returns>
-    public void SetContentMinLimitCb( ElmInterfaceScrollableMinLimitCb min_limit_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_min_limit_cb_set_ptr.Value.Delegate(this.NativeHandle, min_limit_cb);
+    public void SetContentMinLimitCb(ElmInterfaceScrollableMinLimitCb min_limit_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_min_limit_cb_set_ptr.Value.Delegate(this.NativeHandle,min_limit_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the content has been moved to the right.</summary>
     /// <param name="scroll_right_cb">The callback</param>
-    /// <returns></returns>
-    public void SetScrollRightCb( ElmInterfaceScrollableCb scroll_right_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_scroll_right_cb_set_ptr.Value.Delegate(this.NativeHandle, scroll_right_cb);
+    public void SetScrollRightCb(ElmInterfaceScrollableCb scroll_right_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_scroll_right_cb_set_ptr.Value.Delegate(this.NativeHandle,scroll_right_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Content property</summary>
     /// <param name="content">Content object</param>
-    /// <returns></returns>
-    public void SetScrollableContent( Efl.Canvas.Object content) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_set_ptr.Value.Delegate(this.NativeHandle, content);
+    public void SetScrollableContent(Efl.Canvas.Object content) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_set_ptr.Value.Delegate(this.NativeHandle,content);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the left edge of the content has been reached.</summary>
     /// <param name="edge_left_cb">The callback</param>
-    /// <returns></returns>
-    public void SetEdgeLeftCb( ElmInterfaceScrollableCb edge_left_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_edge_left_cb_set_ptr.Value.Delegate(this.NativeHandle, edge_left_cb);
+    public void SetEdgeLeftCb(ElmInterfaceScrollableCb edge_left_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_edge_left_cb_set_ptr.Value.Delegate(this.NativeHandle,edge_left_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the horizontal scrollbar is dragged.</summary>
     /// <param name="vbar_drag_cb">The callback</param>
-    /// <returns></returns>
-    public void SetVbarDragCb( ElmInterfaceScrollableCb vbar_drag_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_vbar_drag_cb_set_ptr.Value.Delegate(this.NativeHandle, vbar_drag_cb);
+    public void SetVbarDragCb(ElmInterfaceScrollableCb vbar_drag_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_vbar_drag_cb_set_ptr.Value.Delegate(this.NativeHandle,vbar_drag_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the horizontal scrollbar is unpressed.</summary>
     /// <param name="vbar_unpress_cb">The callback</param>
-    /// <returns></returns>
-    public void SetVbarUnpressCb( ElmInterfaceScrollableCb vbar_unpress_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_vbar_unpress_cb_set_ptr.Value.Delegate(this.NativeHandle, vbar_unpress_cb);
+    public void SetVbarUnpressCb(ElmInterfaceScrollableCb vbar_unpress_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_vbar_unpress_cb_set_ptr.Value.Delegate(this.NativeHandle,vbar_unpress_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the bottom edge of the content has been reached.</summary>
     /// <param name="edge_bottom_cb">The callback</param>
-    /// <returns></returns>
-    public void SetEdgeBottomCb( ElmInterfaceScrollableCb edge_bottom_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_edge_bottom_cb_set_ptr.Value.Delegate(this.NativeHandle, edge_bottom_cb);
+    public void SetEdgeBottomCb(ElmInterfaceScrollableCb edge_bottom_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_edge_bottom_cb_set_ptr.Value.Delegate(this.NativeHandle,edge_bottom_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the right edge of the content has been reached.</summary>
     /// <param name="edge_right_cb">The callback</param>
-    /// <returns></returns>
-    public void SetEdgeRightCb( ElmInterfaceScrollableCb edge_right_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_edge_right_cb_set_ptr.Value.Delegate(this.NativeHandle, edge_right_cb);
+    public void SetEdgeRightCb(ElmInterfaceScrollableCb edge_right_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_edge_right_cb_set_ptr.Value.Delegate(this.NativeHandle,edge_right_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the callback to run when the top edge of the content has been reached.</summary>
     /// <param name="edge_top_cb">The callback</param>
-    /// <returns></returns>
-    public void SetEdgeTopCb( ElmInterfaceScrollableCb edge_top_cb) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_edge_top_cb_set_ptr.Value.Delegate(this.NativeHandle, edge_top_cb);
+    public void SetEdgeTopCb(ElmInterfaceScrollableCb edge_top_cb) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_edge_top_cb_set_ptr.Value.Delegate(this.NativeHandle,edge_top_cb);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Object property</summary>
     /// <param name="edje_object">Edje object</param>
     /// <param name="hit_rectangle">Evas object</param>
-    /// <returns></returns>
-    public void SetObjects( Efl.Canvas.Object edje_object,  Efl.Canvas.Object hit_rectangle) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_objects_set_ptr.Value.Delegate(this.NativeHandle, edje_object,  hit_rectangle);
+    public void SetObjects(Efl.Canvas.Object edje_object, Efl.Canvas.Object hit_rectangle) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_objects_set_ptr.Value.Delegate(this.NativeHandle,edje_object, hit_rectangle);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Get scroll last page number.
@@ -2216,9 +2313,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// See: <see cref="Elm.IInterfaceScrollable.GetCurrentPage"/>, <see cref="Elm.IInterfaceScrollable.ShowPage"/> and <see cref="Elm.IInterfaceScrollable.PageBringIn"/>.</summary>
     /// <param name="pagenumber_h">The horizontal page number</param>
     /// <param name="pagenumber_v">The vertical page number</param>
-    /// <returns></returns>
-    public void GetLastPage( out int pagenumber_h,  out int pagenumber_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_last_page_get_ptr.Value.Delegate(this.NativeHandle, out pagenumber_h,  out pagenumber_v);
+    public void GetLastPage(out int pagenumber_h, out int pagenumber_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_last_page_get_ptr.Value.Delegate(this.NativeHandle,out pagenumber_h, out pagenumber_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Get scroll current page number.
@@ -2227,9 +2323,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// See: <see cref="Elm.IInterfaceScrollable.GetLastPage"/>, <see cref="Elm.IInterfaceScrollable.ShowPage"/> and <see cref="Elm.IInterfaceScrollable.PageBringIn"/>.</summary>
     /// <param name="pagenumber_h">The horizontal page number</param>
     /// <param name="pagenumber_v">The vertical page number</param>
-    /// <returns></returns>
-    public void GetCurrentPage( out int pagenumber_h,  out int pagenumber_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_current_page_get_ptr.Value.Delegate(this.NativeHandle, out pagenumber_h,  out pagenumber_v);
+    public void GetCurrentPage(out int pagenumber_h, out int pagenumber_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_current_page_get_ptr.Value.Delegate(this.NativeHandle,out pagenumber_h, out pagenumber_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Content viewport geometry</summary>
@@ -2237,49 +2332,44 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="y">Y coordinate</param>
     /// <param name="w">Width</param>
     /// <param name="h">Height</param>
-    /// <returns></returns>
-    public void GetContentViewportGeometry( out int x,  out int y,  out int w,  out int h) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_viewport_geometry_get_ptr.Value.Delegate(this.NativeHandle, out x,  out y,  out w,  out h);
+    public void GetContentViewportGeometry(out int x, out int y, out int w, out int h) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_viewport_geometry_get_ptr.Value.Delegate(this.NativeHandle,out x, out y, out w, out h);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>Get the size of the content object
     /// This gets the size of the content object of the scroller.</summary>
     /// <param name="w">Width of the content object.</param>
     /// <param name="h">Height of the content object.</param>
-    /// <returns></returns>
-    public void GetContentSize( out int w,  out int h) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_size_get_ptr.Value.Delegate(this.NativeHandle, out w,  out h);
+    public void GetContentSize(out int w, out int h) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_size_get_ptr.Value.Delegate(this.NativeHandle,out w, out h);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Whether scrolling should loop around.</summary>
     /// <returns>True to enable looping.</returns>
     public bool GetItemLoopEnabled() {
-         var _ret_var = Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_item_loop_enabled_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_item_loop_enabled_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
     /// <summary>Whether scrolling should loop around.</summary>
     /// <param name="enable">True to enable looping.</param>
-    /// <returns></returns>
-    public void SetItemLoopEnabled( bool enable) {
-                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_item_loop_enabled_set_ptr.Value.Delegate(this.NativeHandle, enable);
+    public void SetItemLoopEnabled(bool enable) {
+                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_item_loop_enabled_set_ptr.Value.Delegate(this.NativeHandle,enable);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Set the content position</summary>
     /// <param name="x">X coordinate</param>
     /// <param name="y">Y coordinate</param>
     /// <param name="sig">Send signals to the theme corresponding to the scroll direction, or if an edge was reached.</param>
-    /// <returns></returns>
-    public void SetContentPos( int x,  int y,  bool sig) {
-                                                                                 Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_pos_set_ptr.Value.Delegate(this.NativeHandle, x,  y,  sig);
+    public void SetContentPos(int x, int y, bool sig) {
+                                                                                 Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_pos_set_ptr.Value.Delegate(this.NativeHandle,x, y, sig);
         Eina.Error.RaiseIfUnhandledException();
                                                          }
     /// <summary>Get content position</summary>
     /// <param name="x">X coordinate</param>
     /// <param name="y">Y coordinate</param>
-    /// <returns></returns>
-    public void GetContentPos( out int x,  out int y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_pos_get_ptr.Value.Delegate(this.NativeHandle, out x,  out y);
+    public void GetContentPos(out int x, out int y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_pos_get_ptr.Value.Delegate(this.NativeHandle,out x, out y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Show a specific virtual region within the scroller content object by page number.
@@ -2288,9 +2378,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// See <see cref="Elm.IInterfaceScrollable.PageBringIn"/>.</summary>
     /// <param name="pagenumber_h">The horizontal page number</param>
     /// <param name="pagenumber_v">The vertical page number</param>
-    /// <returns></returns>
-    public void ShowPage( int pagenumber_h,  int pagenumber_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_show_ptr.Value.Delegate(this.NativeHandle, pagenumber_h,  pagenumber_v);
+    public void ShowPage(int pagenumber_h, int pagenumber_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_show_ptr.Value.Delegate(this.NativeHandle,pagenumber_h, pagenumber_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Show a specific virtual region within the scroller content object.
@@ -2301,9 +2390,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="y">Y coordinate of the region</param>
     /// <param name="w">Width of the region</param>
     /// <param name="h">Height of the region</param>
-    /// <returns></returns>
-    public void RegionBringIn( int x,  int y,  int w,  int h) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_region_bring_in_ptr.Value.Delegate(this.NativeHandle, x,  y,  w,  h);
+    public void RegionBringIn(int x, int y, int w, int h) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_region_bring_in_ptr.Value.Delegate(this.NativeHandle,x, y, w, h);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>Show a specific virtual region within the scroller content object by page number.
@@ -2312,9 +2400,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <see cref="Elm.IInterfaceScrollable.ShowPage"/></summary>
     /// <param name="pagenumber_h">The horizontal page number</param>
     /// <param name="pagenumber_v">The vertical page number</param>
-    /// <returns></returns>
-    public void PageBringIn( int pagenumber_h,  int pagenumber_v) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_page_bring_in_ptr.Value.Delegate(this.NativeHandle, pagenumber_h,  pagenumber_v);
+    public void PageBringIn(int pagenumber_h, int pagenumber_v) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_page_bring_in_ptr.Value.Delegate(this.NativeHandle,pagenumber_h, pagenumber_v);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>Show a specific virtual region within the scroller content object
@@ -2323,36 +2410,26 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="y">Y coordinate of the region</param>
     /// <param name="w">Width of the region</param>
     /// <param name="h">Height of the region</param>
-    /// <returns></returns>
-    public void ShowContentRegion( int x,  int y,  int w,  int h) {
-                                                                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_region_show_ptr.Value.Delegate(this.NativeHandle, x,  y,  w,  h);
+    public void ShowContentRegion(int x, int y, int w, int h) {
+                                                                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_region_show_ptr.Value.Delegate(this.NativeHandle,x, y, w, h);
         Eina.Error.RaiseIfUnhandledException();
                                                                          }
     /// <summary>Prevent the scrollable from being smaller than the minimum size of the content.
     /// By default the scroller will be as small as its design allows, irrespective of its content. This will make the scroller minimum size the right size horizontally and/or vertically to perfectly fit its content in that direction.</summary>
     /// <param name="w">Whether to limit the minimum horizontal size</param>
     /// <param name="h">Whether to limit the minimum vertical size</param>
-    /// <returns></returns>
-    public void ContentMinLimit( bool w,  bool h) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_content_min_limit_ptr.Value.Delegate(this.NativeHandle, w,  h);
+    public void ContentMinLimit(bool w, bool h) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_content_min_limit_ptr.Value.Delegate(this.NativeHandle,w, h);
         Eina.Error.RaiseIfUnhandledException();
                                          }
-    /// <summary></summary>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
-    /// <returns></returns>
-    public void SetWantedRegion( int x,  int y) {
-                                                         Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_wanted_region_set_ptr.Value.Delegate(this.NativeHandle, x,  y);
+    public void SetWantedRegion(int x, int y) {
+                                                         Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_wanted_region_set_ptr.Value.Delegate(this.NativeHandle,x, y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
-    /// <summary></summary>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
-    /// <returns></returns>
-    public void CustomPanPosAdjust( int x,  int y) {
+    public void CustomPanPosAdjust(int x, int y) {
          var _in_x = Eina.PrimitiveConversion.ManagedToPointerAlloc(x);
         var _in_y = Eina.PrimitiveConversion.ManagedToPointerAlloc(y);
-                                        Elm.IInterfaceScrollableNativeInherit.elm_interface_scrollable_custom_pan_pos_adjust_ptr.Value.Delegate(this.NativeHandle, _in_x,  _in_y);
+                                        Elm.IInterfaceScrollableConcrete.NativeMethods.elm_interface_scrollable_custom_pan_pos_adjust_ptr.Value.Delegate(this.NativeHandle,_in_x, _in_y);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>If the widget needs a focus manager, this function will be called.
@@ -2360,8 +2437,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="root">The logical root object for focus.</param>
     /// <returns>The focus manager.</returns>
-    public Efl.Ui.Focus.IManager FocusManagerCreate( Efl.Ui.Focus.IObject root) {
-                                 var _ret_var = Efl.Ui.IWidgetFocusManagerNativeInherit.efl_ui_widget_focus_manager_create_ptr.Value.Delegate(this.NativeHandle, root);
+    public Efl.Ui.Focus.IManager FocusManagerCreate(Efl.Ui.Focus.IObject root) {
+                                 var _ret_var = Efl.Ui.IWidgetFocusManagerConcrete.NativeMethods.efl_ui_widget_focus_manager_create_ptr.Value.Delegate(this.NativeHandle,root);
         Eina.Error.RaiseIfUnhandledException();
                         return _ret_var;
  }
@@ -2370,7 +2447,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <returns>Currently focused element.</returns>
     public Efl.Ui.Focus.IObject GetManagerFocus() {
-         var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_focus_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_focus_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
@@ -2378,9 +2455,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// Use this property to retrieve the object currently being focused, or to set the focus to a new one. When <c>focus</c> is a logical child (which cannot receive focus), the next non-logical object is selected instead. If there is no such object, focus does not change.
     /// (Since EFL 1.22)</summary>
     /// <param name="focus">Currently focused element.</param>
-    /// <returns></returns>
-    public void SetManagerFocus( Efl.Ui.Focus.IObject focus) {
-                                 Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_focus_set_ptr.Value.Delegate(this.NativeHandle, focus);
+    public void SetManagerFocus(Efl.Ui.Focus.IObject focus) {
+                                 Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_focus_set_ptr.Value.Delegate(this.NativeHandle,focus);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>Add another manager to serve the move requests.
@@ -2388,7 +2464,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <returns>The redirect manager.</returns>
     public Efl.Ui.Focus.IManager GetRedirect() {
-         var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_redirect_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_redirect_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
@@ -2396,9 +2472,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// If this value is set, all move requests are redirected to this manager object. Set it to <c>null</c> once nothing should be redirected anymore.
     /// (Since EFL 1.22)</summary>
     /// <param name="redirect">The redirect manager.</param>
-    /// <returns></returns>
-    public void SetRedirect( Efl.Ui.Focus.IManager redirect) {
-                                 Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_redirect_set_ptr.Value.Delegate(this.NativeHandle, redirect);
+    public void SetRedirect(Efl.Ui.Focus.IManager redirect) {
+                                 Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_redirect_set_ptr.Value.Delegate(this.NativeHandle,redirect);
         Eina.Error.RaiseIfUnhandledException();
                          }
     /// <summary>The list of elements which are at the border of the graph.
@@ -2406,7 +2481,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <returns>An iterator over the border objects.</returns>
     public Eina.Iterator<Efl.Ui.Focus.IObject> GetBorderElements() {
-         var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_border_elements_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_border_elements_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return new Eina.Iterator<Efl.Ui.Focus.IObject>(_ret_var, false, false);
  }
@@ -2415,9 +2490,9 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="viewport">The rectangle defining the viewport.</param>
     /// <returns>The list of border objects.</returns>
-    public Eina.Iterator<Efl.Ui.Focus.IObject> GetViewportElements( Eina.Rect viewport) {
+    public Eina.Iterator<Efl.Ui.Focus.IObject> GetViewportElements(Eina.Rect viewport) {
          Eina.Rect.NativeStruct _in_viewport = viewport;
-                        var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_viewport_elements_get_ptr.Value.Delegate(this.NativeHandle, _in_viewport);
+                        var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_viewport_elements_get_ptr.Value.Delegate(this.NativeHandle,_in_viewport);
         Eina.Error.RaiseIfUnhandledException();
                         return new Eina.Iterator<Efl.Ui.Focus.IObject>(_ret_var, false, false);
  }
@@ -2426,7 +2501,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <returns>Will be registered into this manager object.</returns>
     public Efl.Ui.Focus.IObject GetRoot() {
-         var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_root_get_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_root_get_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
@@ -2435,8 +2510,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="root">Will be registered into this manager object.</param>
     /// <returns>If <c>true</c>, this is the root node</returns>
-    public bool SetRoot( Efl.Ui.Focus.IObject root) {
-                                 var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_root_set_ptr.Value.Delegate(this.NativeHandle, root);
+    public bool SetRoot(Efl.Ui.Focus.IObject root) {
+                                 var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_root_set_ptr.Value.Delegate(this.NativeHandle,root);
         Eina.Error.RaiseIfUnhandledException();
                         return _ret_var;
  }
@@ -2445,8 +2520,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="direction">The direction to move to.</param>
     /// <returns>The element which is now focused.</returns>
-    public Efl.Ui.Focus.IObject Move( Efl.Ui.Focus.Direction direction) {
-                                 var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_move_ptr.Value.Delegate(this.NativeHandle, direction);
+    public Efl.Ui.Focus.IObject Move(Efl.Ui.Focus.Direction direction) {
+                                 var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_move_ptr.Value.Delegate(this.NativeHandle,direction);
         Eina.Error.RaiseIfUnhandledException();
                         return _ret_var;
  }
@@ -2456,8 +2531,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// <param name="child">The child to move from. Pass <c>null</c> to indicate the currently focused child.</param>
     /// <param name="logical">Wether you want to have a logical node as result or a non-logical. Note, in a <see cref="Efl.Ui.Focus.IManager.Move"/> call no logical node will get focus.</param>
     /// <returns>Object that would receive focus if moved in the given direction.</returns>
-    public Efl.Ui.Focus.IObject MoveRequest( Efl.Ui.Focus.Direction direction,  Efl.Ui.Focus.IObject child,  bool logical) {
-                                                                                 var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_request_move_ptr.Value.Delegate(this.NativeHandle, direction,  child,  logical);
+    public Efl.Ui.Focus.IObject MoveRequest(Efl.Ui.Focus.Direction direction, Efl.Ui.Focus.IObject child, bool logical) {
+                                                                                 var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_request_move_ptr.Value.Delegate(this.NativeHandle,direction, child, logical);
         Eina.Error.RaiseIfUnhandledException();
                                                         return _ret_var;
  }
@@ -2466,8 +2541,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="root">Parent for returned child.</param>
     /// <returns>Child of passed parameter.</returns>
-    public Efl.Ui.Focus.IObject RequestSubchild( Efl.Ui.Focus.IObject root) {
-                                 var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_request_subchild_ptr.Value.Delegate(this.NativeHandle, root);
+    public Efl.Ui.Focus.IObject RequestSubchild(Efl.Ui.Focus.IObject root) {
+                                 var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_request_subchild_ptr.Value.Delegate(this.NativeHandle,root);
         Eina.Error.RaiseIfUnhandledException();
                         return _ret_var;
  }
@@ -2476,8 +2551,8 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="child">The child object to inspect.</param>
     /// <returns>The list of relations starting from <c>child</c>.</returns>
-    public Efl.Ui.Focus.Relations Fetch( Efl.Ui.Focus.IObject child) {
-                                 var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_fetch_ptr.Value.Delegate(this.NativeHandle, child);
+    public Efl.Ui.Focus.Relations Fetch(Efl.Ui.Focus.IObject child) {
+                                 var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_fetch_ptr.Value.Delegate(this.NativeHandle,child);
         Eina.Error.RaiseIfUnhandledException();
                         var __ret_tmp = Eina.PrimitiveConversion.PointerToManaged<Efl.Ui.Focus.Relations>(_ret_var);
         Marshal.FreeHGlobal(_ret_var);
@@ -2488,24 +2563,22 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <returns>Last object.</returns>
     public Efl.Ui.Focus.ManagerLogicalEndDetail LogicalEnd() {
-         var _ret_var = Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_logical_end_ptr.Value.Delegate(this.NativeHandle);
+         var _ret_var = Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_logical_end_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
         return _ret_var;
  }
     /// <summary>Reset the history stack of this manager object. This means the uppermost element will be unfocused, and all other elements will be removed from the remembered list.
     /// You should focus another element immediately after calling this, in order to always have a focused object.
     /// (Since EFL 1.22)</summary>
-    /// <returns></returns>
     public void ResetHistory() {
-         Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_reset_history_ptr.Value.Delegate(this.NativeHandle);
+         Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_reset_history_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
          }
     /// <summary>Remove the uppermost history element, and focus the previous one.
     /// If there is an element that was focused before, it will be used. Otherwise, the best fitting element from the registered elements will be focused.
     /// (Since EFL 1.22)</summary>
-    /// <returns></returns>
     public void PopHistoryStack() {
-         Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_pop_history_stack_ptr.Value.Delegate(this.NativeHandle);
+         Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_pop_history_stack_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
          }
     /// <summary>Called when this manager is set as redirect.
@@ -2513,32 +2586,29 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
     /// (Since EFL 1.22)</summary>
     /// <param name="direction">The direction in which this should be setup.</param>
     /// <param name="entry">The object that caused this manager to be redirect.</param>
-    /// <returns></returns>
-    public void SetupOnFirstTouch( Efl.Ui.Focus.Direction direction,  Efl.Ui.Focus.IObject entry) {
-                                                         Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_setup_on_first_touch_ptr.Value.Delegate(this.NativeHandle, direction,  entry);
+    public void SetupOnFirstTouch(Efl.Ui.Focus.Direction direction, Efl.Ui.Focus.IObject entry) {
+                                                         Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_setup_on_first_touch_ptr.Value.Delegate(this.NativeHandle,direction, entry);
         Eina.Error.RaiseIfUnhandledException();
                                          }
     /// <summary>This disables the cache invalidation when an object is moved.
     /// Even if an object is moved, the focus manager will not recalculate its relations. This can be used when you know that the set of widgets in the focus manager is moved the same way, so the relations between the widets in the set do not change and the complex calculations can be avoided. Use <see cref="Efl.Ui.Focus.IManager.DirtyLogicUnfreeze"/> to re-enable relationship calculation.
     /// (Since EFL 1.22)</summary>
-    /// <returns></returns>
     public void FreezeDirtyLogic() {
-         Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_dirty_logic_freeze_ptr.Value.Delegate(this.NativeHandle);
+         Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_dirty_logic_freeze_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
          }
     /// <summary>This enables the cache invalidation when an object is moved.
     /// This is the counterpart to <see cref="Efl.Ui.Focus.IManager.FreezeDirtyLogic"/>.
     /// (Since EFL 1.22)</summary>
-    /// <returns></returns>
     public void DirtyLogicUnfreeze() {
-         Efl.Ui.Focus.IManagerNativeInherit.efl_ui_focus_manager_dirty_logic_unfreeze_ptr.Value.Delegate(this.NativeHandle);
+         Efl.Ui.Focus.IManagerConcrete.NativeMethods.efl_ui_focus_manager_dirty_logic_unfreeze_ptr.Value.Delegate(this.NativeHandle);
         Eina.Error.RaiseIfUnhandledException();
          }
     /// <summary>Control Wheel disable Enable or disable mouse wheel to be used to scroll the scroller content. heel is enabled by default.</summary>
 /// <value><c>true</c> if wheel is disabled, <c>false</c> otherwise</value>
     public bool WheelDisabled {
         get { return GetWheelDisabled(); }
-        set { SetWheelDisabled( value); }
+        set { SetWheelDisabled(value); }
     }
     /// <summary>Blocking of scrolling (per axis)
 /// This function will block scrolling movement (by input of a user) in a given direction. One can disable movements in the X axis, the Y axis or both. The default value is <c>none</c>, where movements are allowed in both directions.
@@ -2547,25 +2617,25 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
 /// <value>Which axis (or axes) to block</value>
     public Efl.Ui.ScrollBlock MovementBlock {
         get { return GetMovementBlock(); }
-        set { SetMovementBlock( value); }
+        set { SetMovementBlock(value); }
     }
     /// <summary>Momentum animator</summary>
 /// <value><c>true</c> if disabled, <c>false</c> otherwise</value>
     public bool MomentumAnimatorDisabled {
         get { return GetMomentumAnimatorDisabled(); }
-        set { SetMomentumAnimatorDisabled( value); }
+        set { SetMomentumAnimatorDisabled(value); }
     }
     /// <summary>It decides whether the scrollable object propagates the events to content object or not.</summary>
 /// <value><c>true</c> if events are propagated, <c>false</c> otherwise</value>
     public bool ContentEvents {
         get { return GetContentEvents(); }
-        set { SetContentEvents( value); }
+        set { SetContentEvents(value); }
     }
     /// <summary>Bounce animator</summary>
 /// <value><c>true</c> if bounce animation is disabled, <c>false</c> otherwise</value>
     public bool BounceAnimatorDisabled {
         get { return GetBounceAnimatorDisabled(); }
-        set { SetBounceAnimatorDisabled( value); }
+        set { SetBounceAnimatorDisabled(value); }
     }
     /// <summary>Single direction scroll configuration
 /// This makes it possible to restrict scrolling to a single direction, with a &quot;soft&quot; or &quot;hard&quot; behavior.
@@ -2574,153 +2644,153 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
 /// <value>The single direction scroll policy</value>
     public Elm.Scroller.SingleDirection SingleDirection {
         get { return GetSingleDirection(); }
-        set { SetSingleDirection( value); }
+        set { SetSingleDirection(value); }
     }
     /// <summary>Set the callback to run when the content has been moved up.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollUpCb {
-        set { SetScrollUpCb( value); }
+        set { SetScrollUpCb(value); }
     }
     /// <summary>Set the callback to run when the horizontal scrollbar is dragged.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb HbarDragCb {
-        set { SetHbarDragCb( value); }
+        set { SetHbarDragCb(value); }
     }
     /// <summary>Set the callback to run when dragging of the contents has started.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb DragStartCb {
-        set { SetDragStartCb( value); }
+        set { SetDragStartCb(value); }
     }
     /// <summary>Set the callback to run when scrolling of the contents has started.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollStartCb {
-        set { SetScrollStartCb( value); }
+        set { SetScrollStartCb(value); }
     }
     /// <summary>Freeze property</summary>
 /// <value><c>true</c> if freeze, <c>false</c> otherwise</value>
     public bool Freeze {
-        set { SetFreeze( value); }
+        set { SetFreeze(value); }
     }
     /// <summary>When the viewport is resized, the callback is called.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableResizeCb ContentViewportResizeCb {
-        set { SetContentViewportResizeCb( value); }
+        set { SetContentViewportResizeCb(value); }
     }
     /// <summary>Set the callback to run when the content has been moved to the left</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollLeftCb {
-        set { SetScrollLeftCb( value); }
+        set { SetScrollLeftCb(value); }
     }
     /// <summary>Set the callback to run when the vertical scrollbar is pressed.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb VbarPressCb {
-        set { SetVbarPressCb( value); }
+        set { SetVbarPressCb(value); }
     }
     /// <summary>Set the callback to run when the horizontal scrollbar is pressed.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb HbarPressCb {
-        set { SetHbarPressCb( value); }
+        set { SetHbarPressCb(value); }
     }
     /// <summary>Set the callback to run when the horizontal scrollbar is unpressed.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb HbarUnpressCb {
-        set { SetHbarUnpressCb( value); }
+        set { SetHbarUnpressCb(value); }
     }
     /// <summary>Set the callback to run when dragging of the contents has stopped.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb DragStopCb {
-        set { SetDragStopCb( value); }
+        set { SetDragStopCb(value); }
     }
     /// <summary>Set the callback to run when scrolling of the contents has stopped.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollStopCb {
-        set { SetScrollStopCb( value); }
+        set { SetScrollStopCb(value); }
     }
     /// <summary>Extern pan</summary>
 /// <value>Pan object</value>
     public Efl.Canvas.Object ExternPan {
-        set { SetExternPan( value); }
+        set { SetExternPan(value); }
     }
     /// <summary>Set the callback to run when the visible page changes.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb PageChangeCb {
-        set { SetPageChangeCb( value); }
+        set { SetPageChangeCb(value); }
     }
     /// <summary>Hold property</summary>
 /// <value><c>true</c> if hold, <c>false</c> otherwise</value>
     public bool Hold {
-        set { SetHold( value); }
+        set { SetHold(value); }
     }
     /// <summary>Set the callback to run when the scrolling animation has started.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb AnimateStartCb {
-        set { SetAnimateStartCb( value); }
+        set { SetAnimateStartCb(value); }
     }
     /// <summary>Set the callback to run when the content has been moved down.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollDownCb {
-        set { SetScrollDownCb( value); }
+        set { SetScrollDownCb(value); }
     }
     /// <summary>Set the callback to run when the content has been moved.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollCb {
-        set { SetScrollCb( value); }
+        set { SetScrollCb(value); }
     }
     /// <summary>Set the callback to run when the scrolling animation has stopped.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb AnimateStopCb {
-        set { SetAnimateStopCb( value); }
+        set { SetAnimateStopCb(value); }
     }
     /// <summary>set the callback to run on minimal limit content</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableMinLimitCb ContentMinLimitCb {
-        set { SetContentMinLimitCb( value); }
+        set { SetContentMinLimitCb(value); }
     }
     /// <summary>Set the callback to run when the content has been moved to the right.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb ScrollRightCb {
-        set { SetScrollRightCb( value); }
+        set { SetScrollRightCb(value); }
     }
     /// <summary>Content property</summary>
 /// <value>Content object</value>
     public Efl.Canvas.Object ScrollableContent {
-        set { SetScrollableContent( value); }
+        set { SetScrollableContent(value); }
     }
     /// <summary>Set the callback to run when the left edge of the content has been reached.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb EdgeLeftCb {
-        set { SetEdgeLeftCb( value); }
+        set { SetEdgeLeftCb(value); }
     }
     /// <summary>Set the callback to run when the horizontal scrollbar is dragged.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb VbarDragCb {
-        set { SetVbarDragCb( value); }
+        set { SetVbarDragCb(value); }
     }
     /// <summary>Set the callback to run when the horizontal scrollbar is unpressed.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb VbarUnpressCb {
-        set { SetVbarUnpressCb( value); }
+        set { SetVbarUnpressCb(value); }
     }
     /// <summary>Set the callback to run when the bottom edge of the content has been reached.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb EdgeBottomCb {
-        set { SetEdgeBottomCb( value); }
+        set { SetEdgeBottomCb(value); }
     }
     /// <summary>Set the callback to run when the right edge of the content has been reached.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb EdgeRightCb {
-        set { SetEdgeRightCb( value); }
+        set { SetEdgeRightCb(value); }
     }
     /// <summary>Set the callback to run when the top edge of the content has been reached.</summary>
 /// <value>The callback</value>
     public ElmInterfaceScrollableCb EdgeTopCb {
-        set { SetEdgeTopCb( value); }
+        set { SetEdgeTopCb(value); }
     }
     /// <summary>Whether scrolling should loop around.</summary>
 /// <value>True to enable looping.</value>
     public bool ItemLoopEnabled {
         get { return GetItemLoopEnabled(); }
-        set { SetItemLoopEnabled( value); }
+        set { SetItemLoopEnabled(value); }
     }
     /// <summary>The element which is currently focused by this manager
 /// Use this property to retrieve the object currently being focused, or to set the focus to a new one. When <c>focus</c> is a logical child (which cannot receive focus), the next non-logical object is selected instead. If there is no such object, focus does not change.
@@ -2728,7 +2798,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
 /// <value>Currently focused element.</value>
     public Efl.Ui.Focus.IObject ManagerFocus {
         get { return GetManagerFocus(); }
-        set { SetManagerFocus( value); }
+        set { SetManagerFocus(value); }
     }
     /// <summary>Add another manager to serve the move requests.
 /// If this value is set, all move requests are redirected to this manager object. Set it to <c>null</c> once nothing should be redirected anymore.
@@ -2736,7 +2806,7 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
 /// <value>The redirect manager.</value>
     public Efl.Ui.Focus.IManager Redirect {
         get { return GetRedirect(); }
-        set { SetRedirect( value); }
+        set { SetRedirect(value); }
     }
     /// <summary>The list of elements which are at the border of the graph.
 /// This means one of the relations right,left or down,up are not set. This call flushes all changes. See <see cref="Efl.Ui.Focus.IManager.Move"/>
@@ -2751,2742 +2821,4387 @@ private static object DirtyLogicFreezeChangedEvtKey = new object();
 /// <value>Will be registered into this manager object.</value>
     public Efl.Ui.Focus.IObject Root {
         get { return GetRoot(); }
-        set { SetRoot( value); }
+        set { SetRoot(value); }
     }
     private static IntPtr GetEflClassStatic()
     {
         return Elm.IInterfaceScrollableConcrete.elm_interface_scrollable_mixin_get();
     }
-}
-public class IInterfaceScrollableNativeInherit  : Efl.Eo.NativeClass{
-    public  static Efl.Eo.NativeModule _Module = new Efl.Eo.NativeModule(efl.Libs.Elementary);
-    public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type)
-    {
-        var descs = new System.Collections.Generic.List<Efl_Op_Description>();
-        var methods = Efl.Eo.Globals.GetUserMethods(type);
-        if (elm_interface_scrollable_gravity_get_static_delegate == null)
-            elm_interface_scrollable_gravity_get_static_delegate = new elm_interface_scrollable_gravity_get_delegate(gravity_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetGravity") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_gravity_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_gravity_get_static_delegate)});
-        if (elm_interface_scrollable_gravity_set_static_delegate == null)
-            elm_interface_scrollable_gravity_set_static_delegate = new elm_interface_scrollable_gravity_set_delegate(gravity_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetGravity") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_gravity_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_gravity_set_static_delegate)});
-        if (elm_interface_scrollable_bounce_allow_get_static_delegate == null)
-            elm_interface_scrollable_bounce_allow_get_static_delegate = new elm_interface_scrollable_bounce_allow_get_delegate(bounce_allow_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetBounceAllow") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_bounce_allow_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_allow_get_static_delegate)});
-        if (elm_interface_scrollable_bounce_allow_set_static_delegate == null)
-            elm_interface_scrollable_bounce_allow_set_static_delegate = new elm_interface_scrollable_bounce_allow_set_delegate(bounce_allow_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetBounceAllow") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_bounce_allow_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_allow_set_static_delegate)});
-        if (elm_interface_scrollable_wheel_disabled_get_static_delegate == null)
-            elm_interface_scrollable_wheel_disabled_get_static_delegate = new elm_interface_scrollable_wheel_disabled_get_delegate(wheel_disabled_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetWheelDisabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_wheel_disabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_wheel_disabled_get_static_delegate)});
-        if (elm_interface_scrollable_wheel_disabled_set_static_delegate == null)
-            elm_interface_scrollable_wheel_disabled_set_static_delegate = new elm_interface_scrollable_wheel_disabled_set_delegate(wheel_disabled_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetWheelDisabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_wheel_disabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_wheel_disabled_set_static_delegate)});
-        if (elm_interface_scrollable_movement_block_get_static_delegate == null)
-            elm_interface_scrollable_movement_block_get_static_delegate = new elm_interface_scrollable_movement_block_get_delegate(movement_block_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetMovementBlock") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_movement_block_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_movement_block_get_static_delegate)});
-        if (elm_interface_scrollable_movement_block_set_static_delegate == null)
-            elm_interface_scrollable_movement_block_set_static_delegate = new elm_interface_scrollable_movement_block_set_delegate(movement_block_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetMovementBlock") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_movement_block_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_movement_block_set_static_delegate)});
-        if (elm_interface_scrollable_momentum_animator_disabled_get_static_delegate == null)
-            elm_interface_scrollable_momentum_animator_disabled_get_static_delegate = new elm_interface_scrollable_momentum_animator_disabled_get_delegate(momentum_animator_disabled_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetMomentumAnimatorDisabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_momentum_animator_disabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_momentum_animator_disabled_get_static_delegate)});
-        if (elm_interface_scrollable_momentum_animator_disabled_set_static_delegate == null)
-            elm_interface_scrollable_momentum_animator_disabled_set_static_delegate = new elm_interface_scrollable_momentum_animator_disabled_set_delegate(momentum_animator_disabled_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetMomentumAnimatorDisabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_momentum_animator_disabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_momentum_animator_disabled_set_static_delegate)});
-        if (elm_interface_scrollable_policy_get_static_delegate == null)
-            elm_interface_scrollable_policy_get_static_delegate = new elm_interface_scrollable_policy_get_delegate(policy_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetPolicy") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_policy_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_policy_get_static_delegate)});
-        if (elm_interface_scrollable_policy_set_static_delegate == null)
-            elm_interface_scrollable_policy_set_static_delegate = new elm_interface_scrollable_policy_set_delegate(policy_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPolicy") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_policy_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_policy_set_static_delegate)});
-        if (elm_interface_scrollable_content_region_get_static_delegate == null)
-            elm_interface_scrollable_content_region_get_static_delegate = new elm_interface_scrollable_content_region_get_delegate(content_region_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetContentRegion") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_region_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_region_get_static_delegate)});
-        if (elm_interface_scrollable_content_region_set_static_delegate == null)
-            elm_interface_scrollable_content_region_set_static_delegate = new elm_interface_scrollable_content_region_set_delegate(content_region_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetContentRegion") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_region_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_region_set_static_delegate)});
-        if (elm_interface_scrollable_content_events_get_static_delegate == null)
-            elm_interface_scrollable_content_events_get_static_delegate = new elm_interface_scrollable_content_events_get_delegate(content_events_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetContentEvents") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_events_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_events_get_static_delegate)});
-        if (elm_interface_scrollable_content_events_set_static_delegate == null)
-            elm_interface_scrollable_content_events_set_static_delegate = new elm_interface_scrollable_content_events_set_delegate(content_events_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetContentEvents") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_events_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_events_set_static_delegate)});
-        if (elm_interface_scrollable_page_size_get_static_delegate == null)
-            elm_interface_scrollable_page_size_get_static_delegate = new elm_interface_scrollable_page_size_get_delegate(page_size_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetPageSize") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_size_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_size_get_static_delegate)});
-        if (elm_interface_scrollable_page_size_set_static_delegate == null)
-            elm_interface_scrollable_page_size_set_static_delegate = new elm_interface_scrollable_page_size_set_delegate(page_size_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPageSize") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_size_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_size_set_static_delegate)});
-        if (elm_interface_scrollable_bounce_animator_disabled_get_static_delegate == null)
-            elm_interface_scrollable_bounce_animator_disabled_get_static_delegate = new elm_interface_scrollable_bounce_animator_disabled_get_delegate(bounce_animator_disabled_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetBounceAnimatorDisabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_bounce_animator_disabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_animator_disabled_get_static_delegate)});
-        if (elm_interface_scrollable_bounce_animator_disabled_set_static_delegate == null)
-            elm_interface_scrollable_bounce_animator_disabled_set_static_delegate = new elm_interface_scrollable_bounce_animator_disabled_set_delegate(bounce_animator_disabled_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetBounceAnimatorDisabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_bounce_animator_disabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_animator_disabled_set_static_delegate)});
-        if (elm_interface_scrollable_page_scroll_limit_get_static_delegate == null)
-            elm_interface_scrollable_page_scroll_limit_get_static_delegate = new elm_interface_scrollable_page_scroll_limit_get_delegate(page_scroll_limit_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetPageScrollLimit") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_scroll_limit_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_scroll_limit_get_static_delegate)});
-        if (elm_interface_scrollable_page_scroll_limit_set_static_delegate == null)
-            elm_interface_scrollable_page_scroll_limit_set_static_delegate = new elm_interface_scrollable_page_scroll_limit_set_delegate(page_scroll_limit_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPageScrollLimit") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_scroll_limit_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_scroll_limit_set_static_delegate)});
-        if (elm_interface_scrollable_page_snap_allow_get_static_delegate == null)
-            elm_interface_scrollable_page_snap_allow_get_static_delegate = new elm_interface_scrollable_page_snap_allow_get_delegate(page_snap_allow_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetPageSnapAllow") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_snap_allow_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_snap_allow_get_static_delegate)});
-        if (elm_interface_scrollable_page_snap_allow_set_static_delegate == null)
-            elm_interface_scrollable_page_snap_allow_set_static_delegate = new elm_interface_scrollable_page_snap_allow_set_delegate(page_snap_allow_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPageSnapAllow") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_snap_allow_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_snap_allow_set_static_delegate)});
-        if (elm_interface_scrollable_paging_get_static_delegate == null)
-            elm_interface_scrollable_paging_get_static_delegate = new elm_interface_scrollable_paging_get_delegate(paging_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetPaging") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_paging_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_paging_get_static_delegate)});
-        if (elm_interface_scrollable_paging_set_static_delegate == null)
-            elm_interface_scrollable_paging_set_static_delegate = new elm_interface_scrollable_paging_set_delegate(paging_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPaging") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_paging_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_paging_set_static_delegate)});
-        if (elm_interface_scrollable_single_direction_get_static_delegate == null)
-            elm_interface_scrollable_single_direction_get_static_delegate = new elm_interface_scrollable_single_direction_get_delegate(single_direction_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetSingleDirection") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_single_direction_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_single_direction_get_static_delegate)});
-        if (elm_interface_scrollable_single_direction_set_static_delegate == null)
-            elm_interface_scrollable_single_direction_set_static_delegate = new elm_interface_scrollable_single_direction_set_delegate(single_direction_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetSingleDirection") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_single_direction_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_single_direction_set_static_delegate)});
-        if (elm_interface_scrollable_step_size_get_static_delegate == null)
-            elm_interface_scrollable_step_size_get_static_delegate = new elm_interface_scrollable_step_size_get_delegate(step_size_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetStepSize") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_step_size_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_step_size_get_static_delegate)});
-        if (elm_interface_scrollable_step_size_set_static_delegate == null)
-            elm_interface_scrollable_step_size_set_static_delegate = new elm_interface_scrollable_step_size_set_delegate(step_size_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetStepSize") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_step_size_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_step_size_set_static_delegate)});
-        if (elm_interface_scrollable_content_loop_get_static_delegate == null)
-            elm_interface_scrollable_content_loop_get_static_delegate = new elm_interface_scrollable_content_loop_get_delegate(content_loop_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetContentLoop") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_loop_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_loop_get_static_delegate)});
-        if (elm_interface_scrollable_content_loop_set_static_delegate == null)
-            elm_interface_scrollable_content_loop_set_static_delegate = new elm_interface_scrollable_content_loop_set_delegate(content_loop_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetContentLoop") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_loop_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_loop_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_up_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_up_cb_set_static_delegate = new elm_interface_scrollable_scroll_up_cb_set_delegate(scroll_up_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollUpCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_up_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_up_cb_set_static_delegate)});
-        if (elm_interface_scrollable_hbar_drag_cb_set_static_delegate == null)
-            elm_interface_scrollable_hbar_drag_cb_set_static_delegate = new elm_interface_scrollable_hbar_drag_cb_set_delegate(hbar_drag_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetHbarDragCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_hbar_drag_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hbar_drag_cb_set_static_delegate)});
-        if (elm_interface_scrollable_drag_start_cb_set_static_delegate == null)
-            elm_interface_scrollable_drag_start_cb_set_static_delegate = new elm_interface_scrollable_drag_start_cb_set_delegate(drag_start_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetDragStartCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_drag_start_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_drag_start_cb_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_start_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_start_cb_set_static_delegate = new elm_interface_scrollable_scroll_start_cb_set_delegate(scroll_start_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollStartCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_start_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_start_cb_set_static_delegate)});
-        if (elm_interface_scrollable_freeze_set_static_delegate == null)
-            elm_interface_scrollable_freeze_set_static_delegate = new elm_interface_scrollable_freeze_set_delegate(freeze_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetFreeze") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_freeze_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_freeze_set_static_delegate)});
-        if (elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate == null)
-            elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate = new elm_interface_scrollable_content_viewport_resize_cb_set_delegate(content_viewport_resize_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetContentViewportResizeCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_viewport_resize_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_left_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_left_cb_set_static_delegate = new elm_interface_scrollable_scroll_left_cb_set_delegate(scroll_left_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollLeftCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_left_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_left_cb_set_static_delegate)});
-        if (elm_interface_scrollable_vbar_press_cb_set_static_delegate == null)
-            elm_interface_scrollable_vbar_press_cb_set_static_delegate = new elm_interface_scrollable_vbar_press_cb_set_delegate(vbar_press_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetVbarPressCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_vbar_press_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_vbar_press_cb_set_static_delegate)});
-        if (elm_interface_scrollable_hbar_press_cb_set_static_delegate == null)
-            elm_interface_scrollable_hbar_press_cb_set_static_delegate = new elm_interface_scrollable_hbar_press_cb_set_delegate(hbar_press_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetHbarPressCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_hbar_press_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hbar_press_cb_set_static_delegate)});
-        if (elm_interface_scrollable_hbar_unpress_cb_set_static_delegate == null)
-            elm_interface_scrollable_hbar_unpress_cb_set_static_delegate = new elm_interface_scrollable_hbar_unpress_cb_set_delegate(hbar_unpress_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetHbarUnpressCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_hbar_unpress_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hbar_unpress_cb_set_static_delegate)});
-        if (elm_interface_scrollable_drag_stop_cb_set_static_delegate == null)
-            elm_interface_scrollable_drag_stop_cb_set_static_delegate = new elm_interface_scrollable_drag_stop_cb_set_delegate(drag_stop_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetDragStopCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_drag_stop_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_drag_stop_cb_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_stop_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_stop_cb_set_static_delegate = new elm_interface_scrollable_scroll_stop_cb_set_delegate(scroll_stop_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollStopCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_stop_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_stop_cb_set_static_delegate)});
-        if (elm_interface_scrollable_extern_pan_set_static_delegate == null)
-            elm_interface_scrollable_extern_pan_set_static_delegate = new elm_interface_scrollable_extern_pan_set_delegate(extern_pan_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetExternPan") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_extern_pan_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_extern_pan_set_static_delegate)});
-        if (elm_interface_scrollable_page_change_cb_set_static_delegate == null)
-            elm_interface_scrollable_page_change_cb_set_static_delegate = new elm_interface_scrollable_page_change_cb_set_delegate(page_change_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPageChangeCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_change_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_change_cb_set_static_delegate)});
-        if (elm_interface_scrollable_hold_set_static_delegate == null)
-            elm_interface_scrollable_hold_set_static_delegate = new elm_interface_scrollable_hold_set_delegate(hold_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetHold") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_hold_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hold_set_static_delegate)});
-        if (elm_interface_scrollable_animate_start_cb_set_static_delegate == null)
-            elm_interface_scrollable_animate_start_cb_set_static_delegate = new elm_interface_scrollable_animate_start_cb_set_delegate(animate_start_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetAnimateStartCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_animate_start_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_animate_start_cb_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_down_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_down_cb_set_static_delegate = new elm_interface_scrollable_scroll_down_cb_set_delegate(scroll_down_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollDownCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_down_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_down_cb_set_static_delegate)});
-        if (elm_interface_scrollable_page_relative_set_static_delegate == null)
-            elm_interface_scrollable_page_relative_set_static_delegate = new elm_interface_scrollable_page_relative_set_delegate(page_relative_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetPageRelative") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_relative_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_relative_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_cb_set_static_delegate = new elm_interface_scrollable_scroll_cb_set_delegate(scroll_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_cb_set_static_delegate)});
-        if (elm_interface_scrollable_animate_stop_cb_set_static_delegate == null)
-            elm_interface_scrollable_animate_stop_cb_set_static_delegate = new elm_interface_scrollable_animate_stop_cb_set_delegate(animate_stop_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetAnimateStopCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_animate_stop_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_animate_stop_cb_set_static_delegate)});
-        if (elm_interface_scrollable_content_min_limit_cb_set_static_delegate == null)
-            elm_interface_scrollable_content_min_limit_cb_set_static_delegate = new elm_interface_scrollable_content_min_limit_cb_set_delegate(content_min_limit_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetContentMinLimitCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_min_limit_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_min_limit_cb_set_static_delegate)});
-        if (elm_interface_scrollable_scroll_right_cb_set_static_delegate == null)
-            elm_interface_scrollable_scroll_right_cb_set_static_delegate = new elm_interface_scrollable_scroll_right_cb_set_delegate(scroll_right_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollRightCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_scroll_right_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_right_cb_set_static_delegate)});
-        if (elm_interface_scrollable_content_set_static_delegate == null)
-            elm_interface_scrollable_content_set_static_delegate = new elm_interface_scrollable_content_set_delegate(scrollable_content_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetScrollableContent") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_set_static_delegate)});
-        if (elm_interface_scrollable_edge_left_cb_set_static_delegate == null)
-            elm_interface_scrollable_edge_left_cb_set_static_delegate = new elm_interface_scrollable_edge_left_cb_set_delegate(edge_left_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetEdgeLeftCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_edge_left_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_left_cb_set_static_delegate)});
-        if (elm_interface_scrollable_vbar_drag_cb_set_static_delegate == null)
-            elm_interface_scrollable_vbar_drag_cb_set_static_delegate = new elm_interface_scrollable_vbar_drag_cb_set_delegate(vbar_drag_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetVbarDragCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_vbar_drag_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_vbar_drag_cb_set_static_delegate)});
-        if (elm_interface_scrollable_vbar_unpress_cb_set_static_delegate == null)
-            elm_interface_scrollable_vbar_unpress_cb_set_static_delegate = new elm_interface_scrollable_vbar_unpress_cb_set_delegate(vbar_unpress_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetVbarUnpressCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_vbar_unpress_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_vbar_unpress_cb_set_static_delegate)});
-        if (elm_interface_scrollable_edge_bottom_cb_set_static_delegate == null)
-            elm_interface_scrollable_edge_bottom_cb_set_static_delegate = new elm_interface_scrollable_edge_bottom_cb_set_delegate(edge_bottom_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetEdgeBottomCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_edge_bottom_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_bottom_cb_set_static_delegate)});
-        if (elm_interface_scrollable_edge_right_cb_set_static_delegate == null)
-            elm_interface_scrollable_edge_right_cb_set_static_delegate = new elm_interface_scrollable_edge_right_cb_set_delegate(edge_right_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetEdgeRightCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_edge_right_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_right_cb_set_static_delegate)});
-        if (elm_interface_scrollable_edge_top_cb_set_static_delegate == null)
-            elm_interface_scrollable_edge_top_cb_set_static_delegate = new elm_interface_scrollable_edge_top_cb_set_delegate(edge_top_cb_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetEdgeTopCb") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_edge_top_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_top_cb_set_static_delegate)});
-        if (elm_interface_scrollable_objects_set_static_delegate == null)
-            elm_interface_scrollable_objects_set_static_delegate = new elm_interface_scrollable_objects_set_delegate(objects_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetObjects") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_objects_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_objects_set_static_delegate)});
-        if (elm_interface_scrollable_last_page_get_static_delegate == null)
-            elm_interface_scrollable_last_page_get_static_delegate = new elm_interface_scrollable_last_page_get_delegate(last_page_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetLastPage") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_last_page_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_last_page_get_static_delegate)});
-        if (elm_interface_scrollable_current_page_get_static_delegate == null)
-            elm_interface_scrollable_current_page_get_static_delegate = new elm_interface_scrollable_current_page_get_delegate(current_page_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetCurrentPage") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_current_page_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_current_page_get_static_delegate)});
-        if (elm_interface_scrollable_content_viewport_geometry_get_static_delegate == null)
-            elm_interface_scrollable_content_viewport_geometry_get_static_delegate = new elm_interface_scrollable_content_viewport_geometry_get_delegate(content_viewport_geometry_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetContentViewportGeometry") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_viewport_geometry_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_viewport_geometry_get_static_delegate)});
-        if (elm_interface_scrollable_content_size_get_static_delegate == null)
-            elm_interface_scrollable_content_size_get_static_delegate = new elm_interface_scrollable_content_size_get_delegate(content_size_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetContentSize") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_size_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_size_get_static_delegate)});
-        if (elm_interface_scrollable_item_loop_enabled_get_static_delegate == null)
-            elm_interface_scrollable_item_loop_enabled_get_static_delegate = new elm_interface_scrollable_item_loop_enabled_get_delegate(item_loop_enabled_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetItemLoopEnabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_item_loop_enabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_item_loop_enabled_get_static_delegate)});
-        if (elm_interface_scrollable_item_loop_enabled_set_static_delegate == null)
-            elm_interface_scrollable_item_loop_enabled_set_static_delegate = new elm_interface_scrollable_item_loop_enabled_set_delegate(item_loop_enabled_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetItemLoopEnabled") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_item_loop_enabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_item_loop_enabled_set_static_delegate)});
-        if (elm_interface_scrollable_content_pos_set_static_delegate == null)
-            elm_interface_scrollable_content_pos_set_static_delegate = new elm_interface_scrollable_content_pos_set_delegate(content_pos_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetContentPos") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_pos_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_pos_set_static_delegate)});
-        if (elm_interface_scrollable_content_pos_get_static_delegate == null)
-            elm_interface_scrollable_content_pos_get_static_delegate = new elm_interface_scrollable_content_pos_get_delegate(content_pos_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetContentPos") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_pos_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_pos_get_static_delegate)});
-        if (elm_interface_scrollable_page_show_static_delegate == null)
-            elm_interface_scrollable_page_show_static_delegate = new elm_interface_scrollable_page_show_delegate(page_show);
-        if (methods.FirstOrDefault(m => m.Name == "ShowPage") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_show"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_show_static_delegate)});
-        if (elm_interface_scrollable_region_bring_in_static_delegate == null)
-            elm_interface_scrollable_region_bring_in_static_delegate = new elm_interface_scrollable_region_bring_in_delegate(region_bring_in);
-        if (methods.FirstOrDefault(m => m.Name == "RegionBringIn") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_region_bring_in"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_region_bring_in_static_delegate)});
-        if (elm_interface_scrollable_page_bring_in_static_delegate == null)
-            elm_interface_scrollable_page_bring_in_static_delegate = new elm_interface_scrollable_page_bring_in_delegate(page_bring_in);
-        if (methods.FirstOrDefault(m => m.Name == "PageBringIn") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_page_bring_in"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_bring_in_static_delegate)});
-        if (elm_interface_scrollable_content_region_show_static_delegate == null)
-            elm_interface_scrollable_content_region_show_static_delegate = new elm_interface_scrollable_content_region_show_delegate(content_region_show);
-        if (methods.FirstOrDefault(m => m.Name == "ShowContentRegion") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_region_show"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_region_show_static_delegate)});
-        if (elm_interface_scrollable_content_min_limit_static_delegate == null)
-            elm_interface_scrollable_content_min_limit_static_delegate = new elm_interface_scrollable_content_min_limit_delegate(content_min_limit);
-        if (methods.FirstOrDefault(m => m.Name == "ContentMinLimit") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_content_min_limit"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_min_limit_static_delegate)});
-        if (elm_interface_scrollable_wanted_region_set_static_delegate == null)
-            elm_interface_scrollable_wanted_region_set_static_delegate = new elm_interface_scrollable_wanted_region_set_delegate(wanted_region_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetWantedRegion") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_wanted_region_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_wanted_region_set_static_delegate)});
-        if (elm_interface_scrollable_custom_pan_pos_adjust_static_delegate == null)
-            elm_interface_scrollable_custom_pan_pos_adjust_static_delegate = new elm_interface_scrollable_custom_pan_pos_adjust_delegate(custom_pan_pos_adjust);
-        if (methods.FirstOrDefault(m => m.Name == "CustomPanPosAdjust") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "elm_interface_scrollable_custom_pan_pos_adjust"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_custom_pan_pos_adjust_static_delegate)});
-        if (efl_ui_widget_focus_manager_create_static_delegate == null)
-            efl_ui_widget_focus_manager_create_static_delegate = new efl_ui_widget_focus_manager_create_delegate(focus_manager_create);
-        if (methods.FirstOrDefault(m => m.Name == "FocusManagerCreate") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_widget_focus_manager_create"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_widget_focus_manager_create_static_delegate)});
-        if (efl_ui_focus_manager_focus_get_static_delegate == null)
-            efl_ui_focus_manager_focus_get_static_delegate = new efl_ui_focus_manager_focus_get_delegate(manager_focus_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetManagerFocus") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_focus_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_focus_get_static_delegate)});
-        if (efl_ui_focus_manager_focus_set_static_delegate == null)
-            efl_ui_focus_manager_focus_set_static_delegate = new efl_ui_focus_manager_focus_set_delegate(manager_focus_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetManagerFocus") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_focus_set"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_focus_set_static_delegate)});
-        if (efl_ui_focus_manager_redirect_get_static_delegate == null)
-            efl_ui_focus_manager_redirect_get_static_delegate = new efl_ui_focus_manager_redirect_get_delegate(redirect_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetRedirect") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_redirect_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_redirect_get_static_delegate)});
-        if (efl_ui_focus_manager_redirect_set_static_delegate == null)
-            efl_ui_focus_manager_redirect_set_static_delegate = new efl_ui_focus_manager_redirect_set_delegate(redirect_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetRedirect") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_redirect_set"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_redirect_set_static_delegate)});
-        if (efl_ui_focus_manager_border_elements_get_static_delegate == null)
-            efl_ui_focus_manager_border_elements_get_static_delegate = new efl_ui_focus_manager_border_elements_get_delegate(border_elements_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetBorderElements") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_border_elements_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_border_elements_get_static_delegate)});
-        if (efl_ui_focus_manager_viewport_elements_get_static_delegate == null)
-            efl_ui_focus_manager_viewport_elements_get_static_delegate = new efl_ui_focus_manager_viewport_elements_get_delegate(viewport_elements_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetViewportElements") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_viewport_elements_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_viewport_elements_get_static_delegate)});
-        if (efl_ui_focus_manager_root_get_static_delegate == null)
-            efl_ui_focus_manager_root_get_static_delegate = new efl_ui_focus_manager_root_get_delegate(root_get);
-        if (methods.FirstOrDefault(m => m.Name == "GetRoot") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_root_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_root_get_static_delegate)});
-        if (efl_ui_focus_manager_root_set_static_delegate == null)
-            efl_ui_focus_manager_root_set_static_delegate = new efl_ui_focus_manager_root_set_delegate(root_set);
-        if (methods.FirstOrDefault(m => m.Name == "SetRoot") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_root_set"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_root_set_static_delegate)});
-        if (efl_ui_focus_manager_move_static_delegate == null)
-            efl_ui_focus_manager_move_static_delegate = new efl_ui_focus_manager_move_delegate(move);
-        if (methods.FirstOrDefault(m => m.Name == "Move") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_move"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_move_static_delegate)});
-        if (efl_ui_focus_manager_request_move_static_delegate == null)
-            efl_ui_focus_manager_request_move_static_delegate = new efl_ui_focus_manager_request_move_delegate(request_move);
-        if (methods.FirstOrDefault(m => m.Name == "MoveRequest") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_request_move"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_request_move_static_delegate)});
-        if (efl_ui_focus_manager_request_subchild_static_delegate == null)
-            efl_ui_focus_manager_request_subchild_static_delegate = new efl_ui_focus_manager_request_subchild_delegate(request_subchild);
-        if (methods.FirstOrDefault(m => m.Name == "RequestSubchild") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_request_subchild"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_request_subchild_static_delegate)});
-        if (efl_ui_focus_manager_fetch_static_delegate == null)
-            efl_ui_focus_manager_fetch_static_delegate = new efl_ui_focus_manager_fetch_delegate(fetch);
-        if (methods.FirstOrDefault(m => m.Name == "Fetch") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_fetch"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_fetch_static_delegate)});
-        if (efl_ui_focus_manager_logical_end_static_delegate == null)
-            efl_ui_focus_manager_logical_end_static_delegate = new efl_ui_focus_manager_logical_end_delegate(logical_end);
-        if (methods.FirstOrDefault(m => m.Name == "LogicalEnd") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_logical_end"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_logical_end_static_delegate)});
-        if (efl_ui_focus_manager_reset_history_static_delegate == null)
-            efl_ui_focus_manager_reset_history_static_delegate = new efl_ui_focus_manager_reset_history_delegate(reset_history);
-        if (methods.FirstOrDefault(m => m.Name == "ResetHistory") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_reset_history"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_reset_history_static_delegate)});
-        if (efl_ui_focus_manager_pop_history_stack_static_delegate == null)
-            efl_ui_focus_manager_pop_history_stack_static_delegate = new efl_ui_focus_manager_pop_history_stack_delegate(pop_history_stack);
-        if (methods.FirstOrDefault(m => m.Name == "PopHistoryStack") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_pop_history_stack"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_pop_history_stack_static_delegate)});
-        if (efl_ui_focus_manager_setup_on_first_touch_static_delegate == null)
-            efl_ui_focus_manager_setup_on_first_touch_static_delegate = new efl_ui_focus_manager_setup_on_first_touch_delegate(setup_on_first_touch);
-        if (methods.FirstOrDefault(m => m.Name == "SetupOnFirstTouch") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_setup_on_first_touch"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_setup_on_first_touch_static_delegate)});
-        if (efl_ui_focus_manager_dirty_logic_freeze_static_delegate == null)
-            efl_ui_focus_manager_dirty_logic_freeze_static_delegate = new efl_ui_focus_manager_dirty_logic_freeze_delegate(dirty_logic_freeze);
-        if (methods.FirstOrDefault(m => m.Name == "FreezeDirtyLogic") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_dirty_logic_freeze"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_dirty_logic_freeze_static_delegate)});
-        if (efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate == null)
-            efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate = new efl_ui_focus_manager_dirty_logic_unfreeze_delegate(dirty_logic_unfreeze);
-        if (methods.FirstOrDefault(m => m.Name == "DirtyLogicUnfreeze") != null)
-            descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(_Module.Module, "efl_ui_focus_manager_dirty_logic_unfreeze"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate)});
-        return descs;
-    }
-    public override IntPtr GetEflClass()
-    {
-        return Elm.IInterfaceScrollableConcrete.elm_interface_scrollable_mixin_get();
-    }
-    public static  IntPtr GetEflClassStatic()
+    /// <summary>Wrapper for native methods and virtual method delegates.
+    /// For internal use by generated code only.</summary>
+    public class NativeMethods  : Efl.Eo.NativeClass
     {
-        return Elm.IInterfaceScrollableConcrete.elm_interface_scrollable_mixin_get();
-    }
+        private static Efl.Eo.NativeModule Module = new Efl.Eo.NativeModule(    efl.Libs.Elementary);
+        /// <summary>Gets the list of Eo operations to override.</summary>
+        /// <returns>The list of Eo operations to be overload.</returns>
+        public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type)
+        {
+            var descs = new System.Collections.Generic.List<Efl_Op_Description>();
+            var methods = Efl.Eo.Globals.GetUserMethods(type);
 
+            if (elm_interface_scrollable_gravity_get_static_delegate == null)
+            {
+                elm_interface_scrollable_gravity_get_static_delegate = new elm_interface_scrollable_gravity_get_delegate(gravity_get);
+            }
 
-     private delegate void elm_interface_scrollable_gravity_get_delegate(System.IntPtr obj, System.IntPtr pd,   out double x,   out double y);
+            if (methods.FirstOrDefault(m => m.Name == "GetGravity") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_gravity_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_gravity_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_gravity_set_static_delegate == null)
+            {
+                elm_interface_scrollable_gravity_set_static_delegate = new elm_interface_scrollable_gravity_set_delegate(gravity_set);
+            }
 
-     public delegate void elm_interface_scrollable_gravity_get_api_delegate(System.IntPtr obj,   out double x,   out double y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_get_api_delegate> elm_interface_scrollable_gravity_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_get_api_delegate>(_Module, "elm_interface_scrollable_gravity_get");
-     private static void gravity_get(System.IntPtr obj, System.IntPtr pd,  out double x,  out double y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_gravity_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    x = default(double);        y = default(double);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetGravity( out x,  out y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetGravity") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_gravity_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_gravity_set_static_delegate) });
             }
-                                                } else {
-            elm_interface_scrollable_gravity_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out x,  out y);
-        }
-    }
-    private static elm_interface_scrollable_gravity_get_delegate elm_interface_scrollable_gravity_get_static_delegate;
 
+            if (elm_interface_scrollable_bounce_allow_get_static_delegate == null)
+            {
+                elm_interface_scrollable_bounce_allow_get_static_delegate = new elm_interface_scrollable_bounce_allow_get_delegate(bounce_allow_get);
+            }
 
-     private delegate void elm_interface_scrollable_gravity_set_delegate(System.IntPtr obj, System.IntPtr pd,   double x,   double y);
+            if (methods.FirstOrDefault(m => m.Name == "GetBounceAllow") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_bounce_allow_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_allow_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_bounce_allow_set_static_delegate == null)
+            {
+                elm_interface_scrollable_bounce_allow_set_static_delegate = new elm_interface_scrollable_bounce_allow_set_delegate(bounce_allow_set);
+            }
 
-     public delegate void elm_interface_scrollable_gravity_set_api_delegate(System.IntPtr obj,   double x,   double y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_set_api_delegate> elm_interface_scrollable_gravity_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_set_api_delegate>(_Module, "elm_interface_scrollable_gravity_set");
-     private static void gravity_set(System.IntPtr obj, System.IntPtr pd,  double x,  double y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_gravity_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetGravity( x,  y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetBounceAllow") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_bounce_allow_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_allow_set_static_delegate) });
             }
-                                                } else {
-            elm_interface_scrollable_gravity_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y);
-        }
-    }
-    private static elm_interface_scrollable_gravity_set_delegate elm_interface_scrollable_gravity_set_static_delegate;
 
+            if (elm_interface_scrollable_wheel_disabled_get_static_delegate == null)
+            {
+                elm_interface_scrollable_wheel_disabled_get_static_delegate = new elm_interface_scrollable_wheel_disabled_get_delegate(wheel_disabled_get);
+            }
 
-     private delegate void elm_interface_scrollable_bounce_allow_get_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  out bool horiz,  [MarshalAs(UnmanagedType.U1)]  out bool vert);
+            if (methods.FirstOrDefault(m => m.Name == "GetWheelDisabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_wheel_disabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_wheel_disabled_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_wheel_disabled_set_static_delegate == null)
+            {
+                elm_interface_scrollable_wheel_disabled_set_static_delegate = new elm_interface_scrollable_wheel_disabled_set_delegate(wheel_disabled_set);
+            }
 
-     public delegate void elm_interface_scrollable_bounce_allow_get_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  out bool horiz,  [MarshalAs(UnmanagedType.U1)]  out bool vert);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_get_api_delegate> elm_interface_scrollable_bounce_allow_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_get_api_delegate>(_Module, "elm_interface_scrollable_bounce_allow_get");
-     private static void bounce_allow_get(System.IntPtr obj, System.IntPtr pd,  out bool horiz,  out bool vert)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_bounce_allow_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    horiz = default(bool);        vert = default(bool);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetBounceAllow( out horiz,  out vert);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetWheelDisabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_wheel_disabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_wheel_disabled_set_static_delegate) });
             }
-                                                } else {
-            elm_interface_scrollable_bounce_allow_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out horiz,  out vert);
-        }
-    }
-    private static elm_interface_scrollable_bounce_allow_get_delegate elm_interface_scrollable_bounce_allow_get_static_delegate;
 
+            if (elm_interface_scrollable_movement_block_get_static_delegate == null)
+            {
+                elm_interface_scrollable_movement_block_get_static_delegate = new elm_interface_scrollable_movement_block_get_delegate(movement_block_get);
+            }
 
-     private delegate void elm_interface_scrollable_bounce_allow_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool horiz,  [MarshalAs(UnmanagedType.U1)]  bool vert);
+            if (methods.FirstOrDefault(m => m.Name == "GetMovementBlock") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_movement_block_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_movement_block_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_movement_block_set_static_delegate == null)
+            {
+                elm_interface_scrollable_movement_block_set_static_delegate = new elm_interface_scrollable_movement_block_set_delegate(movement_block_set);
+            }
 
-     public delegate void elm_interface_scrollable_bounce_allow_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool horiz,  [MarshalAs(UnmanagedType.U1)]  bool vert);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_set_api_delegate> elm_interface_scrollable_bounce_allow_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_set_api_delegate>(_Module, "elm_interface_scrollable_bounce_allow_set");
-     private static void bounce_allow_set(System.IntPtr obj, System.IntPtr pd,  bool horiz,  bool vert)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_bounce_allow_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetBounceAllow( horiz,  vert);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetMovementBlock") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_movement_block_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_movement_block_set_static_delegate) });
             }
-                                                } else {
-            elm_interface_scrollable_bounce_allow_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  horiz,  vert);
-        }
-    }
-    private static elm_interface_scrollable_bounce_allow_set_delegate elm_interface_scrollable_bounce_allow_set_static_delegate;
 
+            if (elm_interface_scrollable_momentum_animator_disabled_get_static_delegate == null)
+            {
+                elm_interface_scrollable_momentum_animator_disabled_get_static_delegate = new elm_interface_scrollable_momentum_animator_disabled_get_delegate(momentum_animator_disabled_get);
+            }
 
-     [return: MarshalAs(UnmanagedType.U1)] private delegate bool elm_interface_scrollable_wheel_disabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
+            if (methods.FirstOrDefault(m => m.Name == "GetMomentumAnimatorDisabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_momentum_animator_disabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_momentum_animator_disabled_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_momentum_animator_disabled_set_static_delegate == null)
+            {
+                elm_interface_scrollable_momentum_animator_disabled_set_static_delegate = new elm_interface_scrollable_momentum_animator_disabled_set_delegate(momentum_animator_disabled_set);
+            }
 
-     [return: MarshalAs(UnmanagedType.U1)] public delegate bool elm_interface_scrollable_wheel_disabled_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_get_api_delegate> elm_interface_scrollable_wheel_disabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_get_api_delegate>(_Module, "elm_interface_scrollable_wheel_disabled_get");
-     private static bool wheel_disabled_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_wheel_disabled_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        bool _ret_var = default(bool);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetWheelDisabled();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetMomentumAnimatorDisabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_momentum_animator_disabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_momentum_animator_disabled_set_static_delegate) });
             }
-        return _ret_var;
-        } else {
-            return elm_interface_scrollable_wheel_disabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
-        }
-    }
-    private static elm_interface_scrollable_wheel_disabled_get_delegate elm_interface_scrollable_wheel_disabled_get_static_delegate;
 
+            if (elm_interface_scrollable_policy_get_static_delegate == null)
+            {
+                elm_interface_scrollable_policy_get_static_delegate = new elm_interface_scrollable_policy_get_delegate(policy_get);
+            }
 
-     private delegate void elm_interface_scrollable_wheel_disabled_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool disabled);
+            if (methods.FirstOrDefault(m => m.Name == "GetPolicy") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_policy_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_policy_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_policy_set_static_delegate == null)
+            {
+                elm_interface_scrollable_policy_set_static_delegate = new elm_interface_scrollable_policy_set_delegate(policy_set);
+            }
 
-     public delegate void elm_interface_scrollable_wheel_disabled_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool disabled);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_set_api_delegate> elm_interface_scrollable_wheel_disabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_set_api_delegate>(_Module, "elm_interface_scrollable_wheel_disabled_set");
-     private static void wheel_disabled_set(System.IntPtr obj, System.IntPtr pd,  bool disabled)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_wheel_disabled_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetWheelDisabled( disabled);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetPolicy") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_policy_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_policy_set_static_delegate) });
             }
-                                } else {
-            elm_interface_scrollable_wheel_disabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  disabled);
-        }
-    }
-    private static elm_interface_scrollable_wheel_disabled_set_delegate elm_interface_scrollable_wheel_disabled_set_static_delegate;
 
+            if (elm_interface_scrollable_content_region_get_static_delegate == null)
+            {
+                elm_interface_scrollable_content_region_get_static_delegate = new elm_interface_scrollable_content_region_get_delegate(content_region_get);
+            }
 
-     private delegate Efl.Ui.ScrollBlock elm_interface_scrollable_movement_block_get_delegate(System.IntPtr obj, System.IntPtr pd);
+            if (methods.FirstOrDefault(m => m.Name == "GetContentRegion") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_region_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_region_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_content_region_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_region_set_static_delegate = new elm_interface_scrollable_content_region_set_delegate(content_region_set);
+            }
 
-     public delegate Efl.Ui.ScrollBlock elm_interface_scrollable_movement_block_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_get_api_delegate> elm_interface_scrollable_movement_block_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_get_api_delegate>(_Module, "elm_interface_scrollable_movement_block_get");
-     private static Efl.Ui.ScrollBlock movement_block_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_movement_block_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Efl.Ui.ScrollBlock _ret_var = default(Efl.Ui.ScrollBlock);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetMovementBlock();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetContentRegion") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_region_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_region_set_static_delegate) });
             }
-        return _ret_var;
-        } else {
-            return elm_interface_scrollable_movement_block_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
-        }
-    }
-    private static elm_interface_scrollable_movement_block_get_delegate elm_interface_scrollable_movement_block_get_static_delegate;
 
+            if (elm_interface_scrollable_content_events_get_static_delegate == null)
+            {
+                elm_interface_scrollable_content_events_get_static_delegate = new elm_interface_scrollable_content_events_get_delegate(content_events_get);
+            }
 
-     private delegate void elm_interface_scrollable_movement_block_set_delegate(System.IntPtr obj, System.IntPtr pd,   Efl.Ui.ScrollBlock block);
+            if (methods.FirstOrDefault(m => m.Name == "GetContentEvents") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_events_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_events_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_content_events_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_events_set_static_delegate = new elm_interface_scrollable_content_events_set_delegate(content_events_set);
+            }
 
-     public delegate void elm_interface_scrollable_movement_block_set_api_delegate(System.IntPtr obj,   Efl.Ui.ScrollBlock block);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_set_api_delegate> elm_interface_scrollable_movement_block_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_set_api_delegate>(_Module, "elm_interface_scrollable_movement_block_set");
-     private static void movement_block_set(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.ScrollBlock block)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_movement_block_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetMovementBlock( block);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetContentEvents") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_events_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_events_set_static_delegate) });
             }
-                                } else {
-            elm_interface_scrollable_movement_block_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  block);
-        }
-    }
-    private static elm_interface_scrollable_movement_block_set_delegate elm_interface_scrollable_movement_block_set_static_delegate;
 
+            if (elm_interface_scrollable_page_size_get_static_delegate == null)
+            {
+                elm_interface_scrollable_page_size_get_static_delegate = new elm_interface_scrollable_page_size_get_delegate(page_size_get);
+            }
 
-     [return: MarshalAs(UnmanagedType.U1)] private delegate bool elm_interface_scrollable_momentum_animator_disabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
+            if (methods.FirstOrDefault(m => m.Name == "GetPageSize") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_size_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_size_get_static_delegate) });
+            }
 
+            if (elm_interface_scrollable_page_size_set_static_delegate == null)
+            {
+                elm_interface_scrollable_page_size_set_static_delegate = new elm_interface_scrollable_page_size_set_delegate(page_size_set);
+            }
 
-     [return: MarshalAs(UnmanagedType.U1)] public delegate bool elm_interface_scrollable_momentum_animator_disabled_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_get_api_delegate> elm_interface_scrollable_momentum_animator_disabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_get_api_delegate>(_Module, "elm_interface_scrollable_momentum_animator_disabled_get");
-     private static bool momentum_animator_disabled_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_momentum_animator_disabled_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        bool _ret_var = default(bool);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetMomentumAnimatorDisabled();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+            if (methods.FirstOrDefault(m => m.Name == "SetPageSize") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_size_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_size_set_static_delegate) });
             }
+
+            if (elm_interface_scrollable_bounce_animator_disabled_get_static_delegate == null)
+            {
+                elm_interface_scrollable_bounce_animator_disabled_get_static_delegate = new elm_interface_scrollable_bounce_animator_disabled_get_delegate(bounce_animator_disabled_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetBounceAnimatorDisabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_bounce_animator_disabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_animator_disabled_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_bounce_animator_disabled_set_static_delegate == null)
+            {
+                elm_interface_scrollable_bounce_animator_disabled_set_static_delegate = new elm_interface_scrollable_bounce_animator_disabled_set_delegate(bounce_animator_disabled_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetBounceAnimatorDisabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_bounce_animator_disabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_bounce_animator_disabled_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_scroll_limit_get_static_delegate == null)
+            {
+                elm_interface_scrollable_page_scroll_limit_get_static_delegate = new elm_interface_scrollable_page_scroll_limit_get_delegate(page_scroll_limit_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetPageScrollLimit") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_scroll_limit_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_scroll_limit_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_scroll_limit_set_static_delegate == null)
+            {
+                elm_interface_scrollable_page_scroll_limit_set_static_delegate = new elm_interface_scrollable_page_scroll_limit_set_delegate(page_scroll_limit_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetPageScrollLimit") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_scroll_limit_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_scroll_limit_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_snap_allow_get_static_delegate == null)
+            {
+                elm_interface_scrollable_page_snap_allow_get_static_delegate = new elm_interface_scrollable_page_snap_allow_get_delegate(page_snap_allow_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetPageSnapAllow") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_snap_allow_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_snap_allow_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_snap_allow_set_static_delegate == null)
+            {
+                elm_interface_scrollable_page_snap_allow_set_static_delegate = new elm_interface_scrollable_page_snap_allow_set_delegate(page_snap_allow_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetPageSnapAllow") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_snap_allow_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_snap_allow_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_paging_get_static_delegate == null)
+            {
+                elm_interface_scrollable_paging_get_static_delegate = new elm_interface_scrollable_paging_get_delegate(paging_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetPaging") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_paging_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_paging_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_paging_set_static_delegate == null)
+            {
+                elm_interface_scrollable_paging_set_static_delegate = new elm_interface_scrollable_paging_set_delegate(paging_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetPaging") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_paging_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_paging_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_single_direction_get_static_delegate == null)
+            {
+                elm_interface_scrollable_single_direction_get_static_delegate = new elm_interface_scrollable_single_direction_get_delegate(single_direction_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetSingleDirection") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_single_direction_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_single_direction_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_single_direction_set_static_delegate == null)
+            {
+                elm_interface_scrollable_single_direction_set_static_delegate = new elm_interface_scrollable_single_direction_set_delegate(single_direction_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetSingleDirection") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_single_direction_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_single_direction_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_step_size_get_static_delegate == null)
+            {
+                elm_interface_scrollable_step_size_get_static_delegate = new elm_interface_scrollable_step_size_get_delegate(step_size_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetStepSize") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_step_size_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_step_size_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_step_size_set_static_delegate == null)
+            {
+                elm_interface_scrollable_step_size_set_static_delegate = new elm_interface_scrollable_step_size_set_delegate(step_size_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetStepSize") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_step_size_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_step_size_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_loop_get_static_delegate == null)
+            {
+                elm_interface_scrollable_content_loop_get_static_delegate = new elm_interface_scrollable_content_loop_get_delegate(content_loop_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetContentLoop") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_loop_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_loop_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_loop_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_loop_set_static_delegate = new elm_interface_scrollable_content_loop_set_delegate(content_loop_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetContentLoop") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_loop_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_loop_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_up_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_up_cb_set_static_delegate = new elm_interface_scrollable_scroll_up_cb_set_delegate(scroll_up_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollUpCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_up_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_up_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_hbar_drag_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_hbar_drag_cb_set_static_delegate = new elm_interface_scrollable_hbar_drag_cb_set_delegate(hbar_drag_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetHbarDragCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_hbar_drag_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hbar_drag_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_drag_start_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_drag_start_cb_set_static_delegate = new elm_interface_scrollable_drag_start_cb_set_delegate(drag_start_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetDragStartCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_drag_start_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_drag_start_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_start_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_start_cb_set_static_delegate = new elm_interface_scrollable_scroll_start_cb_set_delegate(scroll_start_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollStartCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_start_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_start_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_freeze_set_static_delegate == null)
+            {
+                elm_interface_scrollable_freeze_set_static_delegate = new elm_interface_scrollable_freeze_set_delegate(freeze_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetFreeze") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_freeze_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_freeze_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate = new elm_interface_scrollable_content_viewport_resize_cb_set_delegate(content_viewport_resize_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetContentViewportResizeCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_viewport_resize_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_left_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_left_cb_set_static_delegate = new elm_interface_scrollable_scroll_left_cb_set_delegate(scroll_left_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollLeftCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_left_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_left_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_vbar_press_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_vbar_press_cb_set_static_delegate = new elm_interface_scrollable_vbar_press_cb_set_delegate(vbar_press_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetVbarPressCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_vbar_press_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_vbar_press_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_hbar_press_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_hbar_press_cb_set_static_delegate = new elm_interface_scrollable_hbar_press_cb_set_delegate(hbar_press_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetHbarPressCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_hbar_press_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hbar_press_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_hbar_unpress_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_hbar_unpress_cb_set_static_delegate = new elm_interface_scrollable_hbar_unpress_cb_set_delegate(hbar_unpress_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetHbarUnpressCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_hbar_unpress_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hbar_unpress_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_drag_stop_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_drag_stop_cb_set_static_delegate = new elm_interface_scrollable_drag_stop_cb_set_delegate(drag_stop_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetDragStopCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_drag_stop_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_drag_stop_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_stop_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_stop_cb_set_static_delegate = new elm_interface_scrollable_scroll_stop_cb_set_delegate(scroll_stop_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollStopCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_stop_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_stop_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_extern_pan_set_static_delegate == null)
+            {
+                elm_interface_scrollable_extern_pan_set_static_delegate = new elm_interface_scrollable_extern_pan_set_delegate(extern_pan_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetExternPan") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_extern_pan_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_extern_pan_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_change_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_page_change_cb_set_static_delegate = new elm_interface_scrollable_page_change_cb_set_delegate(page_change_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetPageChangeCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_change_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_change_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_hold_set_static_delegate == null)
+            {
+                elm_interface_scrollable_hold_set_static_delegate = new elm_interface_scrollable_hold_set_delegate(hold_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetHold") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_hold_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_hold_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_animate_start_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_animate_start_cb_set_static_delegate = new elm_interface_scrollable_animate_start_cb_set_delegate(animate_start_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetAnimateStartCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_animate_start_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_animate_start_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_down_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_down_cb_set_static_delegate = new elm_interface_scrollable_scroll_down_cb_set_delegate(scroll_down_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollDownCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_down_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_down_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_relative_set_static_delegate == null)
+            {
+                elm_interface_scrollable_page_relative_set_static_delegate = new elm_interface_scrollable_page_relative_set_delegate(page_relative_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetPageRelative") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_relative_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_relative_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_cb_set_static_delegate = new elm_interface_scrollable_scroll_cb_set_delegate(scroll_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_animate_stop_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_animate_stop_cb_set_static_delegate = new elm_interface_scrollable_animate_stop_cb_set_delegate(animate_stop_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetAnimateStopCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_animate_stop_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_animate_stop_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_min_limit_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_min_limit_cb_set_static_delegate = new elm_interface_scrollable_content_min_limit_cb_set_delegate(content_min_limit_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetContentMinLimitCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_min_limit_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_min_limit_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_scroll_right_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_scroll_right_cb_set_static_delegate = new elm_interface_scrollable_scroll_right_cb_set_delegate(scroll_right_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollRightCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_scroll_right_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_scroll_right_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_set_static_delegate = new elm_interface_scrollable_content_set_delegate(scrollable_content_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetScrollableContent") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_edge_left_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_edge_left_cb_set_static_delegate = new elm_interface_scrollable_edge_left_cb_set_delegate(edge_left_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetEdgeLeftCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_edge_left_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_left_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_vbar_drag_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_vbar_drag_cb_set_static_delegate = new elm_interface_scrollable_vbar_drag_cb_set_delegate(vbar_drag_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetVbarDragCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_vbar_drag_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_vbar_drag_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_vbar_unpress_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_vbar_unpress_cb_set_static_delegate = new elm_interface_scrollable_vbar_unpress_cb_set_delegate(vbar_unpress_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetVbarUnpressCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_vbar_unpress_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_vbar_unpress_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_edge_bottom_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_edge_bottom_cb_set_static_delegate = new elm_interface_scrollable_edge_bottom_cb_set_delegate(edge_bottom_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetEdgeBottomCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_edge_bottom_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_bottom_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_edge_right_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_edge_right_cb_set_static_delegate = new elm_interface_scrollable_edge_right_cb_set_delegate(edge_right_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetEdgeRightCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_edge_right_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_right_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_edge_top_cb_set_static_delegate == null)
+            {
+                elm_interface_scrollable_edge_top_cb_set_static_delegate = new elm_interface_scrollable_edge_top_cb_set_delegate(edge_top_cb_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetEdgeTopCb") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_edge_top_cb_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_edge_top_cb_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_objects_set_static_delegate == null)
+            {
+                elm_interface_scrollable_objects_set_static_delegate = new elm_interface_scrollable_objects_set_delegate(objects_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetObjects") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_objects_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_objects_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_last_page_get_static_delegate == null)
+            {
+                elm_interface_scrollable_last_page_get_static_delegate = new elm_interface_scrollable_last_page_get_delegate(last_page_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetLastPage") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_last_page_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_last_page_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_current_page_get_static_delegate == null)
+            {
+                elm_interface_scrollable_current_page_get_static_delegate = new elm_interface_scrollable_current_page_get_delegate(current_page_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetCurrentPage") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_current_page_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_current_page_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_viewport_geometry_get_static_delegate == null)
+            {
+                elm_interface_scrollable_content_viewport_geometry_get_static_delegate = new elm_interface_scrollable_content_viewport_geometry_get_delegate(content_viewport_geometry_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetContentViewportGeometry") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_viewport_geometry_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_viewport_geometry_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_size_get_static_delegate == null)
+            {
+                elm_interface_scrollable_content_size_get_static_delegate = new elm_interface_scrollable_content_size_get_delegate(content_size_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetContentSize") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_size_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_size_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_item_loop_enabled_get_static_delegate == null)
+            {
+                elm_interface_scrollable_item_loop_enabled_get_static_delegate = new elm_interface_scrollable_item_loop_enabled_get_delegate(item_loop_enabled_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetItemLoopEnabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_item_loop_enabled_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_item_loop_enabled_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_item_loop_enabled_set_static_delegate == null)
+            {
+                elm_interface_scrollable_item_loop_enabled_set_static_delegate = new elm_interface_scrollable_item_loop_enabled_set_delegate(item_loop_enabled_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetItemLoopEnabled") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_item_loop_enabled_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_item_loop_enabled_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_pos_set_static_delegate == null)
+            {
+                elm_interface_scrollable_content_pos_set_static_delegate = new elm_interface_scrollable_content_pos_set_delegate(content_pos_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetContentPos") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_pos_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_pos_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_pos_get_static_delegate == null)
+            {
+                elm_interface_scrollable_content_pos_get_static_delegate = new elm_interface_scrollable_content_pos_get_delegate(content_pos_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetContentPos") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_pos_get"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_pos_get_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_show_static_delegate == null)
+            {
+                elm_interface_scrollable_page_show_static_delegate = new elm_interface_scrollable_page_show_delegate(page_show);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "ShowPage") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_show"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_show_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_region_bring_in_static_delegate == null)
+            {
+                elm_interface_scrollable_region_bring_in_static_delegate = new elm_interface_scrollable_region_bring_in_delegate(region_bring_in);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "RegionBringIn") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_region_bring_in"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_region_bring_in_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_page_bring_in_static_delegate == null)
+            {
+                elm_interface_scrollable_page_bring_in_static_delegate = new elm_interface_scrollable_page_bring_in_delegate(page_bring_in);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "PageBringIn") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_page_bring_in"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_page_bring_in_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_region_show_static_delegate == null)
+            {
+                elm_interface_scrollable_content_region_show_static_delegate = new elm_interface_scrollable_content_region_show_delegate(content_region_show);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "ShowContentRegion") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_region_show"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_region_show_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_content_min_limit_static_delegate == null)
+            {
+                elm_interface_scrollable_content_min_limit_static_delegate = new elm_interface_scrollable_content_min_limit_delegate(content_min_limit);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "ContentMinLimit") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_content_min_limit"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_content_min_limit_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_wanted_region_set_static_delegate == null)
+            {
+                elm_interface_scrollable_wanted_region_set_static_delegate = new elm_interface_scrollable_wanted_region_set_delegate(wanted_region_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetWantedRegion") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_wanted_region_set"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_wanted_region_set_static_delegate) });
+            }
+
+            if (elm_interface_scrollable_custom_pan_pos_adjust_static_delegate == null)
+            {
+                elm_interface_scrollable_custom_pan_pos_adjust_static_delegate = new elm_interface_scrollable_custom_pan_pos_adjust_delegate(custom_pan_pos_adjust);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "CustomPanPosAdjust") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "elm_interface_scrollable_custom_pan_pos_adjust"), func = Marshal.GetFunctionPointerForDelegate(elm_interface_scrollable_custom_pan_pos_adjust_static_delegate) });
+            }
+
+            if (efl_ui_widget_focus_manager_create_static_delegate == null)
+            {
+                efl_ui_widget_focus_manager_create_static_delegate = new efl_ui_widget_focus_manager_create_delegate(focus_manager_create);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "FocusManagerCreate") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_widget_focus_manager_create"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_widget_focus_manager_create_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_focus_get_static_delegate == null)
+            {
+                efl_ui_focus_manager_focus_get_static_delegate = new efl_ui_focus_manager_focus_get_delegate(manager_focus_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetManagerFocus") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_focus_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_focus_get_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_focus_set_static_delegate == null)
+            {
+                efl_ui_focus_manager_focus_set_static_delegate = new efl_ui_focus_manager_focus_set_delegate(manager_focus_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetManagerFocus") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_focus_set"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_focus_set_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_redirect_get_static_delegate == null)
+            {
+                efl_ui_focus_manager_redirect_get_static_delegate = new efl_ui_focus_manager_redirect_get_delegate(redirect_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetRedirect") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_redirect_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_redirect_get_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_redirect_set_static_delegate == null)
+            {
+                efl_ui_focus_manager_redirect_set_static_delegate = new efl_ui_focus_manager_redirect_set_delegate(redirect_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetRedirect") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_redirect_set"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_redirect_set_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_border_elements_get_static_delegate == null)
+            {
+                efl_ui_focus_manager_border_elements_get_static_delegate = new efl_ui_focus_manager_border_elements_get_delegate(border_elements_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetBorderElements") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_border_elements_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_border_elements_get_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_viewport_elements_get_static_delegate == null)
+            {
+                efl_ui_focus_manager_viewport_elements_get_static_delegate = new efl_ui_focus_manager_viewport_elements_get_delegate(viewport_elements_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetViewportElements") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_viewport_elements_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_viewport_elements_get_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_root_get_static_delegate == null)
+            {
+                efl_ui_focus_manager_root_get_static_delegate = new efl_ui_focus_manager_root_get_delegate(root_get);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "GetRoot") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_root_get"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_root_get_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_root_set_static_delegate == null)
+            {
+                efl_ui_focus_manager_root_set_static_delegate = new efl_ui_focus_manager_root_set_delegate(root_set);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetRoot") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_root_set"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_root_set_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_move_static_delegate == null)
+            {
+                efl_ui_focus_manager_move_static_delegate = new efl_ui_focus_manager_move_delegate(move);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "Move") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_move"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_move_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_request_move_static_delegate == null)
+            {
+                efl_ui_focus_manager_request_move_static_delegate = new efl_ui_focus_manager_request_move_delegate(request_move);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "MoveRequest") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_request_move"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_request_move_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_request_subchild_static_delegate == null)
+            {
+                efl_ui_focus_manager_request_subchild_static_delegate = new efl_ui_focus_manager_request_subchild_delegate(request_subchild);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "RequestSubchild") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_request_subchild"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_request_subchild_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_fetch_static_delegate == null)
+            {
+                efl_ui_focus_manager_fetch_static_delegate = new efl_ui_focus_manager_fetch_delegate(fetch);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "Fetch") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_fetch"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_fetch_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_logical_end_static_delegate == null)
+            {
+                efl_ui_focus_manager_logical_end_static_delegate = new efl_ui_focus_manager_logical_end_delegate(logical_end);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "LogicalEnd") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_logical_end"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_logical_end_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_reset_history_static_delegate == null)
+            {
+                efl_ui_focus_manager_reset_history_static_delegate = new efl_ui_focus_manager_reset_history_delegate(reset_history);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "ResetHistory") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_reset_history"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_reset_history_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_pop_history_stack_static_delegate == null)
+            {
+                efl_ui_focus_manager_pop_history_stack_static_delegate = new efl_ui_focus_manager_pop_history_stack_delegate(pop_history_stack);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "PopHistoryStack") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_pop_history_stack"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_pop_history_stack_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_setup_on_first_touch_static_delegate == null)
+            {
+                efl_ui_focus_manager_setup_on_first_touch_static_delegate = new efl_ui_focus_manager_setup_on_first_touch_delegate(setup_on_first_touch);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "SetupOnFirstTouch") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_setup_on_first_touch"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_setup_on_first_touch_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_dirty_logic_freeze_static_delegate == null)
+            {
+                efl_ui_focus_manager_dirty_logic_freeze_static_delegate = new efl_ui_focus_manager_dirty_logic_freeze_delegate(dirty_logic_freeze);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "FreezeDirtyLogic") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_dirty_logic_freeze"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_dirty_logic_freeze_static_delegate) });
+            }
+
+            if (efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate == null)
+            {
+                efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate = new efl_ui_focus_manager_dirty_logic_unfreeze_delegate(dirty_logic_unfreeze);
+            }
+
+            if (methods.FirstOrDefault(m => m.Name == "DirtyLogicUnfreeze") != null)
+            {
+                descs.Add(new Efl_Op_Description() {api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(Module.Module, "efl_ui_focus_manager_dirty_logic_unfreeze"), func = Marshal.GetFunctionPointerForDelegate(efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate) });
+            }
+
+            return descs;
+        }
+        /// <summary>Returns the Eo class for the native methods of this class.</summary>
+        /// <returns>The native class pointer.</returns>
+        public override IntPtr GetEflClass()
+        {
+            return Elm.IInterfaceScrollableConcrete.elm_interface_scrollable_mixin_get();
+        }
+
+        #pragma warning disable CA1707, SA1300, SA1600
+
+        
+        private delegate void elm_interface_scrollable_gravity_get_delegate(System.IntPtr obj, System.IntPtr pd,  out double x,  out double y);
+
+        
+        public delegate void elm_interface_scrollable_gravity_get_api_delegate(System.IntPtr obj,  out double x,  out double y);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_get_api_delegate> elm_interface_scrollable_gravity_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_get_api_delegate>(Module, "elm_interface_scrollable_gravity_get");
+
+        private static void gravity_get(System.IntPtr obj, System.IntPtr pd, out double x, out double y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_gravity_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        x = default(double);        y = default(double);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetGravity(out x, out y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_gravity_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out x, out y);
+            }
+        }
+
+        private static elm_interface_scrollable_gravity_get_delegate elm_interface_scrollable_gravity_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_gravity_set_delegate(System.IntPtr obj, System.IntPtr pd,  double x,  double y);
+
+        
+        public delegate void elm_interface_scrollable_gravity_set_api_delegate(System.IntPtr obj,  double x,  double y);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_set_api_delegate> elm_interface_scrollable_gravity_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_gravity_set_api_delegate>(Module, "elm_interface_scrollable_gravity_set");
+
+        private static void gravity_set(System.IntPtr obj, System.IntPtr pd, double x, double y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_gravity_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetGravity(x, y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_gravity_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y);
+            }
+        }
+
+        private static elm_interface_scrollable_gravity_set_delegate elm_interface_scrollable_gravity_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_bounce_allow_get_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] out bool horiz, [MarshalAs(UnmanagedType.U1)] out bool vert);
+
+        
+        public delegate void elm_interface_scrollable_bounce_allow_get_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] out bool horiz, [MarshalAs(UnmanagedType.U1)] out bool vert);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_get_api_delegate> elm_interface_scrollable_bounce_allow_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_get_api_delegate>(Module, "elm_interface_scrollable_bounce_allow_get");
+
+        private static void bounce_allow_get(System.IntPtr obj, System.IntPtr pd, out bool horiz, out bool vert)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_bounce_allow_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        horiz = default(bool);        vert = default(bool);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetBounceAllow(out horiz, out vert);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_bounce_allow_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out horiz, out vert);
+            }
+        }
+
+        private static elm_interface_scrollable_bounce_allow_get_delegate elm_interface_scrollable_bounce_allow_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_bounce_allow_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool horiz, [MarshalAs(UnmanagedType.U1)] bool vert);
+
+        
+        public delegate void elm_interface_scrollable_bounce_allow_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool horiz, [MarshalAs(UnmanagedType.U1)] bool vert);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_set_api_delegate> elm_interface_scrollable_bounce_allow_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_allow_set_api_delegate>(Module, "elm_interface_scrollable_bounce_allow_set");
+
+        private static void bounce_allow_set(System.IntPtr obj, System.IntPtr pd, bool horiz, bool vert)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_bounce_allow_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetBounceAllow(horiz, vert);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_bounce_allow_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), horiz, vert);
+            }
+        }
+
+        private static elm_interface_scrollable_bounce_allow_set_delegate elm_interface_scrollable_bounce_allow_set_static_delegate;
+
+        [return: MarshalAs(UnmanagedType.U1)]
+        private delegate bool elm_interface_scrollable_wheel_disabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
+
+        [return: MarshalAs(UnmanagedType.U1)]
+        public delegate bool elm_interface_scrollable_wheel_disabled_get_api_delegate(System.IntPtr obj);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_get_api_delegate> elm_interface_scrollable_wheel_disabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_get_api_delegate>(Module, "elm_interface_scrollable_wheel_disabled_get");
+
+        private static bool wheel_disabled_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_wheel_disabled_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            bool _ret_var = default(bool);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetWheelDisabled();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        return _ret_var;
+
+            }
+            else
+            {
+                return elm_interface_scrollable_wheel_disabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
+        }
+
+        private static elm_interface_scrollable_wheel_disabled_get_delegate elm_interface_scrollable_wheel_disabled_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_wheel_disabled_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool disabled);
+
+        
+        public delegate void elm_interface_scrollable_wheel_disabled_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool disabled);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_set_api_delegate> elm_interface_scrollable_wheel_disabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_wheel_disabled_set_api_delegate>(Module, "elm_interface_scrollable_wheel_disabled_set");
+
+        private static void wheel_disabled_set(System.IntPtr obj, System.IntPtr pd, bool disabled)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_wheel_disabled_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetWheelDisabled(disabled);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_wheel_disabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), disabled);
+            }
+        }
+
+        private static elm_interface_scrollable_wheel_disabled_set_delegate elm_interface_scrollable_wheel_disabled_set_static_delegate;
+
+        
+        private delegate Efl.Ui.ScrollBlock elm_interface_scrollable_movement_block_get_delegate(System.IntPtr obj, System.IntPtr pd);
+
+        
+        public delegate Efl.Ui.ScrollBlock elm_interface_scrollable_movement_block_get_api_delegate(System.IntPtr obj);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_get_api_delegate> elm_interface_scrollable_movement_block_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_get_api_delegate>(Module, "elm_interface_scrollable_movement_block_get");
+
+        private static Efl.Ui.ScrollBlock movement_block_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_movement_block_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Efl.Ui.ScrollBlock _ret_var = default(Efl.Ui.ScrollBlock);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetMovementBlock();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
         return _ret_var;
-        } else {
-            return elm_interface_scrollable_momentum_animator_disabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+
+            }
+            else
+            {
+                return elm_interface_scrollable_movement_block_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_momentum_animator_disabled_get_delegate elm_interface_scrollable_momentum_animator_disabled_get_static_delegate;
 
+        private static elm_interface_scrollable_movement_block_get_delegate elm_interface_scrollable_movement_block_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_momentum_animator_disabled_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool disabled);
+        
+        private delegate void elm_interface_scrollable_movement_block_set_delegate(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.ScrollBlock block);
 
+        
+        public delegate void elm_interface_scrollable_movement_block_set_api_delegate(System.IntPtr obj,  Efl.Ui.ScrollBlock block);
 
-     public delegate void elm_interface_scrollable_momentum_animator_disabled_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool disabled);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_set_api_delegate> elm_interface_scrollable_momentum_animator_disabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_set_api_delegate>(_Module, "elm_interface_scrollable_momentum_animator_disabled_set");
-     private static void momentum_animator_disabled_set(System.IntPtr obj, System.IntPtr pd,  bool disabled)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_momentum_animator_disabled_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetMomentumAnimatorDisabled( disabled);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_set_api_delegate> elm_interface_scrollable_movement_block_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_movement_block_set_api_delegate>(Module, "elm_interface_scrollable_movement_block_set");
+
+        private static void movement_block_set(System.IntPtr obj, System.IntPtr pd, Efl.Ui.ScrollBlock block)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_movement_block_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetMovementBlock(block);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_movement_block_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), block);
             }
-                                } else {
-            elm_interface_scrollable_momentum_animator_disabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  disabled);
         }
-    }
-    private static elm_interface_scrollable_momentum_animator_disabled_set_delegate elm_interface_scrollable_momentum_animator_disabled_set_static_delegate;
 
+        private static elm_interface_scrollable_movement_block_set_delegate elm_interface_scrollable_movement_block_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_policy_get_delegate(System.IntPtr obj, System.IntPtr pd,   out Elm.Scroller.Policy hbar,   out Elm.Scroller.Policy vbar);
+        [return: MarshalAs(UnmanagedType.U1)]
+        private delegate bool elm_interface_scrollable_momentum_animator_disabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        [return: MarshalAs(UnmanagedType.U1)]
+        public delegate bool elm_interface_scrollable_momentum_animator_disabled_get_api_delegate(System.IntPtr obj);
 
-     public delegate void elm_interface_scrollable_policy_get_api_delegate(System.IntPtr obj,   out Elm.Scroller.Policy hbar,   out Elm.Scroller.Policy vbar);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_get_api_delegate> elm_interface_scrollable_policy_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_get_api_delegate>(_Module, "elm_interface_scrollable_policy_get");
-     private static void policy_get(System.IntPtr obj, System.IntPtr pd,  out Elm.Scroller.Policy hbar,  out Elm.Scroller.Policy vbar)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_policy_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    hbar = default(Elm.Scroller.Policy);        vbar = default(Elm.Scroller.Policy);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetPolicy( out hbar,  out vbar);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_get_api_delegate> elm_interface_scrollable_momentum_animator_disabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_get_api_delegate>(Module, "elm_interface_scrollable_momentum_animator_disabled_get");
+
+        private static bool momentum_animator_disabled_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_momentum_animator_disabled_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            bool _ret_var = default(bool);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetMomentumAnimatorDisabled();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        return _ret_var;
+
+            }
+            else
+            {
+                return elm_interface_scrollable_momentum_animator_disabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
             }
-                                                } else {
-            elm_interface_scrollable_policy_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out hbar,  out vbar);
         }
-    }
-    private static elm_interface_scrollable_policy_get_delegate elm_interface_scrollable_policy_get_static_delegate;
 
+        private static elm_interface_scrollable_momentum_animator_disabled_get_delegate elm_interface_scrollable_momentum_animator_disabled_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_policy_set_delegate(System.IntPtr obj, System.IntPtr pd,   Elm.Scroller.Policy hbar,   Elm.Scroller.Policy vbar);
+        
+        private delegate void elm_interface_scrollable_momentum_animator_disabled_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool disabled);
 
+        
+        public delegate void elm_interface_scrollable_momentum_animator_disabled_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool disabled);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_set_api_delegate> elm_interface_scrollable_momentum_animator_disabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_momentum_animator_disabled_set_api_delegate>(Module, "elm_interface_scrollable_momentum_animator_disabled_set");
+
+        private static void momentum_animator_disabled_set(System.IntPtr obj, System.IntPtr pd, bool disabled)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_momentum_animator_disabled_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetMomentumAnimatorDisabled(disabled);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_momentum_animator_disabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), disabled);
+            }
+        }
+
+        private static elm_interface_scrollable_momentum_animator_disabled_set_delegate elm_interface_scrollable_momentum_animator_disabled_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_policy_get_delegate(System.IntPtr obj, System.IntPtr pd,  out Elm.Scroller.Policy hbar,  out Elm.Scroller.Policy vbar);
+
+        
+        public delegate void elm_interface_scrollable_policy_get_api_delegate(System.IntPtr obj,  out Elm.Scroller.Policy hbar,  out Elm.Scroller.Policy vbar);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_get_api_delegate> elm_interface_scrollable_policy_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_get_api_delegate>(Module, "elm_interface_scrollable_policy_get");
+
+        private static void policy_get(System.IntPtr obj, System.IntPtr pd, out Elm.Scroller.Policy hbar, out Elm.Scroller.Policy vbar)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_policy_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        hbar = default(Elm.Scroller.Policy);        vbar = default(Elm.Scroller.Policy);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetPolicy(out hbar, out vbar);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_policy_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out hbar, out vbar);
+            }
+        }
+
+        private static elm_interface_scrollable_policy_get_delegate elm_interface_scrollable_policy_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_policy_set_delegate(System.IntPtr obj, System.IntPtr pd,  Elm.Scroller.Policy hbar,  Elm.Scroller.Policy vbar);
+
+        
+        public delegate void elm_interface_scrollable_policy_set_api_delegate(System.IntPtr obj,  Elm.Scroller.Policy hbar,  Elm.Scroller.Policy vbar);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_set_api_delegate> elm_interface_scrollable_policy_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_set_api_delegate>(Module, "elm_interface_scrollable_policy_set");
+
+        private static void policy_set(System.IntPtr obj, System.IntPtr pd, Elm.Scroller.Policy hbar, Elm.Scroller.Policy vbar)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_policy_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPolicy(hbar, vbar);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_policy_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), hbar, vbar);
+            }
+        }
+
+        private static elm_interface_scrollable_policy_set_delegate elm_interface_scrollable_policy_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_content_region_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y,  out int w,  out int h);
+
+        
+        public delegate void elm_interface_scrollable_content_region_get_api_delegate(System.IntPtr obj,  out int x,  out int y,  out int w,  out int h);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_get_api_delegate> elm_interface_scrollable_content_region_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_get_api_delegate>(Module, "elm_interface_scrollable_content_region_get");
+
+        private static void content_region_get(System.IntPtr obj, System.IntPtr pd, out int x, out int y, out int w, out int h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_region_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                        x = default(int);        y = default(int);        w = default(int);        h = default(int);                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetContentRegion(out x, out y, out w, out h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-     public delegate void elm_interface_scrollable_policy_set_api_delegate(System.IntPtr obj,   Elm.Scroller.Policy hbar,   Elm.Scroller.Policy vbar);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_set_api_delegate> elm_interface_scrollable_policy_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_policy_set_api_delegate>(_Module, "elm_interface_scrollable_policy_set");
-     private static void policy_set(System.IntPtr obj, System.IntPtr pd,  Elm.Scroller.Policy hbar,  Elm.Scroller.Policy vbar)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_policy_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
                                                                         
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPolicy( hbar,  vbar);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                } else {
-            elm_interface_scrollable_policy_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  hbar,  vbar);
+            else
+            {
+                elm_interface_scrollable_content_region_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out x, out y, out w, out h);
+            }
         }
-    }
-    private static elm_interface_scrollable_policy_set_delegate elm_interface_scrollable_policy_set_static_delegate;
 
+        private static elm_interface_scrollable_content_region_get_delegate elm_interface_scrollable_content_region_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_region_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int x,   out int y,   out int w,   out int h);
+        
+        private delegate void elm_interface_scrollable_content_region_set_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  int w,  int h);
 
+        
+        public delegate void elm_interface_scrollable_content_region_set_api_delegate(System.IntPtr obj,  int x,  int y,  int w,  int h);
 
-     public delegate void elm_interface_scrollable_content_region_get_api_delegate(System.IntPtr obj,   out int x,   out int y,   out int w,   out int h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_get_api_delegate> elm_interface_scrollable_content_region_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_get_api_delegate>(_Module, "elm_interface_scrollable_content_region_get");
-     private static void content_region_get(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y,  out int w,  out int h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_region_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                    x = default(int);        y = default(int);        w = default(int);        h = default(int);                                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetContentRegion( out x,  out y,  out w,  out h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_set_api_delegate> elm_interface_scrollable_content_region_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_set_api_delegate>(Module, "elm_interface_scrollable_content_region_set");
+
+        private static void content_region_set(System.IntPtr obj, System.IntPtr pd, int x, int y, int w, int h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_region_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetContentRegion(x, y, w, h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_region_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y, w, h);
             }
-                                                                                } else {
-            elm_interface_scrollable_content_region_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out x,  out y,  out w,  out h);
         }
-    }
-    private static elm_interface_scrollable_content_region_get_delegate elm_interface_scrollable_content_region_get_static_delegate;
 
+        private static elm_interface_scrollable_content_region_set_delegate elm_interface_scrollable_content_region_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_region_set_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y,   int w,   int h);
+        [return: MarshalAs(UnmanagedType.U1)]
+        private delegate bool elm_interface_scrollable_content_events_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        [return: MarshalAs(UnmanagedType.U1)]
+        public delegate bool elm_interface_scrollable_content_events_get_api_delegate(System.IntPtr obj);
 
-     public delegate void elm_interface_scrollable_content_region_set_api_delegate(System.IntPtr obj,   int x,   int y,   int w,   int h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_set_api_delegate> elm_interface_scrollable_content_region_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_set_api_delegate>(_Module, "elm_interface_scrollable_content_region_set");
-     private static void content_region_set(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  int w,  int h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_region_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetContentRegion( x,  y,  w,  h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_get_api_delegate> elm_interface_scrollable_content_events_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_get_api_delegate>(Module, "elm_interface_scrollable_content_events_get");
+
+        private static bool content_events_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_events_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            bool _ret_var = default(bool);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetContentEvents();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        return _ret_var;
+
+            }
+            else
+            {
+                return elm_interface_scrollable_content_events_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
             }
-                                                                                } else {
-            elm_interface_scrollable_content_region_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y,  w,  h);
         }
-    }
-    private static elm_interface_scrollable_content_region_set_delegate elm_interface_scrollable_content_region_set_static_delegate;
 
+        private static elm_interface_scrollable_content_events_get_delegate elm_interface_scrollable_content_events_get_static_delegate;
 
-     [return: MarshalAs(UnmanagedType.U1)] private delegate bool elm_interface_scrollable_content_events_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void elm_interface_scrollable_content_events_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool repeat_events);
 
+        
+        public delegate void elm_interface_scrollable_content_events_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool repeat_events);
 
-     [return: MarshalAs(UnmanagedType.U1)] public delegate bool elm_interface_scrollable_content_events_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_get_api_delegate> elm_interface_scrollable_content_events_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_get_api_delegate>(_Module, "elm_interface_scrollable_content_events_get");
-     private static bool content_events_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_events_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        bool _ret_var = default(bool);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetContentEvents();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_set_api_delegate> elm_interface_scrollable_content_events_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_set_api_delegate>(Module, "elm_interface_scrollable_content_events_set");
+
+        private static void content_events_set(System.IntPtr obj, System.IntPtr pd, bool repeat_events)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_events_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetContentEvents(repeat_events);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_events_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), repeat_events);
+            }
+        }
+
+        private static elm_interface_scrollable_content_events_set_delegate elm_interface_scrollable_content_events_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_page_size_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y);
+
+        
+        public delegate void elm_interface_scrollable_page_size_get_api_delegate(System.IntPtr obj,  out int x,  out int y);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_get_api_delegate> elm_interface_scrollable_page_size_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_get_api_delegate>(Module, "elm_interface_scrollable_page_size_get");
+
+        private static void page_size_get(System.IntPtr obj, System.IntPtr pd, out int x, out int y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_size_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        x = default(int);        y = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetPageSize(out x, out y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_size_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out x, out y);
+            }
+        }
+
+        private static elm_interface_scrollable_page_size_get_delegate elm_interface_scrollable_page_size_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_page_size_set_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y);
+
+        
+        public delegate void elm_interface_scrollable_page_size_set_api_delegate(System.IntPtr obj,  int x,  int y);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_set_api_delegate> elm_interface_scrollable_page_size_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_set_api_delegate>(Module, "elm_interface_scrollable_page_size_set");
+
+        private static void page_size_set(System.IntPtr obj, System.IntPtr pd, int x, int y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_size_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPageSize(x, y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
             }
+            else
+            {
+                elm_interface_scrollable_page_size_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y);
+            }
+        }
+
+        private static elm_interface_scrollable_page_size_set_delegate elm_interface_scrollable_page_size_set_static_delegate;
+
+        [return: MarshalAs(UnmanagedType.U1)]
+        private delegate bool elm_interface_scrollable_bounce_animator_disabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
+
+        [return: MarshalAs(UnmanagedType.U1)]
+        public delegate bool elm_interface_scrollable_bounce_animator_disabled_get_api_delegate(System.IntPtr obj);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_get_api_delegate> elm_interface_scrollable_bounce_animator_disabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_get_api_delegate>(Module, "elm_interface_scrollable_bounce_animator_disabled_get");
+
+        private static bool bounce_animator_disabled_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_bounce_animator_disabled_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            bool _ret_var = default(bool);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetBounceAnimatorDisabled();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
         return _ret_var;
-        } else {
-            return elm_interface_scrollable_content_events_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+
+            }
+            else
+            {
+                return elm_interface_scrollable_bounce_animator_disabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_content_events_get_delegate elm_interface_scrollable_content_events_get_static_delegate;
 
+        private static elm_interface_scrollable_bounce_animator_disabled_get_delegate elm_interface_scrollable_bounce_animator_disabled_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_events_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool repeat_events);
+        
+        private delegate void elm_interface_scrollable_bounce_animator_disabled_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool disabled);
 
+        
+        public delegate void elm_interface_scrollable_bounce_animator_disabled_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool disabled);
 
-     public delegate void elm_interface_scrollable_content_events_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool repeat_events);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_set_api_delegate> elm_interface_scrollable_content_events_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_events_set_api_delegate>(_Module, "elm_interface_scrollable_content_events_set");
-     private static void content_events_set(System.IntPtr obj, System.IntPtr pd,  bool repeat_events)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_events_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetContentEvents( repeat_events);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_set_api_delegate> elm_interface_scrollable_bounce_animator_disabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_set_api_delegate>(Module, "elm_interface_scrollable_bounce_animator_disabled_set");
+
+        private static void bounce_animator_disabled_set(System.IntPtr obj, System.IntPtr pd, bool disabled)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_bounce_animator_disabled_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetBounceAnimatorDisabled(disabled);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_bounce_animator_disabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), disabled);
             }
-                                } else {
-            elm_interface_scrollable_content_events_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  repeat_events);
         }
-    }
-    private static elm_interface_scrollable_content_events_set_delegate elm_interface_scrollable_content_events_set_static_delegate;
 
+        private static elm_interface_scrollable_bounce_animator_disabled_set_delegate elm_interface_scrollable_bounce_animator_disabled_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_size_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int x,   out int y);
+        
+        private delegate void elm_interface_scrollable_page_scroll_limit_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int page_limit_h,  out int page_limit_v);
 
+        
+        public delegate void elm_interface_scrollable_page_scroll_limit_get_api_delegate(System.IntPtr obj,  out int page_limit_h,  out int page_limit_v);
 
-     public delegate void elm_interface_scrollable_page_size_get_api_delegate(System.IntPtr obj,   out int x,   out int y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_get_api_delegate> elm_interface_scrollable_page_size_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_get_api_delegate>(_Module, "elm_interface_scrollable_page_size_get");
-     private static void page_size_get(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_size_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    x = default(int);        y = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetPageSize( out x,  out y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_get_api_delegate> elm_interface_scrollable_page_scroll_limit_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_get_api_delegate>(Module, "elm_interface_scrollable_page_scroll_limit_get");
+
+        private static void page_scroll_limit_get(System.IntPtr obj, System.IntPtr pd, out int page_limit_h, out int page_limit_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_scroll_limit_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        page_limit_h = default(int);        page_limit_v = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetPageScrollLimit(out page_limit_h, out page_limit_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_scroll_limit_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out page_limit_h, out page_limit_v);
             }
-                                                } else {
-            elm_interface_scrollable_page_size_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out x,  out y);
         }
-    }
-    private static elm_interface_scrollable_page_size_get_delegate elm_interface_scrollable_page_size_get_static_delegate;
 
+        private static elm_interface_scrollable_page_scroll_limit_get_delegate elm_interface_scrollable_page_scroll_limit_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_size_set_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y);
+        
+        private delegate void elm_interface_scrollable_page_scroll_limit_set_delegate(System.IntPtr obj, System.IntPtr pd,  int page_limit_h,  int page_limit_v);
 
+        
+        public delegate void elm_interface_scrollable_page_scroll_limit_set_api_delegate(System.IntPtr obj,  int page_limit_h,  int page_limit_v);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_set_api_delegate> elm_interface_scrollable_page_scroll_limit_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_set_api_delegate>(Module, "elm_interface_scrollable_page_scroll_limit_set");
+
+        private static void page_scroll_limit_set(System.IntPtr obj, System.IntPtr pd, int page_limit_h, int page_limit_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_scroll_limit_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPageScrollLimit(page_limit_h, page_limit_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_scroll_limit_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), page_limit_h, page_limit_v);
+            }
+        }
+
+        private static elm_interface_scrollable_page_scroll_limit_set_delegate elm_interface_scrollable_page_scroll_limit_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_page_snap_allow_get_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] out bool horiz, [MarshalAs(UnmanagedType.U1)] out bool vert);
+
+        
+        public delegate void elm_interface_scrollable_page_snap_allow_get_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] out bool horiz, [MarshalAs(UnmanagedType.U1)] out bool vert);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_get_api_delegate> elm_interface_scrollable_page_snap_allow_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_get_api_delegate>(Module, "elm_interface_scrollable_page_snap_allow_get");
+
+        private static void page_snap_allow_get(System.IntPtr obj, System.IntPtr pd, out bool horiz, out bool vert)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_snap_allow_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        horiz = default(bool);        vert = default(bool);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetPageSnapAllow(out horiz, out vert);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_snap_allow_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out horiz, out vert);
+            }
+        }
+
+        private static elm_interface_scrollable_page_snap_allow_get_delegate elm_interface_scrollable_page_snap_allow_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_page_snap_allow_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool horiz, [MarshalAs(UnmanagedType.U1)] bool vert);
+
+        
+        public delegate void elm_interface_scrollable_page_snap_allow_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool horiz, [MarshalAs(UnmanagedType.U1)] bool vert);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_set_api_delegate> elm_interface_scrollable_page_snap_allow_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_set_api_delegate>(Module, "elm_interface_scrollable_page_snap_allow_set");
+
+        private static void page_snap_allow_set(System.IntPtr obj, System.IntPtr pd, bool horiz, bool vert)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_snap_allow_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPageSnapAllow(horiz, vert);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_snap_allow_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), horiz, vert);
+            }
+        }
+
+        private static elm_interface_scrollable_page_snap_allow_set_delegate elm_interface_scrollable_page_snap_allow_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_paging_get_delegate(System.IntPtr obj, System.IntPtr pd,  out double pagerel_h,  out double pagerel_v,  out int pagesize_h,  out int pagesize_v);
+
+        
+        public delegate void elm_interface_scrollable_paging_get_api_delegate(System.IntPtr obj,  out double pagerel_h,  out double pagerel_v,  out int pagesize_h,  out int pagesize_v);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_get_api_delegate> elm_interface_scrollable_paging_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_get_api_delegate>(Module, "elm_interface_scrollable_paging_get");
+
+        private static void paging_get(System.IntPtr obj, System.IntPtr pd, out double pagerel_h, out double pagerel_v, out int pagesize_h, out int pagesize_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_paging_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                        pagerel_h = default(double);        pagerel_v = default(double);        pagesize_h = default(int);        pagesize_v = default(int);                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetPaging(out pagerel_h, out pagerel_v, out pagesize_h, out pagesize_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-     public delegate void elm_interface_scrollable_page_size_set_api_delegate(System.IntPtr obj,   int x,   int y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_set_api_delegate> elm_interface_scrollable_page_size_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_size_set_api_delegate>(_Module, "elm_interface_scrollable_page_size_set");
-     private static void page_size_set(System.IntPtr obj, System.IntPtr pd,  int x,  int y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_size_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
                                                                         
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPageSize( x,  y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                } else {
-            elm_interface_scrollable_page_size_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y);
+            else
+            {
+                elm_interface_scrollable_paging_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out pagerel_h, out pagerel_v, out pagesize_h, out pagesize_v);
+            }
         }
-    }
-    private static elm_interface_scrollable_page_size_set_delegate elm_interface_scrollable_page_size_set_static_delegate;
 
+        private static elm_interface_scrollable_paging_get_delegate elm_interface_scrollable_paging_get_static_delegate;
 
-     [return: MarshalAs(UnmanagedType.U1)] private delegate bool elm_interface_scrollable_bounce_animator_disabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void elm_interface_scrollable_paging_set_delegate(System.IntPtr obj, System.IntPtr pd,  double pagerel_h,  double pagerel_v,  int pagesize_h,  int pagesize_v);
 
+        
+        public delegate void elm_interface_scrollable_paging_set_api_delegate(System.IntPtr obj,  double pagerel_h,  double pagerel_v,  int pagesize_h,  int pagesize_v);
 
-     [return: MarshalAs(UnmanagedType.U1)] public delegate bool elm_interface_scrollable_bounce_animator_disabled_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_get_api_delegate> elm_interface_scrollable_bounce_animator_disabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_get_api_delegate>(_Module, "elm_interface_scrollable_bounce_animator_disabled_get");
-     private static bool bounce_animator_disabled_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_bounce_animator_disabled_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        bool _ret_var = default(bool);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetBounceAnimatorDisabled();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_set_api_delegate> elm_interface_scrollable_paging_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_set_api_delegate>(Module, "elm_interface_scrollable_paging_set");
+
+        private static void paging_set(System.IntPtr obj, System.IntPtr pd, double pagerel_h, double pagerel_v, int pagesize_h, int pagesize_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_paging_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPaging(pagerel_h, pagerel_v, pagesize_h, pagesize_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                                                        
+            }
+            else
+            {
+                elm_interface_scrollable_paging_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), pagerel_h, pagerel_v, pagesize_h, pagesize_v);
             }
+        }
+
+        private static elm_interface_scrollable_paging_set_delegate elm_interface_scrollable_paging_set_static_delegate;
+
+        
+        private delegate Elm.Scroller.SingleDirection elm_interface_scrollable_single_direction_get_delegate(System.IntPtr obj, System.IntPtr pd);
+
+        
+        public delegate Elm.Scroller.SingleDirection elm_interface_scrollable_single_direction_get_api_delegate(System.IntPtr obj);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_get_api_delegate> elm_interface_scrollable_single_direction_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_get_api_delegate>(Module, "elm_interface_scrollable_single_direction_get");
+
+        private static Elm.Scroller.SingleDirection single_direction_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_single_direction_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Elm.Scroller.SingleDirection _ret_var = default(Elm.Scroller.SingleDirection);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetSingleDirection();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
         return _ret_var;
-        } else {
-            return elm_interface_scrollable_bounce_animator_disabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+
+            }
+            else
+            {
+                return elm_interface_scrollable_single_direction_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_bounce_animator_disabled_get_delegate elm_interface_scrollable_bounce_animator_disabled_get_static_delegate;
 
+        private static elm_interface_scrollable_single_direction_get_delegate elm_interface_scrollable_single_direction_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_single_direction_set_delegate(System.IntPtr obj, System.IntPtr pd,  Elm.Scroller.SingleDirection single_dir);
+
+        
+        public delegate void elm_interface_scrollable_single_direction_set_api_delegate(System.IntPtr obj,  Elm.Scroller.SingleDirection single_dir);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_set_api_delegate> elm_interface_scrollable_single_direction_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_set_api_delegate>(Module, "elm_interface_scrollable_single_direction_set");
+
+        private static void single_direction_set(System.IntPtr obj, System.IntPtr pd, Elm.Scroller.SingleDirection single_dir)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_single_direction_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetSingleDirection(single_dir);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_single_direction_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), single_dir);
+            }
+        }
+
+        private static elm_interface_scrollable_single_direction_set_delegate elm_interface_scrollable_single_direction_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_step_size_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y);
+
+        
+        public delegate void elm_interface_scrollable_step_size_get_api_delegate(System.IntPtr obj,  out int x,  out int y);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_get_api_delegate> elm_interface_scrollable_step_size_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_get_api_delegate>(Module, "elm_interface_scrollable_step_size_get");
+
+        private static void step_size_get(System.IntPtr obj, System.IntPtr pd, out int x, out int y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_step_size_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        x = default(int);        y = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetStepSize(out x, out y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_step_size_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out x, out y);
+            }
+        }
+
+        private static elm_interface_scrollable_step_size_get_delegate elm_interface_scrollable_step_size_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_step_size_set_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y);
+
+        
+        public delegate void elm_interface_scrollable_step_size_set_api_delegate(System.IntPtr obj,  int x,  int y);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_set_api_delegate> elm_interface_scrollable_step_size_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_set_api_delegate>(Module, "elm_interface_scrollable_step_size_set");
+
+        private static void step_size_set(System.IntPtr obj, System.IntPtr pd, int x, int y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_step_size_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetStepSize(x, y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_step_size_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y);
+            }
+        }
+
+        private static elm_interface_scrollable_step_size_set_delegate elm_interface_scrollable_step_size_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_content_loop_get_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] out bool loop_h, [MarshalAs(UnmanagedType.U1)] out bool loop_v);
+
+        
+        public delegate void elm_interface_scrollable_content_loop_get_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] out bool loop_h, [MarshalAs(UnmanagedType.U1)] out bool loop_v);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_get_api_delegate> elm_interface_scrollable_content_loop_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_get_api_delegate>(Module, "elm_interface_scrollable_content_loop_get");
+
+        private static void content_loop_get(System.IntPtr obj, System.IntPtr pd, out bool loop_h, out bool loop_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_loop_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        loop_h = default(bool);        loop_v = default(bool);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetContentLoop(out loop_h, out loop_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_loop_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out loop_h, out loop_v);
+            }
+        }
+
+        private static elm_interface_scrollable_content_loop_get_delegate elm_interface_scrollable_content_loop_get_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_content_loop_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool loop_h, [MarshalAs(UnmanagedType.U1)] bool loop_v);
+
+        
+        public delegate void elm_interface_scrollable_content_loop_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool loop_h, [MarshalAs(UnmanagedType.U1)] bool loop_v);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_set_api_delegate> elm_interface_scrollable_content_loop_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_set_api_delegate>(Module, "elm_interface_scrollable_content_loop_set");
+
+        private static void content_loop_set(System.IntPtr obj, System.IntPtr pd, bool loop_h, bool loop_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_loop_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetContentLoop(loop_h, loop_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_loop_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), loop_h, loop_v);
+            }
+        }
+
+        private static elm_interface_scrollable_content_loop_set_delegate elm_interface_scrollable_content_loop_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_scroll_up_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_up_cb);
+
+        
+        public delegate void elm_interface_scrollable_scroll_up_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_up_cb);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_up_cb_set_api_delegate> elm_interface_scrollable_scroll_up_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_up_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_up_cb_set");
+
+        private static void scroll_up_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_up_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_up_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollUpCb(scroll_up_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_up_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_up_cb);
+            }
+        }
+
+        private static elm_interface_scrollable_scroll_up_cb_set_delegate elm_interface_scrollable_scroll_up_cb_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_hbar_drag_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb hbar_drag_cb);
+
+        
+        public delegate void elm_interface_scrollable_hbar_drag_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb hbar_drag_cb);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_drag_cb_set_api_delegate> elm_interface_scrollable_hbar_drag_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_drag_cb_set_api_delegate>(Module, "elm_interface_scrollable_hbar_drag_cb_set");
+
+        private static void hbar_drag_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb hbar_drag_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_hbar_drag_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetHbarDragCb(hbar_drag_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_hbar_drag_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), hbar_drag_cb);
+            }
+        }
+
+        private static elm_interface_scrollable_hbar_drag_cb_set_delegate elm_interface_scrollable_hbar_drag_cb_set_static_delegate;
+
+        
+        private delegate void elm_interface_scrollable_drag_start_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb drag_start_cb);
+
+        
+        public delegate void elm_interface_scrollable_drag_start_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb drag_start_cb);
 
-     private delegate void elm_interface_scrollable_bounce_animator_disabled_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool disabled);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_start_cb_set_api_delegate> elm_interface_scrollable_drag_start_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_start_cb_set_api_delegate>(Module, "elm_interface_scrollable_drag_start_cb_set");
 
+        private static void drag_start_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb drag_start_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_drag_start_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetDragStartCb(drag_start_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-     public delegate void elm_interface_scrollable_bounce_animator_disabled_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool disabled);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_set_api_delegate> elm_interface_scrollable_bounce_animator_disabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_bounce_animator_disabled_set_api_delegate>(_Module, "elm_interface_scrollable_bounce_animator_disabled_set");
-     private static void bounce_animator_disabled_set(System.IntPtr obj, System.IntPtr pd,  bool disabled)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_bounce_animator_disabled_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetBounceAnimatorDisabled( disabled);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_drag_start_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), drag_start_cb);
             }
-                                } else {
-            elm_interface_scrollable_bounce_animator_disabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  disabled);
         }
-    }
-    private static elm_interface_scrollable_bounce_animator_disabled_set_delegate elm_interface_scrollable_bounce_animator_disabled_set_static_delegate;
 
+        private static elm_interface_scrollable_drag_start_cb_set_delegate elm_interface_scrollable_drag_start_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_scroll_limit_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int page_limit_h,   out int page_limit_v);
+        
+        private delegate void elm_interface_scrollable_scroll_start_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_start_cb);
 
+        
+        public delegate void elm_interface_scrollable_scroll_start_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_start_cb);
 
-     public delegate void elm_interface_scrollable_page_scroll_limit_get_api_delegate(System.IntPtr obj,   out int page_limit_h,   out int page_limit_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_get_api_delegate> elm_interface_scrollable_page_scroll_limit_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_get_api_delegate>(_Module, "elm_interface_scrollable_page_scroll_limit_get");
-     private static void page_scroll_limit_get(System.IntPtr obj, System.IntPtr pd,  out int page_limit_h,  out int page_limit_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_scroll_limit_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    page_limit_h = default(int);        page_limit_v = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetPageScrollLimit( out page_limit_h,  out page_limit_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_start_cb_set_api_delegate> elm_interface_scrollable_scroll_start_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_start_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_start_cb_set");
+
+        private static void scroll_start_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_start_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_start_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollStartCb(scroll_start_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_start_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_start_cb);
             }
-                                                } else {
-            elm_interface_scrollable_page_scroll_limit_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out page_limit_h,  out page_limit_v);
         }
-    }
-    private static elm_interface_scrollable_page_scroll_limit_get_delegate elm_interface_scrollable_page_scroll_limit_get_static_delegate;
 
+        private static elm_interface_scrollable_scroll_start_cb_set_delegate elm_interface_scrollable_scroll_start_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_scroll_limit_set_delegate(System.IntPtr obj, System.IntPtr pd,   int page_limit_h,   int page_limit_v);
+        
+        private delegate void elm_interface_scrollable_freeze_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool freeze);
 
+        
+        public delegate void elm_interface_scrollable_freeze_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool freeze);
 
-     public delegate void elm_interface_scrollable_page_scroll_limit_set_api_delegate(System.IntPtr obj,   int page_limit_h,   int page_limit_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_set_api_delegate> elm_interface_scrollable_page_scroll_limit_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_scroll_limit_set_api_delegate>(_Module, "elm_interface_scrollable_page_scroll_limit_set");
-     private static void page_scroll_limit_set(System.IntPtr obj, System.IntPtr pd,  int page_limit_h,  int page_limit_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_scroll_limit_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPageScrollLimit( page_limit_h,  page_limit_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_freeze_set_api_delegate> elm_interface_scrollable_freeze_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_freeze_set_api_delegate>(Module, "elm_interface_scrollable_freeze_set");
+
+        private static void freeze_set(System.IntPtr obj, System.IntPtr pd, bool freeze)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_freeze_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetFreeze(freeze);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_freeze_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), freeze);
             }
-                                                } else {
-            elm_interface_scrollable_page_scroll_limit_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  page_limit_h,  page_limit_v);
         }
-    }
-    private static elm_interface_scrollable_page_scroll_limit_set_delegate elm_interface_scrollable_page_scroll_limit_set_static_delegate;
 
+        private static elm_interface_scrollable_freeze_set_delegate elm_interface_scrollable_freeze_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_snap_allow_get_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  out bool horiz,  [MarshalAs(UnmanagedType.U1)]  out bool vert);
+        
+        private delegate void elm_interface_scrollable_content_viewport_resize_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableResizeCb viewport_resize_cb);
 
+        
+        public delegate void elm_interface_scrollable_content_viewport_resize_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableResizeCb viewport_resize_cb);
 
-     public delegate void elm_interface_scrollable_page_snap_allow_get_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  out bool horiz,  [MarshalAs(UnmanagedType.U1)]  out bool vert);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_get_api_delegate> elm_interface_scrollable_page_snap_allow_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_get_api_delegate>(_Module, "elm_interface_scrollable_page_snap_allow_get");
-     private static void page_snap_allow_get(System.IntPtr obj, System.IntPtr pd,  out bool horiz,  out bool vert)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_snap_allow_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    horiz = default(bool);        vert = default(bool);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetPageSnapAllow( out horiz,  out vert);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_resize_cb_set_api_delegate> elm_interface_scrollable_content_viewport_resize_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_resize_cb_set_api_delegate>(Module, "elm_interface_scrollable_content_viewport_resize_cb_set");
+
+        private static void content_viewport_resize_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableResizeCb viewport_resize_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_viewport_resize_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetContentViewportResizeCb(viewport_resize_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_viewport_resize_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), viewport_resize_cb);
             }
-                                                } else {
-            elm_interface_scrollable_page_snap_allow_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out horiz,  out vert);
         }
-    }
-    private static elm_interface_scrollable_page_snap_allow_get_delegate elm_interface_scrollable_page_snap_allow_get_static_delegate;
 
+        private static elm_interface_scrollable_content_viewport_resize_cb_set_delegate elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_snap_allow_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool horiz,  [MarshalAs(UnmanagedType.U1)]  bool vert);
+        
+        private delegate void elm_interface_scrollable_scroll_left_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_left_cb);
 
+        
+        public delegate void elm_interface_scrollable_scroll_left_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_left_cb);
 
-     public delegate void elm_interface_scrollable_page_snap_allow_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool horiz,  [MarshalAs(UnmanagedType.U1)]  bool vert);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_set_api_delegate> elm_interface_scrollable_page_snap_allow_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_snap_allow_set_api_delegate>(_Module, "elm_interface_scrollable_page_snap_allow_set");
-     private static void page_snap_allow_set(System.IntPtr obj, System.IntPtr pd,  bool horiz,  bool vert)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_snap_allow_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPageSnapAllow( horiz,  vert);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_left_cb_set_api_delegate> elm_interface_scrollable_scroll_left_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_left_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_left_cb_set");
+
+        private static void scroll_left_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_left_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_left_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollLeftCb(scroll_left_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_left_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_left_cb);
             }
-                                                } else {
-            elm_interface_scrollable_page_snap_allow_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  horiz,  vert);
         }
-    }
-    private static elm_interface_scrollable_page_snap_allow_set_delegate elm_interface_scrollable_page_snap_allow_set_static_delegate;
 
+        private static elm_interface_scrollable_scroll_left_cb_set_delegate elm_interface_scrollable_scroll_left_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_paging_get_delegate(System.IntPtr obj, System.IntPtr pd,   out double pagerel_h,   out double pagerel_v,   out int pagesize_h,   out int pagesize_v);
+        
+        private delegate void elm_interface_scrollable_vbar_press_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb vbar_press_cb);
 
+        
+        public delegate void elm_interface_scrollable_vbar_press_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb vbar_press_cb);
 
-     public delegate void elm_interface_scrollable_paging_get_api_delegate(System.IntPtr obj,   out double pagerel_h,   out double pagerel_v,   out int pagesize_h,   out int pagesize_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_get_api_delegate> elm_interface_scrollable_paging_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_get_api_delegate>(_Module, "elm_interface_scrollable_paging_get");
-     private static void paging_get(System.IntPtr obj, System.IntPtr pd,  out double pagerel_h,  out double pagerel_v,  out int pagesize_h,  out int pagesize_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_paging_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                    pagerel_h = default(double);        pagerel_v = default(double);        pagesize_h = default(int);        pagesize_v = default(int);                                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetPaging( out pagerel_h,  out pagerel_v,  out pagesize_h,  out pagesize_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_press_cb_set_api_delegate> elm_interface_scrollable_vbar_press_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_press_cb_set_api_delegate>(Module, "elm_interface_scrollable_vbar_press_cb_set");
+
+        private static void vbar_press_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb vbar_press_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_vbar_press_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetVbarPressCb(vbar_press_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_vbar_press_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), vbar_press_cb);
             }
-                                                                                } else {
-            elm_interface_scrollable_paging_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out pagerel_h,  out pagerel_v,  out pagesize_h,  out pagesize_v);
         }
-    }
-    private static elm_interface_scrollable_paging_get_delegate elm_interface_scrollable_paging_get_static_delegate;
 
+        private static elm_interface_scrollable_vbar_press_cb_set_delegate elm_interface_scrollable_vbar_press_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_paging_set_delegate(System.IntPtr obj, System.IntPtr pd,   double pagerel_h,   double pagerel_v,   int pagesize_h,   int pagesize_v);
+        
+        private delegate void elm_interface_scrollable_hbar_press_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb hbar_press_cb);
 
+        
+        public delegate void elm_interface_scrollable_hbar_press_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb hbar_press_cb);
 
-     public delegate void elm_interface_scrollable_paging_set_api_delegate(System.IntPtr obj,   double pagerel_h,   double pagerel_v,   int pagesize_h,   int pagesize_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_set_api_delegate> elm_interface_scrollable_paging_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_paging_set_api_delegate>(_Module, "elm_interface_scrollable_paging_set");
-     private static void paging_set(System.IntPtr obj, System.IntPtr pd,  double pagerel_h,  double pagerel_v,  int pagesize_h,  int pagesize_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_paging_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPaging( pagerel_h,  pagerel_v,  pagesize_h,  pagesize_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_press_cb_set_api_delegate> elm_interface_scrollable_hbar_press_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_press_cb_set_api_delegate>(Module, "elm_interface_scrollable_hbar_press_cb_set");
+
+        private static void hbar_press_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb hbar_press_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_hbar_press_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetHbarPressCb(hbar_press_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_hbar_press_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), hbar_press_cb);
             }
-                                                                                } else {
-            elm_interface_scrollable_paging_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  pagerel_h,  pagerel_v,  pagesize_h,  pagesize_v);
         }
-    }
-    private static elm_interface_scrollable_paging_set_delegate elm_interface_scrollable_paging_set_static_delegate;
 
+        private static elm_interface_scrollable_hbar_press_cb_set_delegate elm_interface_scrollable_hbar_press_cb_set_static_delegate;
 
-     private delegate Elm.Scroller.SingleDirection elm_interface_scrollable_single_direction_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void elm_interface_scrollable_hbar_unpress_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb hbar_unpress_cb);
 
+        
+        public delegate void elm_interface_scrollable_hbar_unpress_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb hbar_unpress_cb);
 
-     public delegate Elm.Scroller.SingleDirection elm_interface_scrollable_single_direction_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_get_api_delegate> elm_interface_scrollable_single_direction_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_get_api_delegate>(_Module, "elm_interface_scrollable_single_direction_get");
-     private static Elm.Scroller.SingleDirection single_direction_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_single_direction_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Elm.Scroller.SingleDirection _ret_var = default(Elm.Scroller.SingleDirection);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetSingleDirection();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_unpress_cb_set_api_delegate> elm_interface_scrollable_hbar_unpress_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_unpress_cb_set_api_delegate>(Module, "elm_interface_scrollable_hbar_unpress_cb_set");
+
+        private static void hbar_unpress_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb hbar_unpress_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_hbar_unpress_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetHbarUnpressCb(hbar_unpress_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_hbar_unpress_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), hbar_unpress_cb);
             }
-        return _ret_var;
-        } else {
-            return elm_interface_scrollable_single_direction_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
         }
-    }
-    private static elm_interface_scrollable_single_direction_get_delegate elm_interface_scrollable_single_direction_get_static_delegate;
 
+        private static elm_interface_scrollable_hbar_unpress_cb_set_delegate elm_interface_scrollable_hbar_unpress_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_single_direction_set_delegate(System.IntPtr obj, System.IntPtr pd,   Elm.Scroller.SingleDirection single_dir);
+        
+        private delegate void elm_interface_scrollable_drag_stop_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb drag_stop_cb);
 
+        
+        public delegate void elm_interface_scrollable_drag_stop_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb drag_stop_cb);
 
-     public delegate void elm_interface_scrollable_single_direction_set_api_delegate(System.IntPtr obj,   Elm.Scroller.SingleDirection single_dir);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_set_api_delegate> elm_interface_scrollable_single_direction_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_single_direction_set_api_delegate>(_Module, "elm_interface_scrollable_single_direction_set");
-     private static void single_direction_set(System.IntPtr obj, System.IntPtr pd,  Elm.Scroller.SingleDirection single_dir)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_single_direction_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetSingleDirection( single_dir);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_stop_cb_set_api_delegate> elm_interface_scrollable_drag_stop_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_stop_cb_set_api_delegate>(Module, "elm_interface_scrollable_drag_stop_cb_set");
+
+        private static void drag_stop_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb drag_stop_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_drag_stop_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetDragStopCb(drag_stop_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_drag_stop_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), drag_stop_cb);
             }
-                                } else {
-            elm_interface_scrollable_single_direction_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  single_dir);
         }
-    }
-    private static elm_interface_scrollable_single_direction_set_delegate elm_interface_scrollable_single_direction_set_static_delegate;
 
+        private static elm_interface_scrollable_drag_stop_cb_set_delegate elm_interface_scrollable_drag_stop_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_step_size_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int x,   out int y);
+        
+        private delegate void elm_interface_scrollable_scroll_stop_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_stop_cb);
 
+        
+        public delegate void elm_interface_scrollable_scroll_stop_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_stop_cb);
 
-     public delegate void elm_interface_scrollable_step_size_get_api_delegate(System.IntPtr obj,   out int x,   out int y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_get_api_delegate> elm_interface_scrollable_step_size_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_get_api_delegate>(_Module, "elm_interface_scrollable_step_size_get");
-     private static void step_size_get(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_step_size_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    x = default(int);        y = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetStepSize( out x,  out y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_stop_cb_set_api_delegate> elm_interface_scrollable_scroll_stop_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_stop_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_stop_cb_set");
+
+        private static void scroll_stop_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_stop_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_stop_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollStopCb(scroll_stop_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_stop_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_stop_cb);
             }
-                                                } else {
-            elm_interface_scrollable_step_size_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out x,  out y);
         }
-    }
-    private static elm_interface_scrollable_step_size_get_delegate elm_interface_scrollable_step_size_get_static_delegate;
 
+        private static elm_interface_scrollable_scroll_stop_cb_set_delegate elm_interface_scrollable_scroll_stop_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_step_size_set_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y);
+        
+        private delegate void elm_interface_scrollable_extern_pan_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object pan);
 
+        
+        public delegate void elm_interface_scrollable_extern_pan_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object pan);
 
-     public delegate void elm_interface_scrollable_step_size_set_api_delegate(System.IntPtr obj,   int x,   int y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_set_api_delegate> elm_interface_scrollable_step_size_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_step_size_set_api_delegate>(_Module, "elm_interface_scrollable_step_size_set");
-     private static void step_size_set(System.IntPtr obj, System.IntPtr pd,  int x,  int y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_step_size_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetStepSize( x,  y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_extern_pan_set_api_delegate> elm_interface_scrollable_extern_pan_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_extern_pan_set_api_delegate>(Module, "elm_interface_scrollable_extern_pan_set");
+
+        private static void extern_pan_set(System.IntPtr obj, System.IntPtr pd, Efl.Canvas.Object pan)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_extern_pan_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetExternPan(pan);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_extern_pan_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), pan);
             }
-                                                } else {
-            elm_interface_scrollable_step_size_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y);
         }
-    }
-    private static elm_interface_scrollable_step_size_set_delegate elm_interface_scrollable_step_size_set_static_delegate;
 
+        private static elm_interface_scrollable_extern_pan_set_delegate elm_interface_scrollable_extern_pan_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_loop_get_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  out bool loop_h,  [MarshalAs(UnmanagedType.U1)]  out bool loop_v);
+        
+        private delegate void elm_interface_scrollable_page_change_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb page_change_cb);
 
+        
+        public delegate void elm_interface_scrollable_page_change_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb page_change_cb);
 
-     public delegate void elm_interface_scrollable_content_loop_get_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  out bool loop_h,  [MarshalAs(UnmanagedType.U1)]  out bool loop_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_get_api_delegate> elm_interface_scrollable_content_loop_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_get_api_delegate>(_Module, "elm_interface_scrollable_content_loop_get");
-     private static void content_loop_get(System.IntPtr obj, System.IntPtr pd,  out bool loop_h,  out bool loop_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_loop_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    loop_h = default(bool);        loop_v = default(bool);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetContentLoop( out loop_h,  out loop_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_change_cb_set_api_delegate> elm_interface_scrollable_page_change_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_change_cb_set_api_delegate>(Module, "elm_interface_scrollable_page_change_cb_set");
+
+        private static void page_change_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb page_change_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_change_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPageChangeCb(page_change_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_change_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), page_change_cb);
             }
-                                                } else {
-            elm_interface_scrollable_content_loop_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out loop_h,  out loop_v);
         }
-    }
-    private static elm_interface_scrollable_content_loop_get_delegate elm_interface_scrollable_content_loop_get_static_delegate;
 
+        private static elm_interface_scrollable_page_change_cb_set_delegate elm_interface_scrollable_page_change_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_loop_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool loop_h,  [MarshalAs(UnmanagedType.U1)]  bool loop_v);
+        
+        private delegate void elm_interface_scrollable_hold_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool hold);
 
+        
+        public delegate void elm_interface_scrollable_hold_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool hold);
 
-     public delegate void elm_interface_scrollable_content_loop_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool loop_h,  [MarshalAs(UnmanagedType.U1)]  bool loop_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_set_api_delegate> elm_interface_scrollable_content_loop_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_loop_set_api_delegate>(_Module, "elm_interface_scrollable_content_loop_set");
-     private static void content_loop_set(System.IntPtr obj, System.IntPtr pd,  bool loop_h,  bool loop_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_loop_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetContentLoop( loop_h,  loop_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hold_set_api_delegate> elm_interface_scrollable_hold_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hold_set_api_delegate>(Module, "elm_interface_scrollable_hold_set");
+
+        private static void hold_set(System.IntPtr obj, System.IntPtr pd, bool hold)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_hold_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetHold(hold);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_hold_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), hold);
             }
-                                                } else {
-            elm_interface_scrollable_content_loop_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  loop_h,  loop_v);
         }
-    }
-    private static elm_interface_scrollable_content_loop_set_delegate elm_interface_scrollable_content_loop_set_static_delegate;
 
+        private static elm_interface_scrollable_hold_set_delegate elm_interface_scrollable_hold_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_scroll_up_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_up_cb);
+        
+        private delegate void elm_interface_scrollable_animate_start_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb animate_start_cb);
 
+        
+        public delegate void elm_interface_scrollable_animate_start_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb animate_start_cb);
 
-     public delegate void elm_interface_scrollable_scroll_up_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_up_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_up_cb_set_api_delegate> elm_interface_scrollable_scroll_up_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_up_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_up_cb_set");
-     private static void scroll_up_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_up_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_up_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollUpCb( scroll_up_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_start_cb_set_api_delegate> elm_interface_scrollable_animate_start_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_start_cb_set_api_delegate>(Module, "elm_interface_scrollable_animate_start_cb_set");
+
+        private static void animate_start_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb animate_start_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_animate_start_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetAnimateStartCb(animate_start_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_animate_start_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), animate_start_cb);
             }
-                                } else {
-            elm_interface_scrollable_scroll_up_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_up_cb);
         }
-    }
-    private static elm_interface_scrollable_scroll_up_cb_set_delegate elm_interface_scrollable_scroll_up_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_animate_start_cb_set_delegate elm_interface_scrollable_animate_start_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_hbar_drag_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb hbar_drag_cb);
+        
+        private delegate void elm_interface_scrollable_scroll_down_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_down_cb);
 
+        
+        public delegate void elm_interface_scrollable_scroll_down_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_down_cb);
 
-     public delegate void elm_interface_scrollable_hbar_drag_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb hbar_drag_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_drag_cb_set_api_delegate> elm_interface_scrollable_hbar_drag_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_drag_cb_set_api_delegate>(_Module, "elm_interface_scrollable_hbar_drag_cb_set");
-     private static void hbar_drag_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb hbar_drag_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_hbar_drag_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetHbarDragCb( hbar_drag_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_down_cb_set_api_delegate> elm_interface_scrollable_scroll_down_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_down_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_down_cb_set");
+
+        private static void scroll_down_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_down_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_down_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollDownCb(scroll_down_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_down_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_down_cb);
             }
-                                } else {
-            elm_interface_scrollable_hbar_drag_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  hbar_drag_cb);
         }
-    }
-    private static elm_interface_scrollable_hbar_drag_cb_set_delegate elm_interface_scrollable_hbar_drag_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_scroll_down_cb_set_delegate elm_interface_scrollable_scroll_down_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_drag_start_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb drag_start_cb);
+        
+        private delegate void elm_interface_scrollable_page_relative_set_delegate(System.IntPtr obj, System.IntPtr pd,  double h_pagerel,  double v_pagerel);
 
+        
+        public delegate void elm_interface_scrollable_page_relative_set_api_delegate(System.IntPtr obj,  double h_pagerel,  double v_pagerel);
 
-     public delegate void elm_interface_scrollable_drag_start_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb drag_start_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_start_cb_set_api_delegate> elm_interface_scrollable_drag_start_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_start_cb_set_api_delegate>(_Module, "elm_interface_scrollable_drag_start_cb_set");
-     private static void drag_start_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb drag_start_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_drag_start_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetDragStartCb( drag_start_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_relative_set_api_delegate> elm_interface_scrollable_page_relative_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_relative_set_api_delegate>(Module, "elm_interface_scrollable_page_relative_set");
+
+        private static void page_relative_set(System.IntPtr obj, System.IntPtr pd, double h_pagerel, double v_pagerel)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_relative_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetPageRelative(h_pagerel, v_pagerel);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_relative_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), h_pagerel, v_pagerel);
             }
-                                } else {
-            elm_interface_scrollable_drag_start_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  drag_start_cb);
         }
-    }
-    private static elm_interface_scrollable_drag_start_cb_set_delegate elm_interface_scrollable_drag_start_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_page_relative_set_delegate elm_interface_scrollable_page_relative_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_scroll_start_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_start_cb);
+        
+        private delegate void elm_interface_scrollable_scroll_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_cb);
 
+        
+        public delegate void elm_interface_scrollable_scroll_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_cb);
 
-     public delegate void elm_interface_scrollable_scroll_start_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_start_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_start_cb_set_api_delegate> elm_interface_scrollable_scroll_start_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_start_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_start_cb_set");
-     private static void scroll_start_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_start_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_start_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollStartCb( scroll_start_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_cb_set_api_delegate> elm_interface_scrollable_scroll_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_cb_set");
+
+        private static void scroll_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollCb(scroll_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_cb);
             }
-                                } else {
-            elm_interface_scrollable_scroll_start_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_start_cb);
         }
-    }
-    private static elm_interface_scrollable_scroll_start_cb_set_delegate elm_interface_scrollable_scroll_start_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_scroll_cb_set_delegate elm_interface_scrollable_scroll_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_freeze_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool freeze);
+        
+        private delegate void elm_interface_scrollable_animate_stop_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb animate_stop_cb);
 
+        
+        public delegate void elm_interface_scrollable_animate_stop_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb animate_stop_cb);
 
-     public delegate void elm_interface_scrollable_freeze_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool freeze);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_freeze_set_api_delegate> elm_interface_scrollable_freeze_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_freeze_set_api_delegate>(_Module, "elm_interface_scrollable_freeze_set");
-     private static void freeze_set(System.IntPtr obj, System.IntPtr pd,  bool freeze)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_freeze_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetFreeze( freeze);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_stop_cb_set_api_delegate> elm_interface_scrollable_animate_stop_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_stop_cb_set_api_delegate>(Module, "elm_interface_scrollable_animate_stop_cb_set");
+
+        private static void animate_stop_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb animate_stop_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_animate_stop_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetAnimateStopCb(animate_stop_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_animate_stop_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), animate_stop_cb);
             }
-                                } else {
-            elm_interface_scrollable_freeze_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  freeze);
         }
-    }
-    private static elm_interface_scrollable_freeze_set_delegate elm_interface_scrollable_freeze_set_static_delegate;
 
+        private static elm_interface_scrollable_animate_stop_cb_set_delegate elm_interface_scrollable_animate_stop_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_viewport_resize_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableResizeCb viewport_resize_cb);
+        
+        private delegate void elm_interface_scrollable_content_min_limit_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableMinLimitCb min_limit_cb);
 
+        
+        public delegate void elm_interface_scrollable_content_min_limit_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableMinLimitCb min_limit_cb);
 
-     public delegate void elm_interface_scrollable_content_viewport_resize_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableResizeCb viewport_resize_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_resize_cb_set_api_delegate> elm_interface_scrollable_content_viewport_resize_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_resize_cb_set_api_delegate>(_Module, "elm_interface_scrollable_content_viewport_resize_cb_set");
-     private static void content_viewport_resize_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableResizeCb viewport_resize_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_viewport_resize_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetContentViewportResizeCb( viewport_resize_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_cb_set_api_delegate> elm_interface_scrollable_content_min_limit_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_cb_set_api_delegate>(Module, "elm_interface_scrollable_content_min_limit_cb_set");
+
+        private static void content_min_limit_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableMinLimitCb min_limit_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_min_limit_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetContentMinLimitCb(min_limit_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_min_limit_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), min_limit_cb);
             }
-                                } else {
-            elm_interface_scrollable_content_viewport_resize_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  viewport_resize_cb);
         }
-    }
-    private static elm_interface_scrollable_content_viewport_resize_cb_set_delegate elm_interface_scrollable_content_viewport_resize_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_content_min_limit_cb_set_delegate elm_interface_scrollable_content_min_limit_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_scroll_left_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_left_cb);
+        
+        private delegate void elm_interface_scrollable_scroll_right_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_right_cb);
 
+        
+        public delegate void elm_interface_scrollable_scroll_right_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb scroll_right_cb);
 
-     public delegate void elm_interface_scrollable_scroll_left_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_left_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_left_cb_set_api_delegate> elm_interface_scrollable_scroll_left_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_left_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_left_cb_set");
-     private static void scroll_left_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_left_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_left_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollLeftCb( scroll_left_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_right_cb_set_api_delegate> elm_interface_scrollable_scroll_right_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_right_cb_set_api_delegate>(Module, "elm_interface_scrollable_scroll_right_cb_set");
+
+        private static void scroll_right_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb scroll_right_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_scroll_right_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollRightCb(scroll_right_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_scroll_right_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), scroll_right_cb);
             }
-                                } else {
-            elm_interface_scrollable_scroll_left_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_left_cb);
         }
-    }
-    private static elm_interface_scrollable_scroll_left_cb_set_delegate elm_interface_scrollable_scroll_left_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_scroll_right_cb_set_delegate elm_interface_scrollable_scroll_right_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_vbar_press_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb vbar_press_cb);
+        
+        private delegate void elm_interface_scrollable_content_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object content);
 
+        
+        public delegate void elm_interface_scrollable_content_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object content);
 
-     public delegate void elm_interface_scrollable_vbar_press_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb vbar_press_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_press_cb_set_api_delegate> elm_interface_scrollable_vbar_press_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_press_cb_set_api_delegate>(_Module, "elm_interface_scrollable_vbar_press_cb_set");
-     private static void vbar_press_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb vbar_press_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_vbar_press_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetVbarPressCb( vbar_press_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_set_api_delegate> elm_interface_scrollable_content_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_set_api_delegate>(Module, "elm_interface_scrollable_content_set");
+
+        private static void scrollable_content_set(System.IntPtr obj, System.IntPtr pd, Efl.Canvas.Object content)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetScrollableContent(content);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), content);
             }
-                                } else {
-            elm_interface_scrollable_vbar_press_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  vbar_press_cb);
         }
-    }
-    private static elm_interface_scrollable_vbar_press_cb_set_delegate elm_interface_scrollable_vbar_press_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_content_set_delegate elm_interface_scrollable_content_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_hbar_press_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb hbar_press_cb);
+        
+        private delegate void elm_interface_scrollable_edge_left_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_left_cb);
 
+        
+        public delegate void elm_interface_scrollable_edge_left_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb edge_left_cb);
 
-     public delegate void elm_interface_scrollable_hbar_press_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb hbar_press_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_press_cb_set_api_delegate> elm_interface_scrollable_hbar_press_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_press_cb_set_api_delegate>(_Module, "elm_interface_scrollable_hbar_press_cb_set");
-     private static void hbar_press_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb hbar_press_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_hbar_press_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetHbarPressCb( hbar_press_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_left_cb_set_api_delegate> elm_interface_scrollable_edge_left_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_left_cb_set_api_delegate>(Module, "elm_interface_scrollable_edge_left_cb_set");
+
+        private static void edge_left_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb edge_left_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_edge_left_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetEdgeLeftCb(edge_left_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_edge_left_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), edge_left_cb);
             }
-                                } else {
-            elm_interface_scrollable_hbar_press_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  hbar_press_cb);
         }
-    }
-    private static elm_interface_scrollable_hbar_press_cb_set_delegate elm_interface_scrollable_hbar_press_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_edge_left_cb_set_delegate elm_interface_scrollable_edge_left_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_hbar_unpress_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb hbar_unpress_cb);
+        
+        private delegate void elm_interface_scrollable_vbar_drag_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb vbar_drag_cb);
 
+        
+        public delegate void elm_interface_scrollable_vbar_drag_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb vbar_drag_cb);
 
-     public delegate void elm_interface_scrollable_hbar_unpress_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb hbar_unpress_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_unpress_cb_set_api_delegate> elm_interface_scrollable_hbar_unpress_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hbar_unpress_cb_set_api_delegate>(_Module, "elm_interface_scrollable_hbar_unpress_cb_set");
-     private static void hbar_unpress_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb hbar_unpress_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_hbar_unpress_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetHbarUnpressCb( hbar_unpress_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_drag_cb_set_api_delegate> elm_interface_scrollable_vbar_drag_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_drag_cb_set_api_delegate>(Module, "elm_interface_scrollable_vbar_drag_cb_set");
+
+        private static void vbar_drag_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb vbar_drag_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_vbar_drag_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetVbarDragCb(vbar_drag_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_vbar_drag_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), vbar_drag_cb);
             }
-                                } else {
-            elm_interface_scrollable_hbar_unpress_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  hbar_unpress_cb);
         }
-    }
-    private static elm_interface_scrollable_hbar_unpress_cb_set_delegate elm_interface_scrollable_hbar_unpress_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_vbar_drag_cb_set_delegate elm_interface_scrollable_vbar_drag_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_drag_stop_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb drag_stop_cb);
+        
+        private delegate void elm_interface_scrollable_vbar_unpress_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb vbar_unpress_cb);
 
+        
+        public delegate void elm_interface_scrollable_vbar_unpress_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb vbar_unpress_cb);
 
-     public delegate void elm_interface_scrollable_drag_stop_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb drag_stop_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_stop_cb_set_api_delegate> elm_interface_scrollable_drag_stop_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_drag_stop_cb_set_api_delegate>(_Module, "elm_interface_scrollable_drag_stop_cb_set");
-     private static void drag_stop_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb drag_stop_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_drag_stop_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetDragStopCb( drag_stop_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_unpress_cb_set_api_delegate> elm_interface_scrollable_vbar_unpress_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_unpress_cb_set_api_delegate>(Module, "elm_interface_scrollable_vbar_unpress_cb_set");
+
+        private static void vbar_unpress_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb vbar_unpress_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_vbar_unpress_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetVbarUnpressCb(vbar_unpress_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_vbar_unpress_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), vbar_unpress_cb);
             }
-                                } else {
-            elm_interface_scrollable_drag_stop_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  drag_stop_cb);
         }
-    }
-    private static elm_interface_scrollable_drag_stop_cb_set_delegate elm_interface_scrollable_drag_stop_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_vbar_unpress_cb_set_delegate elm_interface_scrollable_vbar_unpress_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_scroll_stop_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_stop_cb);
+        
+        private delegate void elm_interface_scrollable_edge_bottom_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_bottom_cb);
 
+        
+        public delegate void elm_interface_scrollable_edge_bottom_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb edge_bottom_cb);
 
-     public delegate void elm_interface_scrollable_scroll_stop_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_stop_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_stop_cb_set_api_delegate> elm_interface_scrollable_scroll_stop_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_stop_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_stop_cb_set");
-     private static void scroll_stop_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_stop_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_stop_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollStopCb( scroll_stop_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_bottom_cb_set_api_delegate> elm_interface_scrollable_edge_bottom_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_bottom_cb_set_api_delegate>(Module, "elm_interface_scrollable_edge_bottom_cb_set");
+
+        private static void edge_bottom_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb edge_bottom_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_edge_bottom_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetEdgeBottomCb(edge_bottom_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_edge_bottom_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), edge_bottom_cb);
             }
-                                } else {
-            elm_interface_scrollable_scroll_stop_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_stop_cb);
         }
-    }
-    private static elm_interface_scrollable_scroll_stop_cb_set_delegate elm_interface_scrollable_scroll_stop_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_edge_bottom_cb_set_delegate elm_interface_scrollable_edge_bottom_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_extern_pan_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object pan);
+        
+        private delegate void elm_interface_scrollable_edge_right_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_right_cb);
 
+        
+        public delegate void elm_interface_scrollable_edge_right_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb edge_right_cb);
 
-     public delegate void elm_interface_scrollable_extern_pan_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object pan);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_extern_pan_set_api_delegate> elm_interface_scrollable_extern_pan_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_extern_pan_set_api_delegate>(_Module, "elm_interface_scrollable_extern_pan_set");
-     private static void extern_pan_set(System.IntPtr obj, System.IntPtr pd,  Efl.Canvas.Object pan)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_extern_pan_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetExternPan( pan);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_right_cb_set_api_delegate> elm_interface_scrollable_edge_right_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_right_cb_set_api_delegate>(Module, "elm_interface_scrollable_edge_right_cb_set");
+
+        private static void edge_right_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb edge_right_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_edge_right_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetEdgeRightCb(edge_right_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_edge_right_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), edge_right_cb);
             }
-                                } else {
-            elm_interface_scrollable_extern_pan_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  pan);
         }
-    }
-    private static elm_interface_scrollable_extern_pan_set_delegate elm_interface_scrollable_extern_pan_set_static_delegate;
 
+        private static elm_interface_scrollable_edge_right_cb_set_delegate elm_interface_scrollable_edge_right_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_change_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb page_change_cb);
+        
+        private delegate void elm_interface_scrollable_edge_top_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_top_cb);
 
+        
+        public delegate void elm_interface_scrollable_edge_top_cb_set_api_delegate(System.IntPtr obj,  ElmInterfaceScrollableCb edge_top_cb);
 
-     public delegate void elm_interface_scrollable_page_change_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb page_change_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_change_cb_set_api_delegate> elm_interface_scrollable_page_change_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_change_cb_set_api_delegate>(_Module, "elm_interface_scrollable_page_change_cb_set");
-     private static void page_change_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb page_change_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_change_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPageChangeCb( page_change_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_top_cb_set_api_delegate> elm_interface_scrollable_edge_top_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_top_cb_set_api_delegate>(Module, "elm_interface_scrollable_edge_top_cb_set");
+
+        private static void edge_top_cb_set(System.IntPtr obj, System.IntPtr pd, ElmInterfaceScrollableCb edge_top_cb)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_edge_top_cb_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetEdgeTopCb(edge_top_cb);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_edge_top_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), edge_top_cb);
             }
-                                } else {
-            elm_interface_scrollable_page_change_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  page_change_cb);
         }
-    }
-    private static elm_interface_scrollable_page_change_cb_set_delegate elm_interface_scrollable_page_change_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_edge_top_cb_set_delegate elm_interface_scrollable_edge_top_cb_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_hold_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool hold);
+        
+        private delegate void elm_interface_scrollable_objects_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object edje_object, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object hit_rectangle);
 
+        
+        public delegate void elm_interface_scrollable_objects_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object edje_object, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Canvas.Object hit_rectangle);
 
-     public delegate void elm_interface_scrollable_hold_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool hold);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_hold_set_api_delegate> elm_interface_scrollable_hold_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_hold_set_api_delegate>(_Module, "elm_interface_scrollable_hold_set");
-     private static void hold_set(System.IntPtr obj, System.IntPtr pd,  bool hold)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_hold_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetHold( hold);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_objects_set_api_delegate> elm_interface_scrollable_objects_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_objects_set_api_delegate>(Module, "elm_interface_scrollable_objects_set");
+
+        private static void objects_set(System.IntPtr obj, System.IntPtr pd, Efl.Canvas.Object edje_object, Efl.Canvas.Object hit_rectangle)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_objects_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetObjects(edje_object, hit_rectangle);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_objects_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), edje_object, hit_rectangle);
             }
-                                } else {
-            elm_interface_scrollable_hold_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  hold);
         }
-    }
-    private static elm_interface_scrollable_hold_set_delegate elm_interface_scrollable_hold_set_static_delegate;
 
+        private static elm_interface_scrollable_objects_set_delegate elm_interface_scrollable_objects_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_animate_start_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb animate_start_cb);
+        
+        private delegate void elm_interface_scrollable_last_page_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int pagenumber_h,  out int pagenumber_v);
 
+        
+        public delegate void elm_interface_scrollable_last_page_get_api_delegate(System.IntPtr obj,  out int pagenumber_h,  out int pagenumber_v);
 
-     public delegate void elm_interface_scrollable_animate_start_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb animate_start_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_start_cb_set_api_delegate> elm_interface_scrollable_animate_start_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_start_cb_set_api_delegate>(_Module, "elm_interface_scrollable_animate_start_cb_set");
-     private static void animate_start_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb animate_start_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_animate_start_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetAnimateStartCb( animate_start_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_last_page_get_api_delegate> elm_interface_scrollable_last_page_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_last_page_get_api_delegate>(Module, "elm_interface_scrollable_last_page_get");
+
+        private static void last_page_get(System.IntPtr obj, System.IntPtr pd, out int pagenumber_h, out int pagenumber_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_last_page_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        pagenumber_h = default(int);        pagenumber_v = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetLastPage(out pagenumber_h, out pagenumber_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_last_page_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out pagenumber_h, out pagenumber_v);
             }
-                                } else {
-            elm_interface_scrollable_animate_start_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  animate_start_cb);
         }
-    }
-    private static elm_interface_scrollable_animate_start_cb_set_delegate elm_interface_scrollable_animate_start_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_last_page_get_delegate elm_interface_scrollable_last_page_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_scroll_down_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_down_cb);
+        
+        private delegate void elm_interface_scrollable_current_page_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int pagenumber_h,  out int pagenumber_v);
 
+        
+        public delegate void elm_interface_scrollable_current_page_get_api_delegate(System.IntPtr obj,  out int pagenumber_h,  out int pagenumber_v);
 
-     public delegate void elm_interface_scrollable_scroll_down_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_down_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_down_cb_set_api_delegate> elm_interface_scrollable_scroll_down_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_down_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_down_cb_set");
-     private static void scroll_down_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_down_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_down_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollDownCb( scroll_down_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_current_page_get_api_delegate> elm_interface_scrollable_current_page_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_current_page_get_api_delegate>(Module, "elm_interface_scrollable_current_page_get");
+
+        private static void current_page_get(System.IntPtr obj, System.IntPtr pd, out int pagenumber_h, out int pagenumber_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_current_page_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        pagenumber_h = default(int);        pagenumber_v = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetCurrentPage(out pagenumber_h, out pagenumber_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_current_page_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out pagenumber_h, out pagenumber_v);
             }
-                                } else {
-            elm_interface_scrollable_scroll_down_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_down_cb);
         }
-    }
-    private static elm_interface_scrollable_scroll_down_cb_set_delegate elm_interface_scrollable_scroll_down_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_current_page_get_delegate elm_interface_scrollable_current_page_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_relative_set_delegate(System.IntPtr obj, System.IntPtr pd,   double h_pagerel,   double v_pagerel);
+        
+        private delegate void elm_interface_scrollable_content_viewport_geometry_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y,  out int w,  out int h);
 
+        
+        public delegate void elm_interface_scrollable_content_viewport_geometry_get_api_delegate(System.IntPtr obj,  out int x,  out int y,  out int w,  out int h);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_geometry_get_api_delegate> elm_interface_scrollable_content_viewport_geometry_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_geometry_get_api_delegate>(Module, "elm_interface_scrollable_content_viewport_geometry_get");
+
+        private static void content_viewport_geometry_get(System.IntPtr obj, System.IntPtr pd, out int x, out int y, out int w, out int h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_viewport_geometry_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                        x = default(int);        y = default(int);        w = default(int);        h = default(int);                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetContentViewportGeometry(out x, out y, out w, out h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-     public delegate void elm_interface_scrollable_page_relative_set_api_delegate(System.IntPtr obj,   double h_pagerel,   double v_pagerel);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_relative_set_api_delegate> elm_interface_scrollable_page_relative_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_relative_set_api_delegate>(_Module, "elm_interface_scrollable_page_relative_set");
-     private static void page_relative_set(System.IntPtr obj, System.IntPtr pd,  double h_pagerel,  double v_pagerel)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_relative_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
                                                                         
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetPageRelative( h_pagerel,  v_pagerel);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                } else {
-            elm_interface_scrollable_page_relative_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  h_pagerel,  v_pagerel);
+            else
+            {
+                elm_interface_scrollable_content_viewport_geometry_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out x, out y, out w, out h);
+            }
         }
-    }
-    private static elm_interface_scrollable_page_relative_set_delegate elm_interface_scrollable_page_relative_set_static_delegate;
-
 
-     private delegate void elm_interface_scrollable_scroll_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_cb);
+        private static elm_interface_scrollable_content_viewport_geometry_get_delegate elm_interface_scrollable_content_viewport_geometry_get_static_delegate;
 
+        
+        private delegate void elm_interface_scrollable_content_size_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int w,  out int h);
 
-     public delegate void elm_interface_scrollable_scroll_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_cb_set_api_delegate> elm_interface_scrollable_scroll_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_cb_set");
-     private static void scroll_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollCb( scroll_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                } else {
-            elm_interface_scrollable_scroll_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_cb);
-        }
-    }
-    private static elm_interface_scrollable_scroll_cb_set_delegate elm_interface_scrollable_scroll_cb_set_static_delegate;
+        
+        public delegate void elm_interface_scrollable_content_size_get_api_delegate(System.IntPtr obj,  out int w,  out int h);
 
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_size_get_api_delegate> elm_interface_scrollable_content_size_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_size_get_api_delegate>(Module, "elm_interface_scrollable_content_size_get");
 
-     private delegate void elm_interface_scrollable_animate_stop_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb animate_stop_cb);
+        private static void content_size_get(System.IntPtr obj, System.IntPtr pd, out int w, out int h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_size_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        w = default(int);        h = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetContentSize(out w, out h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-
-     public delegate void elm_interface_scrollable_animate_stop_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb animate_stop_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_stop_cb_set_api_delegate> elm_interface_scrollable_animate_stop_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_animate_stop_cb_set_api_delegate>(_Module, "elm_interface_scrollable_animate_stop_cb_set");
-     private static void animate_stop_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb animate_stop_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_animate_stop_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetAnimateStopCb( animate_stop_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_size_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out w, out h);
             }
-                                } else {
-            elm_interface_scrollable_animate_stop_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  animate_stop_cb);
         }
-    }
-    private static elm_interface_scrollable_animate_stop_cb_set_delegate elm_interface_scrollable_animate_stop_cb_set_static_delegate;
-
 
-     private delegate void elm_interface_scrollable_content_min_limit_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableMinLimitCb min_limit_cb);
+        private static elm_interface_scrollable_content_size_get_delegate elm_interface_scrollable_content_size_get_static_delegate;
 
+        [return: MarshalAs(UnmanagedType.U1)]
+        private delegate bool elm_interface_scrollable_item_loop_enabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
-     public delegate void elm_interface_scrollable_content_min_limit_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableMinLimitCb min_limit_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_cb_set_api_delegate> elm_interface_scrollable_content_min_limit_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_cb_set_api_delegate>(_Module, "elm_interface_scrollable_content_min_limit_cb_set");
-     private static void content_min_limit_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableMinLimitCb min_limit_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_min_limit_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetContentMinLimitCb( min_limit_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                } else {
-            elm_interface_scrollable_content_min_limit_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  min_limit_cb);
-        }
-    }
-    private static elm_interface_scrollable_content_min_limit_cb_set_delegate elm_interface_scrollable_content_min_limit_cb_set_static_delegate;
+        [return: MarshalAs(UnmanagedType.U1)]
+        public delegate bool elm_interface_scrollable_item_loop_enabled_get_api_delegate(System.IntPtr obj);
 
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_get_api_delegate> elm_interface_scrollable_item_loop_enabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_get_api_delegate>(Module, "elm_interface_scrollable_item_loop_enabled_get");
 
-     private delegate void elm_interface_scrollable_scroll_right_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb scroll_right_cb);
+        private static bool item_loop_enabled_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_item_loop_enabled_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            bool _ret_var = default(bool);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetItemLoopEnabled();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+        return _ret_var;
 
-     public delegate void elm_interface_scrollable_scroll_right_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb scroll_right_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_right_cb_set_api_delegate> elm_interface_scrollable_scroll_right_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_scroll_right_cb_set_api_delegate>(_Module, "elm_interface_scrollable_scroll_right_cb_set");
-     private static void scroll_right_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb scroll_right_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_scroll_right_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollRightCb( scroll_right_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                } else {
-            elm_interface_scrollable_scroll_right_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  scroll_right_cb);
+            else
+            {
+                return elm_interface_scrollable_item_loop_enabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_scroll_right_cb_set_delegate elm_interface_scrollable_scroll_right_cb_set_static_delegate;
-
 
-     private delegate void elm_interface_scrollable_content_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object content);
+        private static elm_interface_scrollable_item_loop_enabled_get_delegate elm_interface_scrollable_item_loop_enabled_get_static_delegate;
 
+        
+        private delegate void elm_interface_scrollable_item_loop_enabled_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool enable);
 
-     public delegate void elm_interface_scrollable_content_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object content);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_set_api_delegate> elm_interface_scrollable_content_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_set_api_delegate>(_Module, "elm_interface_scrollable_content_set");
-     private static void scrollable_content_set(System.IntPtr obj, System.IntPtr pd,  Efl.Canvas.Object content)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetScrollableContent( content);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                } else {
-            elm_interface_scrollable_content_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  content);
-        }
-    }
-    private static elm_interface_scrollable_content_set_delegate elm_interface_scrollable_content_set_static_delegate;
-
+        
+        public delegate void elm_interface_scrollable_item_loop_enabled_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool enable);
 
-     private delegate void elm_interface_scrollable_edge_left_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb edge_left_cb);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_set_api_delegate> elm_interface_scrollable_item_loop_enabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_set_api_delegate>(Module, "elm_interface_scrollable_item_loop_enabled_set");
 
+        private static void item_loop_enabled_set(System.IntPtr obj, System.IntPtr pd, bool enable)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_item_loop_enabled_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetItemLoopEnabled(enable);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-     public delegate void elm_interface_scrollable_edge_left_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb edge_left_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_left_cb_set_api_delegate> elm_interface_scrollable_edge_left_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_left_cb_set_api_delegate>(_Module, "elm_interface_scrollable_edge_left_cb_set");
-     private static void edge_left_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_left_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_edge_left_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetEdgeLeftCb( edge_left_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                        
+            }
+            else
+            {
+                elm_interface_scrollable_item_loop_enabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), enable);
             }
-                                } else {
-            elm_interface_scrollable_edge_left_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  edge_left_cb);
         }
-    }
-    private static elm_interface_scrollable_edge_left_cb_set_delegate elm_interface_scrollable_edge_left_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_item_loop_enabled_set_delegate elm_interface_scrollable_item_loop_enabled_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_vbar_drag_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb vbar_drag_cb);
+        
+        private delegate void elm_interface_scrollable_content_pos_set_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y, [MarshalAs(UnmanagedType.U1)] bool sig);
 
+        
+        public delegate void elm_interface_scrollable_content_pos_set_api_delegate(System.IntPtr obj,  int x,  int y, [MarshalAs(UnmanagedType.U1)] bool sig);
 
-     public delegate void elm_interface_scrollable_vbar_drag_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb vbar_drag_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_drag_cb_set_api_delegate> elm_interface_scrollable_vbar_drag_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_drag_cb_set_api_delegate>(_Module, "elm_interface_scrollable_vbar_drag_cb_set");
-     private static void vbar_drag_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb vbar_drag_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_vbar_drag_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetVbarDragCb( vbar_drag_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_set_api_delegate> elm_interface_scrollable_content_pos_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_set_api_delegate>(Module, "elm_interface_scrollable_content_pos_set");
+
+        private static void content_pos_set(System.IntPtr obj, System.IntPtr pd, int x, int y, bool sig)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_pos_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetContentPos(x, y, sig);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_pos_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y, sig);
             }
-                                } else {
-            elm_interface_scrollable_vbar_drag_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  vbar_drag_cb);
         }
-    }
-    private static elm_interface_scrollable_vbar_drag_cb_set_delegate elm_interface_scrollable_vbar_drag_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_content_pos_set_delegate elm_interface_scrollable_content_pos_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_vbar_unpress_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb vbar_unpress_cb);
+        
+        private delegate void elm_interface_scrollable_content_pos_get_delegate(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y);
 
+        
+        public delegate void elm_interface_scrollable_content_pos_get_api_delegate(System.IntPtr obj,  out int x,  out int y);
 
-     public delegate void elm_interface_scrollable_vbar_unpress_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb vbar_unpress_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_unpress_cb_set_api_delegate> elm_interface_scrollable_vbar_unpress_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_vbar_unpress_cb_set_api_delegate>(_Module, "elm_interface_scrollable_vbar_unpress_cb_set");
-     private static void vbar_unpress_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb vbar_unpress_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_vbar_unpress_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetVbarUnpressCb( vbar_unpress_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_get_api_delegate> elm_interface_scrollable_content_pos_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_get_api_delegate>(Module, "elm_interface_scrollable_content_pos_get");
+
+        private static void content_pos_get(System.IntPtr obj, System.IntPtr pd, out int x, out int y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_pos_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                        x = default(int);        y = default(int);                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).GetContentPos(out x, out y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_pos_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), out x, out y);
             }
-                                } else {
-            elm_interface_scrollable_vbar_unpress_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  vbar_unpress_cb);
         }
-    }
-    private static elm_interface_scrollable_vbar_unpress_cb_set_delegate elm_interface_scrollable_vbar_unpress_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_content_pos_get_delegate elm_interface_scrollable_content_pos_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_edge_bottom_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb edge_bottom_cb);
+        
+        private delegate void elm_interface_scrollable_page_show_delegate(System.IntPtr obj, System.IntPtr pd,  int pagenumber_h,  int pagenumber_v);
 
+        
+        public delegate void elm_interface_scrollable_page_show_api_delegate(System.IntPtr obj,  int pagenumber_h,  int pagenumber_v);
 
-     public delegate void elm_interface_scrollable_edge_bottom_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb edge_bottom_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_bottom_cb_set_api_delegate> elm_interface_scrollable_edge_bottom_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_bottom_cb_set_api_delegate>(_Module, "elm_interface_scrollable_edge_bottom_cb_set");
-     private static void edge_bottom_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_bottom_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_edge_bottom_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetEdgeBottomCb( edge_bottom_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_show_api_delegate> elm_interface_scrollable_page_show_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_show_api_delegate>(Module, "elm_interface_scrollable_page_show");
+
+        private static void page_show(System.IntPtr obj, System.IntPtr pd, int pagenumber_h, int pagenumber_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_show was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).ShowPage(pagenumber_h, pagenumber_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_show_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), pagenumber_h, pagenumber_v);
             }
-                                } else {
-            elm_interface_scrollable_edge_bottom_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  edge_bottom_cb);
         }
-    }
-    private static elm_interface_scrollable_edge_bottom_cb_set_delegate elm_interface_scrollable_edge_bottom_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_page_show_delegate elm_interface_scrollable_page_show_static_delegate;
 
-     private delegate void elm_interface_scrollable_edge_right_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb edge_right_cb);
+        
+        private delegate void elm_interface_scrollable_region_bring_in_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  int w,  int h);
 
+        
+        public delegate void elm_interface_scrollable_region_bring_in_api_delegate(System.IntPtr obj,  int x,  int y,  int w,  int h);
 
-     public delegate void elm_interface_scrollable_edge_right_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb edge_right_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_right_cb_set_api_delegate> elm_interface_scrollable_edge_right_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_right_cb_set_api_delegate>(_Module, "elm_interface_scrollable_edge_right_cb_set");
-     private static void edge_right_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_right_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_edge_right_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetEdgeRightCb( edge_right_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_region_bring_in_api_delegate> elm_interface_scrollable_region_bring_in_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_region_bring_in_api_delegate>(Module, "elm_interface_scrollable_region_bring_in");
+
+        private static void region_bring_in(System.IntPtr obj, System.IntPtr pd, int x, int y, int w, int h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_region_bring_in was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).RegionBringIn(x, y, w, h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                                                        
+            }
+            else
+            {
+                elm_interface_scrollable_region_bring_in_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y, w, h);
             }
-                                } else {
-            elm_interface_scrollable_edge_right_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  edge_right_cb);
         }
-    }
-    private static elm_interface_scrollable_edge_right_cb_set_delegate elm_interface_scrollable_edge_right_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_region_bring_in_delegate elm_interface_scrollable_region_bring_in_static_delegate;
 
-     private delegate void elm_interface_scrollable_edge_top_cb_set_delegate(System.IntPtr obj, System.IntPtr pd,   ElmInterfaceScrollableCb edge_top_cb);
+        
+        private delegate void elm_interface_scrollable_page_bring_in_delegate(System.IntPtr obj, System.IntPtr pd,  int pagenumber_h,  int pagenumber_v);
 
+        
+        public delegate void elm_interface_scrollable_page_bring_in_api_delegate(System.IntPtr obj,  int pagenumber_h,  int pagenumber_v);
 
-     public delegate void elm_interface_scrollable_edge_top_cb_set_api_delegate(System.IntPtr obj,   ElmInterfaceScrollableCb edge_top_cb);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_top_cb_set_api_delegate> elm_interface_scrollable_edge_top_cb_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_edge_top_cb_set_api_delegate>(_Module, "elm_interface_scrollable_edge_top_cb_set");
-     private static void edge_top_cb_set(System.IntPtr obj, System.IntPtr pd,  ElmInterfaceScrollableCb edge_top_cb)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_edge_top_cb_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetEdgeTopCb( edge_top_cb);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_bring_in_api_delegate> elm_interface_scrollable_page_bring_in_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_bring_in_api_delegate>(Module, "elm_interface_scrollable_page_bring_in");
+
+        private static void page_bring_in(System.IntPtr obj, System.IntPtr pd, int pagenumber_h, int pagenumber_v)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_page_bring_in was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).PageBringIn(pagenumber_h, pagenumber_v);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_page_bring_in_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), pagenumber_h, pagenumber_v);
             }
-                                } else {
-            elm_interface_scrollable_edge_top_cb_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  edge_top_cb);
         }
-    }
-    private static elm_interface_scrollable_edge_top_cb_set_delegate elm_interface_scrollable_edge_top_cb_set_static_delegate;
 
+        private static elm_interface_scrollable_page_bring_in_delegate elm_interface_scrollable_page_bring_in_static_delegate;
 
-     private delegate void elm_interface_scrollable_objects_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object edje_object, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object hit_rectangle);
+        
+        private delegate void elm_interface_scrollable_content_region_show_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  int w,  int h);
 
+        
+        public delegate void elm_interface_scrollable_content_region_show_api_delegate(System.IntPtr obj,  int x,  int y,  int w,  int h);
+
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_show_api_delegate> elm_interface_scrollable_content_region_show_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_show_api_delegate>(Module, "elm_interface_scrollable_content_region_show");
+
+        private static void content_region_show(System.IntPtr obj, System.IntPtr pd, int x, int y, int w, int h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_region_show was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).ShowContentRegion(x, y, w, h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-     public delegate void elm_interface_scrollable_objects_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object edje_object, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Canvas.Object, Efl.Eo.NonOwnTag>))]  Efl.Canvas.Object hit_rectangle);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_objects_set_api_delegate> elm_interface_scrollable_objects_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_objects_set_api_delegate>(_Module, "elm_interface_scrollable_objects_set");
-     private static void objects_set(System.IntPtr obj, System.IntPtr pd,  Efl.Canvas.Object edje_object,  Efl.Canvas.Object hit_rectangle)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_objects_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
                                                                         
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetObjects( edje_object,  hit_rectangle);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                } else {
-            elm_interface_scrollable_objects_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  edje_object,  hit_rectangle);
+            else
+            {
+                elm_interface_scrollable_content_region_show_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y, w, h);
+            }
         }
-    }
-    private static elm_interface_scrollable_objects_set_delegate elm_interface_scrollable_objects_set_static_delegate;
 
+        private static elm_interface_scrollable_content_region_show_delegate elm_interface_scrollable_content_region_show_static_delegate;
 
-     private delegate void elm_interface_scrollable_last_page_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int pagenumber_h,   out int pagenumber_v);
+        
+        private delegate void elm_interface_scrollable_content_min_limit_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.U1)] bool w, [MarshalAs(UnmanagedType.U1)] bool h);
 
+        
+        public delegate void elm_interface_scrollable_content_min_limit_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.U1)] bool w, [MarshalAs(UnmanagedType.U1)] bool h);
 
-     public delegate void elm_interface_scrollable_last_page_get_api_delegate(System.IntPtr obj,   out int pagenumber_h,   out int pagenumber_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_last_page_get_api_delegate> elm_interface_scrollable_last_page_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_last_page_get_api_delegate>(_Module, "elm_interface_scrollable_last_page_get");
-     private static void last_page_get(System.IntPtr obj, System.IntPtr pd,  out int pagenumber_h,  out int pagenumber_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_last_page_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    pagenumber_h = default(int);        pagenumber_v = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetLastPage( out pagenumber_h,  out pagenumber_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_api_delegate> elm_interface_scrollable_content_min_limit_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_api_delegate>(Module, "elm_interface_scrollable_content_min_limit");
+
+        private static void content_min_limit(System.IntPtr obj, System.IntPtr pd, bool w, bool h)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_content_min_limit was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).ContentMinLimit(w, h);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_content_min_limit_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), w, h);
             }
-                                                } else {
-            elm_interface_scrollable_last_page_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out pagenumber_h,  out pagenumber_v);
         }
-    }
-    private static elm_interface_scrollable_last_page_get_delegate elm_interface_scrollable_last_page_get_static_delegate;
 
+        private static elm_interface_scrollable_content_min_limit_delegate elm_interface_scrollable_content_min_limit_static_delegate;
 
-     private delegate void elm_interface_scrollable_current_page_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int pagenumber_h,   out int pagenumber_v);
+        
+        private delegate void elm_interface_scrollable_wanted_region_set_delegate(System.IntPtr obj, System.IntPtr pd,  int x,  int y);
 
+        
+        public delegate void elm_interface_scrollable_wanted_region_set_api_delegate(System.IntPtr obj,  int x,  int y);
 
-     public delegate void elm_interface_scrollable_current_page_get_api_delegate(System.IntPtr obj,   out int pagenumber_h,   out int pagenumber_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_current_page_get_api_delegate> elm_interface_scrollable_current_page_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_current_page_get_api_delegate>(_Module, "elm_interface_scrollable_current_page_get");
-     private static void current_page_get(System.IntPtr obj, System.IntPtr pd,  out int pagenumber_h,  out int pagenumber_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_current_page_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    pagenumber_h = default(int);        pagenumber_v = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetCurrentPage( out pagenumber_h,  out pagenumber_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_wanted_region_set_api_delegate> elm_interface_scrollable_wanted_region_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_wanted_region_set_api_delegate>(Module, "elm_interface_scrollable_wanted_region_set");
+
+        private static void wanted_region_set(System.IntPtr obj, System.IntPtr pd, int x, int y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_wanted_region_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetWantedRegion(x, y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_wanted_region_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y);
             }
-                                                } else {
-            elm_interface_scrollable_current_page_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out pagenumber_h,  out pagenumber_v);
         }
-    }
-    private static elm_interface_scrollable_current_page_get_delegate elm_interface_scrollable_current_page_get_static_delegate;
 
+        private static elm_interface_scrollable_wanted_region_set_delegate elm_interface_scrollable_wanted_region_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_viewport_geometry_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int x,   out int y,   out int w,   out int h);
+        
+        private delegate void elm_interface_scrollable_custom_pan_pos_adjust_delegate(System.IntPtr obj, System.IntPtr pd,  System.IntPtr x,  System.IntPtr y);
 
+        
+        public delegate void elm_interface_scrollable_custom_pan_pos_adjust_api_delegate(System.IntPtr obj,  System.IntPtr x,  System.IntPtr y);
 
-     public delegate void elm_interface_scrollable_content_viewport_geometry_get_api_delegate(System.IntPtr obj,   out int x,   out int y,   out int w,   out int h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_geometry_get_api_delegate> elm_interface_scrollable_content_viewport_geometry_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_viewport_geometry_get_api_delegate>(_Module, "elm_interface_scrollable_content_viewport_geometry_get");
-     private static void content_viewport_geometry_get(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y,  out int w,  out int h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_viewport_geometry_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                    x = default(int);        y = default(int);        w = default(int);        h = default(int);                                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetContentViewportGeometry( out x,  out y,  out w,  out h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_custom_pan_pos_adjust_api_delegate> elm_interface_scrollable_custom_pan_pos_adjust_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_custom_pan_pos_adjust_api_delegate>(Module, "elm_interface_scrollable_custom_pan_pos_adjust");
+
+        private static void custom_pan_pos_adjust(System.IntPtr obj, System.IntPtr pd, System.IntPtr x, System.IntPtr y)
+        {
+            Eina.Log.Debug("function elm_interface_scrollable_custom_pan_pos_adjust was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+        var _in_x = Eina.PrimitiveConversion.PointerToManaged<int>(x);
+        var _in_y = Eina.PrimitiveConversion.PointerToManaged<int>(y);
+                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).CustomPanPosAdjust(_in_x, _in_y);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                elm_interface_scrollable_custom_pan_pos_adjust_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), x, y);
             }
-                                                                                } else {
-            elm_interface_scrollable_content_viewport_geometry_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out x,  out y,  out w,  out h);
         }
-    }
-    private static elm_interface_scrollable_content_viewport_geometry_get_delegate elm_interface_scrollable_content_viewport_geometry_get_static_delegate;
 
+        private static elm_interface_scrollable_custom_pan_pos_adjust_delegate elm_interface_scrollable_custom_pan_pos_adjust_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_size_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int w,   out int h);
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IManager efl_ui_widget_focus_manager_create_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject root);
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IManager efl_ui_widget_focus_manager_create_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject root);
 
-     public delegate void elm_interface_scrollable_content_size_get_api_delegate(System.IntPtr obj,   out int w,   out int h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_size_get_api_delegate> elm_interface_scrollable_content_size_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_size_get_api_delegate>(_Module, "elm_interface_scrollable_content_size_get");
-     private static void content_size_get(System.IntPtr obj, System.IntPtr pd,  out int w,  out int h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_size_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    w = default(int);        h = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetContentSize( out w,  out h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                                } else {
-            elm_interface_scrollable_content_size_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out w,  out h);
-        }
-    }
-    private static elm_interface_scrollable_content_size_get_delegate elm_interface_scrollable_content_size_get_static_delegate;
-
+        public static Efl.Eo.FunctionWrapper<efl_ui_widget_focus_manager_create_api_delegate> efl_ui_widget_focus_manager_create_ptr = new Efl.Eo.FunctionWrapper<efl_ui_widget_focus_manager_create_api_delegate>(Module, "efl_ui_widget_focus_manager_create");
 
-     [return: MarshalAs(UnmanagedType.U1)] private delegate bool elm_interface_scrollable_item_loop_enabled_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        private static Efl.Ui.Focus.IManager focus_manager_create(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.IObject root)
+        {
+            Eina.Log.Debug("function efl_ui_widget_focus_manager_create was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    Efl.Ui.Focus.IManager _ret_var = default(Efl.Ui.Focus.IManager);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).FocusManagerCreate(root);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+                        return _ret_var;
 
-     [return: MarshalAs(UnmanagedType.U1)] public delegate bool elm_interface_scrollable_item_loop_enabled_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_get_api_delegate> elm_interface_scrollable_item_loop_enabled_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_get_api_delegate>(_Module, "elm_interface_scrollable_item_loop_enabled_get");
-     private static bool item_loop_enabled_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_item_loop_enabled_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        bool _ret_var = default(bool);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetItemLoopEnabled();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-        return _ret_var;
-        } else {
-            return elm_interface_scrollable_item_loop_enabled_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            else
+            {
+                return efl_ui_widget_focus_manager_create_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), root);
+            }
         }
-    }
-    private static elm_interface_scrollable_item_loop_enabled_get_delegate elm_interface_scrollable_item_loop_enabled_get_static_delegate;
-
 
-     private delegate void elm_interface_scrollable_item_loop_enabled_set_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool enable);
+        private static efl_ui_widget_focus_manager_create_delegate efl_ui_widget_focus_manager_create_static_delegate;
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_focus_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
-     public delegate void elm_interface_scrollable_item_loop_enabled_set_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool enable);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_set_api_delegate> elm_interface_scrollable_item_loop_enabled_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_item_loop_enabled_set_api_delegate>(_Module, "elm_interface_scrollable_item_loop_enabled_set");
-     private static void item_loop_enabled_set(System.IntPtr obj, System.IntPtr pd,  bool enable)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_item_loop_enabled_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetItemLoopEnabled( enable);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                } else {
-            elm_interface_scrollable_item_loop_enabled_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  enable);
-        }
-    }
-    private static elm_interface_scrollable_item_loop_enabled_set_delegate elm_interface_scrollable_item_loop_enabled_set_static_delegate;
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_focus_get_api_delegate(System.IntPtr obj);
 
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_get_api_delegate> efl_ui_focus_manager_focus_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_get_api_delegate>(Module, "efl_ui_focus_manager_focus_get");
 
-     private delegate void elm_interface_scrollable_content_pos_set_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y,  [MarshalAs(UnmanagedType.U1)]  bool sig);
+        private static Efl.Ui.Focus.IObject manager_focus_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_focus_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetManagerFocus();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+        return _ret_var;
 
-     public delegate void elm_interface_scrollable_content_pos_set_api_delegate(System.IntPtr obj,   int x,   int y,  [MarshalAs(UnmanagedType.U1)]  bool sig);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_set_api_delegate> elm_interface_scrollable_content_pos_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_set_api_delegate>(_Module, "elm_interface_scrollable_content_pos_set");
-     private static void content_pos_set(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  bool sig)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_pos_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetContentPos( x,  y,  sig);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                                } else {
-            elm_interface_scrollable_content_pos_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y,  sig);
+            else
+            {
+                return efl_ui_focus_manager_focus_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_content_pos_set_delegate elm_interface_scrollable_content_pos_set_static_delegate;
 
+        private static efl_ui_focus_manager_focus_get_delegate efl_ui_focus_manager_focus_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_content_pos_get_delegate(System.IntPtr obj, System.IntPtr pd,   out int x,   out int y);
+        
+        private delegate void efl_ui_focus_manager_focus_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject focus);
 
+        
+        public delegate void efl_ui_focus_manager_focus_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject focus);
 
-     public delegate void elm_interface_scrollable_content_pos_get_api_delegate(System.IntPtr obj,   out int x,   out int y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_get_api_delegate> elm_interface_scrollable_content_pos_get_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_pos_get_api_delegate>(_Module, "elm_interface_scrollable_content_pos_get");
-     private static void content_pos_get(System.IntPtr obj, System.IntPtr pd,  out int x,  out int y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_pos_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                    x = default(int);        y = default(int);                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).GetContentPos( out x,  out y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_set_api_delegate> efl_ui_focus_manager_focus_set_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_set_api_delegate>(Module, "efl_ui_focus_manager_focus_set");
+
+        private static void manager_focus_set(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.IObject focus)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_focus_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetManagerFocus(focus);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                efl_ui_focus_manager_focus_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), focus);
             }
-                                                } else {
-            elm_interface_scrollable_content_pos_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  out x,  out y);
         }
-    }
-    private static elm_interface_scrollable_content_pos_get_delegate elm_interface_scrollable_content_pos_get_static_delegate;
 
+        private static efl_ui_focus_manager_focus_set_delegate efl_ui_focus_manager_focus_set_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_show_delegate(System.IntPtr obj, System.IntPtr pd,   int pagenumber_h,   int pagenumber_v);
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IManager efl_ui_focus_manager_redirect_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IManager efl_ui_focus_manager_redirect_get_api_delegate(System.IntPtr obj);
 
-     public delegate void elm_interface_scrollable_page_show_api_delegate(System.IntPtr obj,   int pagenumber_h,   int pagenumber_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_show_api_delegate> elm_interface_scrollable_page_show_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_show_api_delegate>(_Module, "elm_interface_scrollable_page_show");
-     private static void page_show(System.IntPtr obj, System.IntPtr pd,  int pagenumber_h,  int pagenumber_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_show was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).ShowPage( pagenumber_h,  pagenumber_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                                } else {
-            elm_interface_scrollable_page_show_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  pagenumber_h,  pagenumber_v);
-        }
-    }
-    private static elm_interface_scrollable_page_show_delegate elm_interface_scrollable_page_show_static_delegate;
-
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_get_api_delegate> efl_ui_focus_manager_redirect_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_get_api_delegate>(Module, "efl_ui_focus_manager_redirect_get");
 
-     private delegate void elm_interface_scrollable_region_bring_in_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y,   int w,   int h);
+        private static Efl.Ui.Focus.IManager redirect_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_redirect_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Efl.Ui.Focus.IManager _ret_var = default(Efl.Ui.Focus.IManager);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetRedirect();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+        return _ret_var;
 
-     public delegate void elm_interface_scrollable_region_bring_in_api_delegate(System.IntPtr obj,   int x,   int y,   int w,   int h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_region_bring_in_api_delegate> elm_interface_scrollable_region_bring_in_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_region_bring_in_api_delegate>(_Module, "elm_interface_scrollable_region_bring_in");
-     private static void region_bring_in(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  int w,  int h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_region_bring_in was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).RegionBringIn( x,  y,  w,  h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                                                } else {
-            elm_interface_scrollable_region_bring_in_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y,  w,  h);
+            else
+            {
+                return efl_ui_focus_manager_redirect_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_region_bring_in_delegate elm_interface_scrollable_region_bring_in_static_delegate;
 
+        private static efl_ui_focus_manager_redirect_get_delegate efl_ui_focus_manager_redirect_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_page_bring_in_delegate(System.IntPtr obj, System.IntPtr pd,   int pagenumber_h,   int pagenumber_v);
+        
+        private delegate void efl_ui_focus_manager_redirect_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IManager redirect);
 
+        
+        public delegate void efl_ui_focus_manager_redirect_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IManager redirect);
 
-     public delegate void elm_interface_scrollable_page_bring_in_api_delegate(System.IntPtr obj,   int pagenumber_h,   int pagenumber_v);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_bring_in_api_delegate> elm_interface_scrollable_page_bring_in_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_page_bring_in_api_delegate>(_Module, "elm_interface_scrollable_page_bring_in");
-     private static void page_bring_in(System.IntPtr obj, System.IntPtr pd,  int pagenumber_h,  int pagenumber_v)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_page_bring_in was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).PageBringIn( pagenumber_h,  pagenumber_v);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_set_api_delegate> efl_ui_focus_manager_redirect_set_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_set_api_delegate>(Module, "efl_ui_focus_manager_redirect_set");
+
+        private static void redirect_set(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.IManager redirect)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_redirect_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetRedirect(redirect);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                        
+            }
+            else
+            {
+                efl_ui_focus_manager_redirect_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), redirect);
             }
-                                                } else {
-            elm_interface_scrollable_page_bring_in_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  pagenumber_h,  pagenumber_v);
         }
-    }
-    private static elm_interface_scrollable_page_bring_in_delegate elm_interface_scrollable_page_bring_in_static_delegate;
-
 
-     private delegate void elm_interface_scrollable_content_region_show_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y,   int w,   int h);
+        private static efl_ui_focus_manager_redirect_set_delegate efl_ui_focus_manager_redirect_set_static_delegate;
 
+        
+        private delegate System.IntPtr efl_ui_focus_manager_border_elements_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
-     public delegate void elm_interface_scrollable_content_region_show_api_delegate(System.IntPtr obj,   int x,   int y,   int w,   int h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_show_api_delegate> elm_interface_scrollable_content_region_show_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_region_show_api_delegate>(_Module, "elm_interface_scrollable_content_region_show");
-     private static void content_region_show(System.IntPtr obj, System.IntPtr pd,  int x,  int y,  int w,  int h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_region_show was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).ShowContentRegion( x,  y,  w,  h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                                                                } else {
-            elm_interface_scrollable_content_region_show_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y,  w,  h);
-        }
-    }
-    private static elm_interface_scrollable_content_region_show_delegate elm_interface_scrollable_content_region_show_static_delegate;
+        
+        public delegate System.IntPtr efl_ui_focus_manager_border_elements_get_api_delegate(System.IntPtr obj);
 
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_border_elements_get_api_delegate> efl_ui_focus_manager_border_elements_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_border_elements_get_api_delegate>(Module, "efl_ui_focus_manager_border_elements_get");
 
-     private delegate void elm_interface_scrollable_content_min_limit_delegate(System.IntPtr obj, System.IntPtr pd,  [MarshalAs(UnmanagedType.U1)]  bool w,  [MarshalAs(UnmanagedType.U1)]  bool h);
+        private static System.IntPtr border_elements_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_border_elements_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Eina.Iterator<Efl.Ui.Focus.IObject> _ret_var = default(Eina.Iterator<Efl.Ui.Focus.IObject>);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetBorderElements();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+        return _ret_var.Handle;
 
-     public delegate void elm_interface_scrollable_content_min_limit_api_delegate(System.IntPtr obj,  [MarshalAs(UnmanagedType.U1)]  bool w,  [MarshalAs(UnmanagedType.U1)]  bool h);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_api_delegate> elm_interface_scrollable_content_min_limit_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_content_min_limit_api_delegate>(_Module, "elm_interface_scrollable_content_min_limit");
-     private static void content_min_limit(System.IntPtr obj, System.IntPtr pd,  bool w,  bool h)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_content_min_limit was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).ContentMinLimit( w,  h);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                } else {
-            elm_interface_scrollable_content_min_limit_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  w,  h);
+            else
+            {
+                return efl_ui_focus_manager_border_elements_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static elm_interface_scrollable_content_min_limit_delegate elm_interface_scrollable_content_min_limit_static_delegate;
 
+        private static efl_ui_focus_manager_border_elements_get_delegate efl_ui_focus_manager_border_elements_get_static_delegate;
 
-     private delegate void elm_interface_scrollable_wanted_region_set_delegate(System.IntPtr obj, System.IntPtr pd,   int x,   int y);
+        
+        private delegate System.IntPtr efl_ui_focus_manager_viewport_elements_get_delegate(System.IntPtr obj, System.IntPtr pd,  Eina.Rect.NativeStruct viewport);
 
+        
+        public delegate System.IntPtr efl_ui_focus_manager_viewport_elements_get_api_delegate(System.IntPtr obj,  Eina.Rect.NativeStruct viewport);
 
-     public delegate void elm_interface_scrollable_wanted_region_set_api_delegate(System.IntPtr obj,   int x,   int y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_wanted_region_set_api_delegate> elm_interface_scrollable_wanted_region_set_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_wanted_region_set_api_delegate>(_Module, "elm_interface_scrollable_wanted_region_set");
-     private static void wanted_region_set(System.IntPtr obj, System.IntPtr pd,  int x,  int y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_wanted_region_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetWantedRegion( x,  y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                                } else {
-            elm_interface_scrollable_wanted_region_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y);
-        }
-    }
-    private static elm_interface_scrollable_wanted_region_set_delegate elm_interface_scrollable_wanted_region_set_static_delegate;
-
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_viewport_elements_get_api_delegate> efl_ui_focus_manager_viewport_elements_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_viewport_elements_get_api_delegate>(Module, "efl_ui_focus_manager_viewport_elements_get");
 
-     private delegate void elm_interface_scrollable_custom_pan_pos_adjust_delegate(System.IntPtr obj, System.IntPtr pd,   System.IntPtr x,   System.IntPtr y);
+        private static System.IntPtr viewport_elements_get(System.IntPtr obj, System.IntPtr pd, Eina.Rect.NativeStruct viewport)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_viewport_elements_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+        Eina.Rect _in_viewport = viewport;
+                            Eina.Iterator<Efl.Ui.Focus.IObject> _ret_var = default(Eina.Iterator<Efl.Ui.Focus.IObject>);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetViewportElements(_in_viewport);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+                        return _ret_var.Handle;
 
-     public delegate void elm_interface_scrollable_custom_pan_pos_adjust_api_delegate(System.IntPtr obj,   System.IntPtr x,   System.IntPtr y);
-     public static Efl.Eo.FunctionWrapper<elm_interface_scrollable_custom_pan_pos_adjust_api_delegate> elm_interface_scrollable_custom_pan_pos_adjust_ptr = new Efl.Eo.FunctionWrapper<elm_interface_scrollable_custom_pan_pos_adjust_api_delegate>(_Module, "elm_interface_scrollable_custom_pan_pos_adjust");
-     private static void custom_pan_pos_adjust(System.IntPtr obj, System.IntPtr pd,  System.IntPtr x,  System.IntPtr y)
-    {
-        Eina.Log.Debug("function elm_interface_scrollable_custom_pan_pos_adjust was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                    var _in_x = Eina.PrimitiveConversion.PointerToManaged<int>(x);
-        var _in_y = Eina.PrimitiveConversion.PointerToManaged<int>(y);
-                                            
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).CustomPanPosAdjust( _in_x,  _in_y);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                                                } else {
-            elm_interface_scrollable_custom_pan_pos_adjust_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  x,  y);
+            else
+            {
+                return efl_ui_focus_manager_viewport_elements_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), viewport);
+            }
         }
-    }
-    private static elm_interface_scrollable_custom_pan_pos_adjust_delegate elm_interface_scrollable_custom_pan_pos_adjust_static_delegate;
 
+        private static efl_ui_focus_manager_viewport_elements_get_delegate efl_ui_focus_manager_viewport_elements_get_static_delegate;
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IManagerConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IManager efl_ui_widget_focus_manager_create_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject root);
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_root_get_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_root_get_api_delegate(System.IntPtr obj);
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IManagerConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IManager efl_ui_widget_focus_manager_create_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject root);
-     public static Efl.Eo.FunctionWrapper<efl_ui_widget_focus_manager_create_api_delegate> efl_ui_widget_focus_manager_create_ptr = new Efl.Eo.FunctionWrapper<efl_ui_widget_focus_manager_create_api_delegate>(_Module, "efl_ui_widget_focus_manager_create");
-     private static Efl.Ui.Focus.IManager focus_manager_create(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.IObject root)
-    {
-        Eina.Log.Debug("function efl_ui_widget_focus_manager_create was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                Efl.Ui.Focus.IManager _ret_var = default(Efl.Ui.Focus.IManager);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).FocusManagerCreate( root);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                        return _ret_var;
-        } else {
-            return efl_ui_widget_focus_manager_create_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  root);
-        }
-    }
-    private static efl_ui_widget_focus_manager_create_delegate efl_ui_widget_focus_manager_create_static_delegate;
-
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_get_api_delegate> efl_ui_focus_manager_root_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_get_api_delegate>(Module, "efl_ui_focus_manager_root_get");
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_focus_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        private static Efl.Ui.Focus.IObject root_get(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_root_get was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetRoot();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+        return _ret_var;
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_focus_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_get_api_delegate> efl_ui_focus_manager_focus_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_get_api_delegate>(_Module, "efl_ui_focus_manager_focus_get");
-     private static Efl.Ui.Focus.IObject manager_focus_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_focus_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetManagerFocus();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_focus_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            else
+            {
+                return efl_ui_focus_manager_root_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static efl_ui_focus_manager_focus_get_delegate efl_ui_focus_manager_focus_get_static_delegate;
 
+        private static efl_ui_focus_manager_root_get_delegate efl_ui_focus_manager_root_get_static_delegate;
 
-     private delegate void efl_ui_focus_manager_focus_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject focus);
+        [return: MarshalAs(UnmanagedType.U1)]
+        private delegate bool efl_ui_focus_manager_root_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject root);
 
+        [return: MarshalAs(UnmanagedType.U1)]
+        public delegate bool efl_ui_focus_manager_root_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject root);
 
-     public delegate void efl_ui_focus_manager_focus_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject focus);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_set_api_delegate> efl_ui_focus_manager_focus_set_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_focus_set_api_delegate>(_Module, "efl_ui_focus_manager_focus_set");
-     private static void manager_focus_set(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.IObject focus)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_focus_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetManagerFocus( focus);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                } else {
-            efl_ui_focus_manager_focus_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  focus);
-        }
-    }
-    private static efl_ui_focus_manager_focus_set_delegate efl_ui_focus_manager_focus_set_static_delegate;
-
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_set_api_delegate> efl_ui_focus_manager_root_set_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_set_api_delegate>(Module, "efl_ui_focus_manager_root_set");
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IManagerConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IManager efl_ui_focus_manager_redirect_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        private static bool root_set(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.IObject root)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_root_set was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    bool _ret_var = default(bool);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).SetRoot(root);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+                        return _ret_var;
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IManagerConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IManager efl_ui_focus_manager_redirect_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_get_api_delegate> efl_ui_focus_manager_redirect_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_get_api_delegate>(_Module, "efl_ui_focus_manager_redirect_get");
-     private static Efl.Ui.Focus.IManager redirect_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_redirect_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Efl.Ui.Focus.IManager _ret_var = default(Efl.Ui.Focus.IManager);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetRedirect();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_redirect_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            else
+            {
+                return efl_ui_focus_manager_root_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), root);
+            }
         }
-    }
-    private static efl_ui_focus_manager_redirect_get_delegate efl_ui_focus_manager_redirect_get_static_delegate;
-
 
-     private delegate void efl_ui_focus_manager_redirect_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IManagerConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IManager redirect);
+        private static efl_ui_focus_manager_root_set_delegate efl_ui_focus_manager_root_set_static_delegate;
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_move_delegate(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.Direction direction);
 
-     public delegate void efl_ui_focus_manager_redirect_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IManagerConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IManager redirect);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_set_api_delegate> efl_ui_focus_manager_redirect_set_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_redirect_set_api_delegate>(_Module, "efl_ui_focus_manager_redirect_set");
-     private static void redirect_set(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.IManager redirect)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_redirect_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetRedirect( redirect);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                } else {
-            efl_ui_focus_manager_redirect_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  redirect);
-        }
-    }
-    private static efl_ui_focus_manager_redirect_set_delegate efl_ui_focus_manager_redirect_set_static_delegate;
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_move_api_delegate(System.IntPtr obj,  Efl.Ui.Focus.Direction direction);
 
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_move_api_delegate> efl_ui_focus_manager_move_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_move_api_delegate>(Module, "efl_ui_focus_manager_move");
 
-     private delegate System.IntPtr efl_ui_focus_manager_border_elements_get_delegate(System.IntPtr obj, System.IntPtr pd);
+        private static Efl.Ui.Focus.IObject move(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.Direction direction)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_move was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).Move(direction);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+                        return _ret_var;
 
-     public delegate System.IntPtr efl_ui_focus_manager_border_elements_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_border_elements_get_api_delegate> efl_ui_focus_manager_border_elements_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_border_elements_get_api_delegate>(_Module, "efl_ui_focus_manager_border_elements_get");
-     private static System.IntPtr border_elements_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_border_elements_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Eina.Iterator<Efl.Ui.Focus.IObject> _ret_var = default(Eina.Iterator<Efl.Ui.Focus.IObject>);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetBorderElements();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-        return _ret_var.Handle;
-        } else {
-            return efl_ui_focus_manager_border_elements_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            else
+            {
+                return efl_ui_focus_manager_move_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), direction);
+            }
         }
-    }
-    private static efl_ui_focus_manager_border_elements_get_delegate efl_ui_focus_manager_border_elements_get_static_delegate;
 
+        private static efl_ui_focus_manager_move_delegate efl_ui_focus_manager_move_static_delegate;
 
-     private delegate System.IntPtr efl_ui_focus_manager_viewport_elements_get_delegate(System.IntPtr obj, System.IntPtr pd,   Eina.Rect.NativeStruct viewport);
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_move_delegate(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject child, [MarshalAs(UnmanagedType.U1)] bool logical);
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_move_api_delegate(System.IntPtr obj,  Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject child, [MarshalAs(UnmanagedType.U1)] bool logical);
 
-     public delegate System.IntPtr efl_ui_focus_manager_viewport_elements_get_api_delegate(System.IntPtr obj,   Eina.Rect.NativeStruct viewport);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_viewport_elements_get_api_delegate> efl_ui_focus_manager_viewport_elements_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_viewport_elements_get_api_delegate>(_Module, "efl_ui_focus_manager_viewport_elements_get");
-     private static System.IntPtr viewport_elements_get(System.IntPtr obj, System.IntPtr pd,  Eina.Rect.NativeStruct viewport)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_viewport_elements_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                    Eina.Rect _in_viewport = viewport;
-                            Eina.Iterator<Efl.Ui.Focus.IObject> _ret_var = default(Eina.Iterator<Efl.Ui.Focus.IObject>);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetViewportElements( _in_viewport);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                        return _ret_var.Handle;
-        } else {
-            return efl_ui_focus_manager_viewport_elements_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  viewport);
-        }
-    }
-    private static efl_ui_focus_manager_viewport_elements_get_delegate efl_ui_focus_manager_viewport_elements_get_static_delegate;
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_move_api_delegate> efl_ui_focus_manager_request_move_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_move_api_delegate>(Module, "efl_ui_focus_manager_request_move");
 
+        private static Efl.Ui.Focus.IObject request_move(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.Direction direction, Efl.Ui.Focus.IObject child, bool logical)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_request_move was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                                                    Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).MoveRequest(direction, child, logical);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_root_get_delegate(System.IntPtr obj, System.IntPtr pd);
-
+                                                        return _ret_var;
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_root_get_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_get_api_delegate> efl_ui_focus_manager_root_get_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_get_api_delegate>(_Module, "efl_ui_focus_manager_root_get");
-     private static Efl.Ui.Focus.IObject root_get(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_root_get was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).GetRoot();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_root_get_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            else
+            {
+                return efl_ui_focus_manager_request_move_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), direction, child, logical);
+            }
         }
-    }
-    private static efl_ui_focus_manager_root_get_delegate efl_ui_focus_manager_root_get_static_delegate;
-
 
-     [return: MarshalAs(UnmanagedType.U1)] private delegate bool efl_ui_focus_manager_root_set_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject root);
+        private static efl_ui_focus_manager_request_move_delegate efl_ui_focus_manager_request_move_static_delegate;
 
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_subchild_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject root);
 
-     [return: MarshalAs(UnmanagedType.U1)] public delegate bool efl_ui_focus_manager_root_set_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject root);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_set_api_delegate> efl_ui_focus_manager_root_set_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_root_set_api_delegate>(_Module, "efl_ui_focus_manager_root_set");
-     private static bool root_set(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.IObject root)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_root_set was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                bool _ret_var = default(bool);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).SetRoot( root);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_root_set_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  root);
-        }
-    }
-    private static efl_ui_focus_manager_root_set_delegate efl_ui_focus_manager_root_set_static_delegate;
+        [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))]
+        public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_subchild_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject root);
 
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_subchild_api_delegate> efl_ui_focus_manager_request_subchild_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_subchild_api_delegate>(Module, "efl_ui_focus_manager_request_subchild");
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_move_delegate(System.IntPtr obj, System.IntPtr pd,   Efl.Ui.Focus.Direction direction);
+        private static Efl.Ui.Focus.IObject request_subchild(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.IObject root)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_request_subchild was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).RequestSubchild(root);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+                        return _ret_var;
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_move_api_delegate(System.IntPtr obj,   Efl.Ui.Focus.Direction direction);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_move_api_delegate> efl_ui_focus_manager_move_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_move_api_delegate>(_Module, "efl_ui_focus_manager_move");
-     private static Efl.Ui.Focus.IObject move(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.Direction direction)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_move was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).Move( direction);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_move_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  direction);
+            else
+            {
+                return efl_ui_focus_manager_request_subchild_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), root);
+            }
         }
-    }
-    private static efl_ui_focus_manager_move_delegate efl_ui_focus_manager_move_static_delegate;
-
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_move_delegate(System.IntPtr obj, System.IntPtr pd,   Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject child,  [MarshalAs(UnmanagedType.U1)]  bool logical);
+        private static efl_ui_focus_manager_request_subchild_delegate efl_ui_focus_manager_request_subchild_static_delegate;
 
+        
+        private delegate System.IntPtr efl_ui_focus_manager_fetch_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject child);
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_move_api_delegate(System.IntPtr obj,   Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject child,  [MarshalAs(UnmanagedType.U1)]  bool logical);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_move_api_delegate> efl_ui_focus_manager_request_move_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_move_api_delegate>(_Module, "efl_ui_focus_manager_request_move");
-     private static Efl.Ui.Focus.IObject request_move(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.Direction direction,  Efl.Ui.Focus.IObject child,  bool logical)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_request_move was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                                                Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).MoveRequest( direction,  child,  logical);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                                                        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_request_move_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  direction,  child,  logical);
-        }
-    }
-    private static efl_ui_focus_manager_request_move_delegate efl_ui_focus_manager_request_move_static_delegate;
+        
+        public delegate System.IntPtr efl_ui_focus_manager_fetch_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject child);
 
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_fetch_api_delegate> efl_ui_focus_manager_fetch_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_fetch_api_delegate>(Module, "efl_ui_focus_manager_fetch");
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] private delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_subchild_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject root);
+        private static System.IntPtr fetch(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.IObject child)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_fetch was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                    Efl.Ui.Focus.Relations _ret_var = default(Efl.Ui.Focus.Relations);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).Fetch(child);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+                        return Eina.PrimitiveConversion.ManagedToPointerAlloc(_ret_var);
 
-    [return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))] public delegate Efl.Ui.Focus.IObject efl_ui_focus_manager_request_subchild_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject root);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_subchild_api_delegate> efl_ui_focus_manager_request_subchild_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_request_subchild_api_delegate>(_Module, "efl_ui_focus_manager_request_subchild");
-     private static Efl.Ui.Focus.IObject request_subchild(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.IObject root)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_request_subchild was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                Efl.Ui.Focus.IObject _ret_var = default(Efl.Ui.Focus.IObject);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).RequestSubchild( root);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-                        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_request_subchild_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  root);
+            else
+            {
+                return efl_ui_focus_manager_fetch_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), child);
+            }
         }
-    }
-    private static efl_ui_focus_manager_request_subchild_delegate efl_ui_focus_manager_request_subchild_static_delegate;
-
 
-     private delegate System.IntPtr efl_ui_focus_manager_fetch_delegate(System.IntPtr obj, System.IntPtr pd, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject child);
+        private static efl_ui_focus_manager_fetch_delegate efl_ui_focus_manager_fetch_static_delegate;
 
+        
+        private delegate Efl.Ui.Focus.ManagerLogicalEndDetail.NativeStruct efl_ui_focus_manager_logical_end_delegate(System.IntPtr obj, System.IntPtr pd);
 
-     public delegate System.IntPtr efl_ui_focus_manager_fetch_api_delegate(System.IntPtr obj, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject child);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_fetch_api_delegate> efl_ui_focus_manager_fetch_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_fetch_api_delegate>(_Module, "efl_ui_focus_manager_fetch");
-     private static System.IntPtr fetch(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.IObject child)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_fetch was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                Efl.Ui.Focus.Relations _ret_var = default(Efl.Ui.Focus.Relations);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).Fetch( child);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
-            }
-                        return Eina.PrimitiveConversion.ManagedToPointerAlloc(_ret_var);
-        } else {
-            return efl_ui_focus_manager_fetch_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  child);
-        }
-    }
-    private static efl_ui_focus_manager_fetch_delegate efl_ui_focus_manager_fetch_static_delegate;
+        
+        public delegate Efl.Ui.Focus.ManagerLogicalEndDetail.NativeStruct efl_ui_focus_manager_logical_end_api_delegate(System.IntPtr obj);
 
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_logical_end_api_delegate> efl_ui_focus_manager_logical_end_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_logical_end_api_delegate>(Module, "efl_ui_focus_manager_logical_end");
 
-     private delegate Efl.Ui.Focus.ManagerLogicalEndDetail.NativeStruct efl_ui_focus_manager_logical_end_delegate(System.IntPtr obj, System.IntPtr pd);
+        private static Efl.Ui.Focus.ManagerLogicalEndDetail.NativeStruct logical_end(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_logical_end was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            Efl.Ui.Focus.ManagerLogicalEndDetail _ret_var = default(Efl.Ui.Focus.ManagerLogicalEndDetail);
+                try
+                {
+                    _ret_var = ((IInterfaceScrollableConcrete)wrapper).LogicalEnd();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
 
+        return _ret_var;
 
-     public delegate Efl.Ui.Focus.ManagerLogicalEndDetail.NativeStruct efl_ui_focus_manager_logical_end_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_logical_end_api_delegate> efl_ui_focus_manager_logical_end_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_logical_end_api_delegate>(_Module, "efl_ui_focus_manager_logical_end");
-     private static Efl.Ui.Focus.ManagerLogicalEndDetail.NativeStruct logical_end(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_logical_end was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        Efl.Ui.Focus.ManagerLogicalEndDetail _ret_var = default(Efl.Ui.Focus.ManagerLogicalEndDetail);
-            try {
-                _ret_var = ((IInterfaceScrollableConcrete)wrapper).LogicalEnd();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
             }
-        return _ret_var;
-        } else {
-            return efl_ui_focus_manager_logical_end_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            else
+            {
+                return efl_ui_focus_manager_logical_end_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
+            }
         }
-    }
-    private static efl_ui_focus_manager_logical_end_delegate efl_ui_focus_manager_logical_end_static_delegate;
 
+        private static efl_ui_focus_manager_logical_end_delegate efl_ui_focus_manager_logical_end_static_delegate;
 
-     private delegate void efl_ui_focus_manager_reset_history_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void efl_ui_focus_manager_reset_history_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        
+        public delegate void efl_ui_focus_manager_reset_history_api_delegate(System.IntPtr obj);
 
-     public delegate void efl_ui_focus_manager_reset_history_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_reset_history_api_delegate> efl_ui_focus_manager_reset_history_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_reset_history_api_delegate>(_Module, "efl_ui_focus_manager_reset_history");
-     private static void reset_history(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_reset_history was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).ResetHistory();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_reset_history_api_delegate> efl_ui_focus_manager_reset_history_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_reset_history_api_delegate>(Module, "efl_ui_focus_manager_reset_history");
+
+        private static void reset_history(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_reset_history was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).ResetHistory();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        
+            }
+            else
+            {
+                efl_ui_focus_manager_reset_history_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
             }
-                } else {
-            efl_ui_focus_manager_reset_history_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
         }
-    }
-    private static efl_ui_focus_manager_reset_history_delegate efl_ui_focus_manager_reset_history_static_delegate;
 
+        private static efl_ui_focus_manager_reset_history_delegate efl_ui_focus_manager_reset_history_static_delegate;
 
-     private delegate void efl_ui_focus_manager_pop_history_stack_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void efl_ui_focus_manager_pop_history_stack_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        
+        public delegate void efl_ui_focus_manager_pop_history_stack_api_delegate(System.IntPtr obj);
 
-     public delegate void efl_ui_focus_manager_pop_history_stack_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_pop_history_stack_api_delegate> efl_ui_focus_manager_pop_history_stack_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_pop_history_stack_api_delegate>(_Module, "efl_ui_focus_manager_pop_history_stack");
-     private static void pop_history_stack(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_pop_history_stack was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).PopHistoryStack();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_pop_history_stack_api_delegate> efl_ui_focus_manager_pop_history_stack_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_pop_history_stack_api_delegate>(Module, "efl_ui_focus_manager_pop_history_stack");
+
+        private static void pop_history_stack(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_pop_history_stack was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).PopHistoryStack();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        
+            }
+            else
+            {
+                efl_ui_focus_manager_pop_history_stack_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
             }
-                } else {
-            efl_ui_focus_manager_pop_history_stack_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
         }
-    }
-    private static efl_ui_focus_manager_pop_history_stack_delegate efl_ui_focus_manager_pop_history_stack_static_delegate;
 
+        private static efl_ui_focus_manager_pop_history_stack_delegate efl_ui_focus_manager_pop_history_stack_static_delegate;
 
-     private delegate void efl_ui_focus_manager_setup_on_first_touch_delegate(System.IntPtr obj, System.IntPtr pd,   Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject entry);
+        
+        private delegate void efl_ui_focus_manager_setup_on_first_touch_delegate(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject entry);
 
+        
+        public delegate void efl_ui_focus_manager_setup_on_first_touch_api_delegate(System.IntPtr obj,  Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalEo<Efl.Eo.NonOwnTag>))] Efl.Ui.Focus.IObject entry);
 
-     public delegate void efl_ui_focus_manager_setup_on_first_touch_api_delegate(System.IntPtr obj,   Efl.Ui.Focus.Direction direction, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(Efl.Eo.MarshalTest<Efl.Ui.Focus.IObjectConcrete, Efl.Eo.NonOwnTag>))]  Efl.Ui.Focus.IObject entry);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_setup_on_first_touch_api_delegate> efl_ui_focus_manager_setup_on_first_touch_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_setup_on_first_touch_api_delegate>(_Module, "efl_ui_focus_manager_setup_on_first_touch");
-     private static void setup_on_first_touch(System.IntPtr obj, System.IntPtr pd,  Efl.Ui.Focus.Direction direction,  Efl.Ui.Focus.IObject entry)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_setup_on_first_touch was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                                                                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).SetupOnFirstTouch( direction,  entry);
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_setup_on_first_touch_api_delegate> efl_ui_focus_manager_setup_on_first_touch_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_setup_on_first_touch_api_delegate>(Module, "efl_ui_focus_manager_setup_on_first_touch");
+
+        private static void setup_on_first_touch(System.IntPtr obj, System.IntPtr pd, Efl.Ui.Focus.Direction direction, Efl.Ui.Focus.IObject entry)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_setup_on_first_touch was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+                                                            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).SetupOnFirstTouch(direction, entry);
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+                                        
+            }
+            else
+            {
+                efl_ui_focus_manager_setup_on_first_touch_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)), direction, entry);
             }
-                                                } else {
-            efl_ui_focus_manager_setup_on_first_touch_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)),  direction,  entry);
         }
-    }
-    private static efl_ui_focus_manager_setup_on_first_touch_delegate efl_ui_focus_manager_setup_on_first_touch_static_delegate;
 
+        private static efl_ui_focus_manager_setup_on_first_touch_delegate efl_ui_focus_manager_setup_on_first_touch_static_delegate;
 
-     private delegate void efl_ui_focus_manager_dirty_logic_freeze_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void efl_ui_focus_manager_dirty_logic_freeze_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        
+        public delegate void efl_ui_focus_manager_dirty_logic_freeze_api_delegate(System.IntPtr obj);
 
-     public delegate void efl_ui_focus_manager_dirty_logic_freeze_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_freeze_api_delegate> efl_ui_focus_manager_dirty_logic_freeze_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_freeze_api_delegate>(_Module, "efl_ui_focus_manager_dirty_logic_freeze");
-     private static void dirty_logic_freeze(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_dirty_logic_freeze was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).FreezeDirtyLogic();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_freeze_api_delegate> efl_ui_focus_manager_dirty_logic_freeze_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_freeze_api_delegate>(Module, "efl_ui_focus_manager_dirty_logic_freeze");
+
+        private static void dirty_logic_freeze(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_dirty_logic_freeze was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).FreezeDirtyLogic();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        
+            }
+            else
+            {
+                efl_ui_focus_manager_dirty_logic_freeze_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
             }
-                } else {
-            efl_ui_focus_manager_dirty_logic_freeze_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
         }
-    }
-    private static efl_ui_focus_manager_dirty_logic_freeze_delegate efl_ui_focus_manager_dirty_logic_freeze_static_delegate;
 
+        private static efl_ui_focus_manager_dirty_logic_freeze_delegate efl_ui_focus_manager_dirty_logic_freeze_static_delegate;
 
-     private delegate void efl_ui_focus_manager_dirty_logic_unfreeze_delegate(System.IntPtr obj, System.IntPtr pd);
+        
+        private delegate void efl_ui_focus_manager_dirty_logic_unfreeze_delegate(System.IntPtr obj, System.IntPtr pd);
 
+        
+        public delegate void efl_ui_focus_manager_dirty_logic_unfreeze_api_delegate(System.IntPtr obj);
 
-     public delegate void efl_ui_focus_manager_dirty_logic_unfreeze_api_delegate(System.IntPtr obj);
-     public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_unfreeze_api_delegate> efl_ui_focus_manager_dirty_logic_unfreeze_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_unfreeze_api_delegate>(_Module, "efl_ui_focus_manager_dirty_logic_unfreeze");
-     private static void dirty_logic_unfreeze(System.IntPtr obj, System.IntPtr pd)
-    {
-        Eina.Log.Debug("function efl_ui_focus_manager_dirty_logic_unfreeze was called");
-        Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
-        if(wrapper != null) {
-                        
-            try {
-                ((IInterfaceScrollableConcrete)wrapper).DirtyLogicUnfreeze();
-            } catch (Exception e) {
-                Eina.Log.Warning($"Callback error: {e.ToString()}");
-                Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+        public static Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_unfreeze_api_delegate> efl_ui_focus_manager_dirty_logic_unfreeze_ptr = new Efl.Eo.FunctionWrapper<efl_ui_focus_manager_dirty_logic_unfreeze_api_delegate>(Module, "efl_ui_focus_manager_dirty_logic_unfreeze");
+
+        private static void dirty_logic_unfreeze(System.IntPtr obj, System.IntPtr pd)
+        {
+            Eina.Log.Debug("function efl_ui_focus_manager_dirty_logic_unfreeze was called");
+            Efl.Eo.IWrapper wrapper = Efl.Eo.Globals.PrivateDataGet(pd);
+            if (wrapper != null)
+            {
+            
+                try
+                {
+                    ((IInterfaceScrollableConcrete)wrapper).DirtyLogicUnfreeze();
+                }
+                catch (Exception e)
+                {
+                    Eina.Log.Warning($"Callback error: {e.ToString()}");
+                    Eina.Error.Set(Eina.Error.UNHANDLED_EXCEPTION);
+                }
+
+        
+            }
+            else
+            {
+                efl_ui_focus_manager_dirty_logic_unfreeze_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
             }
-                } else {
-            efl_ui_focus_manager_dirty_logic_unfreeze_ptr.Value.Delegate(Efl.Eo.Globals.efl_super(obj, Efl.Eo.Globals.efl_class_get(obj)));
         }
-    }
-    private static efl_ui_focus_manager_dirty_logic_unfreeze_delegate efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate;
+
+        private static efl_ui_focus_manager_dirty_logic_unfreeze_delegate efl_ui_focus_manager_dirty_logic_unfreeze_static_delegate;
+
+        #pragma warning restore CA1707, SA1300, SA1600
+
+}
 }
-} 
-namespace Elm { namespace Scroller { 
+}
+
+namespace Elm {
+
+namespace Scroller {
+
 /// <summary>Type that controls when scrollbars should appear.
 /// See also <see cref="Elm.IInterfaceScrollable.GetPolicy"/>.</summary>
 public enum Policy
@@ -5500,8 +7215,15 @@ Off = 2,
 /// <summary>Sentinel value to indicate last enum field during iteration</summary>
 Last = 3,
 }
-} } 
-namespace Elm { namespace Scroller { 
+
+}
+
+}
+
+namespace Elm {
+
+namespace Scroller {
+
 /// <summary>Type that controls how the content is scrolled.
 /// See also <see cref="Elm.IInterfaceScrollable.SetSingleDirection"/>.</summary>
 public enum SingleDirection
@@ -5515,4 +7237,8 @@ Hard = 2,
 /// <summary>Sentinel value to indicate last enum field during iteration</summary>
 Last = 3,
 }
-} } 
+
+}
+
+}
+