diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index 69afcccbf0..f3efc840aa 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -20,7 +20,7 @@ enum Efl.Ui.Focus.Direction
    down = 3,     [[ down direction ]]
    right = 4,    [[ right direction ]]
    left = 5,     [[ left direction ]]
-   last = 6
+   last = 6      [[ last direction ]]
 }
 
 enum Efl.Ui.Interest_Region_Mode
diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo
index dd7fcaa856..8d5644330f 100644
--- a/src/lib/elementary/efl_ui_focus_composition.eo
+++ b/src/lib/elementary/efl_ui_focus_composition.eo
@@ -39,7 +39,7 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) {
            Set to $null to register them in the same manager as the implementor is
          ]]
          values {
-            custom_manager : Efl.Ui.Focus.Manager;
+            custom_manager : Efl.Ui.Focus.Manager; [[EFL focus manager]]
          }
       }
       @property logical_mode @protected {
diff --git a/src/lib/elementary/efl_ui_focus_composition_adapter.eo b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
index 016d5d959a..b6e9fc927b 100644
--- a/src/lib/elementary/efl_ui_focus_composition_adapter.eo
+++ b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
@@ -1,9 +1,11 @@
 class Efl.Ui.Focus.Composition.Adapter (Efl.Object, Efl.Ui.Focus.Object)
 {
+   [[EFL UI Focus Composition Adapter class]]
    methods {
       @property canvas_object {
+         [[Canvas Object Property]]
          values {
-            v : Efl.Canvas.Object;
+            v : Efl.Canvas.Object; [[EFL canvas object]]
          }
       }
    }
diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo
index 1728a7dbce..7063c13c96 100644
--- a/src/lib/elementary/efl_ui_focus_layer.eo
+++ b/src/lib/elementary/efl_ui_focus_layer.eo
@@ -7,6 +7,7 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manag
    ]]
    methods {
      @property enable @protected {
+        [[Enable property]]
         values {
            v : bool; [[$true to set enable the layer $false to disable it]]
         }
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo
index 3d26ab20fc..60d7b8b69b 100644
--- a/src/lib/elementary/efl_ui_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_focus_manager.eo
@@ -14,7 +14,7 @@ struct Efl.Ui.Focus.Relations {
     parent : Efl.Ui.Focus.Object; [[Parent object]]
     redirect : Efl.Ui.Focus.Manager; [[Redirect manager]]
     node : Efl.Ui.Focus.Object; [[The node where this is the information from]]
-    logical : bool; [[true if this node is only logical]]
+    logical : bool; [[$true if this node is only logical]]
     position_in_history : int; [[The position in the history stack]]
 }
 
@@ -116,9 +116,9 @@ interface Efl.Ui.Focus.Manager {
               so you can call this function out of a prepare call.
             ]]
               params {
-                 child : Efl.Ui.Focus.Object;
+                 child : Efl.Ui.Focus.Object; [[Parent for returned child]]
               }
-              return : Efl.Ui.Focus.Object;
+              return : Efl.Ui.Focus.Object; [[Child of passed parameter]]
         }
         fetch {
             [[This will fetch the data from a registered node.
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider.eo b/src/lib/elementary/efl_ui_focus_parent_provider.eo
index 13d4638cf2..04fa38ae31 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider.eo
@@ -1,11 +1,12 @@
 interface Efl.Ui.Focus.Parent_Provider {
+   [[EFL UI Focus Parent Provider interface]]
    methods {
       find_logical_parent {
         [[Called to get the logical parent of widget]]
         params {
-           widget : Efl.Ui.Focus.Object;
+           widget : Efl.Ui.Focus.Object; [[Object to find parent for]]
         }
-        return : Efl.Ui.Focus.Object;
+        return : Efl.Ui.Focus.Object; [[Parent of parameter object]]
       }
    }
 }
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
index a863b629fe..fbdf7d2bba 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
@@ -1,13 +1,16 @@
 class Efl.Ui.Focus.Parent_Provider.Gen(Efl.Object, Efl.Ui.Focus.Parent_Provider) {
+   [[EFL UI Focus Parent Provider Gen class]]
    methods {
       @property content_item_map {
+         [[Content item map property]]
          values {
-            map : hash<Elm.Widget, Elm.Widget.Item>;
+            map : hash<Elm.Widget, Elm.Widget.Item>; [[Item map]]
          }
       }
       @property container {
+         [[Container property]]
          values {
-            container : Elm.Widget;
+            container : Elm.Widget; [[Container widget]]
          }
       }
    }
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo b/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
index 9daa4aef98..3696bcbfe3 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
@@ -1,4 +1,5 @@
 class Efl.Ui.Focus.Parent_Provider.Standard(Efl.Object, Efl.Ui.Focus.Parent_Provider) {
+   [[EFL UI Focus Parent Provider Standard Class]]
    implements {
       Efl.Ui.Focus.Parent_Provider.find_logical_parent;
    }
diff --git a/src/lib/elementary/efl_ui_focus_rectangle.eo b/src/lib/elementary/efl_ui_focus_rectangle.eo
index 63d9ca960c..fdfb145b24 100644
--- a/src/lib/elementary/efl_ui_focus_rectangle.eo
+++ b/src/lib/elementary/efl_ui_focus_rectangle.eo
@@ -1,5 +1,6 @@
 class Efl.Ui.Focus.Rectangle (Efl.Canvas.Rectangle, Efl.Ui.Focus.Object)
 {
+   [[EFL UI Focus Rectangle class]]
    implements {
       Efl.Ui.Focus.Object.focus_geometry {get;}
       Efl.Ui.Focus.Object.focus {set; get;}
diff --git a/src/lib/elementary/efl_ui_focus_util.eo b/src/lib/elementary/efl_ui_focus_util.eo
index 969afda61f..651193b10f 100644
--- a/src/lib/elementary/efl_ui_focus_util.eo
+++ b/src/lib/elementary/efl_ui_focus_util.eo
@@ -1,8 +1,10 @@
 class Efl.Ui.Focus.Util(Efl.Object) {
+   [[EFL UI Focus Util class]]
    methods {
       focus @class {
+         [[Focus helper method]]
          params {
-            focus_elem : Efl.Ui.Focus.Object;
+            focus_elem : Efl.Ui.Focus.Object; [[Focus element]]
          }
       }
    }