automount UI

automount implemented using standard facets and containing_entity pkey generation

sample data fixtures for automount.

messages for automount and HBAC.

modified form of the search facet used to nest the automount entities

Add works for nested entities.  Delete works for all but keys.  Since the API for this is going to change, I'm not going to fix it pre-checkin.

All the places the PKEY prefix is needed uses a single function. Added breadcrumb trail into title.

update ipa_init sample data

add redirect logic for pages without pkeys.

add and delete link to appropriate entities for nested search facet.

Using on demand entities.  Fixed breadcrumbs.

24 files changed, 6134 insertions, 288 deletions

diff --git a/install/ui/add.js b/install/ui/add.js
index 097753f48..0df0db612 100644
--- a/install/ui/add.js
+++ b/install/ui/add.js
@@ -41,8 +41,8 @@ IPA.add_dialog = function (spec) {
             that.add(
                 record,
                 function(data, text_status, xhr) {
-                    var entity = IPA.get_entity(that.entity_name);
-                    var facet = entity.get_facet('search');
+                    var facet_name =   IPA.current_facet(IPA.current_entity);
+                    var facet = IPA.current_entity.get_facet(facet_name);
                     var table = facet.table;
                     table.refresh();
                     that.close();
@@ -57,8 +57,8 @@ IPA.add_dialog = function (spec) {
             that.add(
                 record,
                 function(data, text_status, xhr) {
-                    var entity = IPA.get_entity(that.entity_name);
-                    var facet = entity.get_facet('search');
+                    var facet_name =   IPA.current_facet(IPA.current_entity);
+                    var facet = IPA.current_entity.get_facet(facet_name);
                     var table = facet.table;
                     table.refresh();
                     that.reset();
@@ -97,6 +97,7 @@ IPA.add_dialog = function (spec) {
 
     that.add = function(record, on_success, on_error) {
 
+        var field, value, pkey_prefix;
         var pkey_name = IPA.metadata.objects[that.entity_name].primary_key;
 
         var command = IPA.command({
@@ -106,7 +107,11 @@ IPA.add_dialog = function (spec) {
             on_error: on_error
         });
 
-        var field, value;
+        pkey_prefix = IPA.get_entity(that.entity_name).get_primary_key_prefix();
+
+        for (var h=0; h<pkey_prefix.length; h++) {
+            command.add_arg(pkey_prefix[h]);
+        }
 
         var fields = that.fields.values;
         for (var i=0; i<fields.length; i++) {
diff --git a/install/ui/associate.js b/install/ui/associate.js
index 4d9e728d1..b237d326f 100644
--- a/install/ui/associate.js
+++ b/install/ui/associate.js
@@ -1024,11 +1024,12 @@ IPA.association_facet = function (spec) {
             summary.append('<p>'+error_thrown.message+'</p>');
         }
 
-        var pkey = $.bbq.getState(that.entity_name + '-pkey', true) || '';
+        var pkey = IPA.get_entity(that.entity_name).get_primary_key();
+
         IPA.command({
             entity: that.entity_name,
             method: 'show',
-            args: [pkey],
+            args: pkey,
             options: {'all': true, 'rights': true},
             on_success: on_success,
             on_error: on_error
diff --git a/install/ui/automount.js b/install/ui/automount.js
index 527fed2d3..f865fe73f 100644
--- a/install/ui/automount.js
+++ b/install/ui/automount.js
@@ -28,20 +28,74 @@
 
 IPA.entity_factories.automountlocation = function() {
     return IPA.entity_builder().
-        entity('automountlocation').
+        entity({name:'automountlocation',
+                title:IPA.messages.tabs.automount}).
         search_facet({
             columns:['cn']
         }).
-        details_facet({sections:[{
-            name:'identity',
-            label: IPA.messages.details.identity,
-            fields:['cn']
-        }]}).
-        standard_association_facets().
+        nested_search_facet({
+            facet_group: 'member',
+            nested_entity : 'automountmap',
+            label : IPA.metadata.objects.automountmap.label,
+            name: 'maps',
+            columns:['automountmapname']
+        }).
+        details_facet({
+            sections:[
+                {
+                    name:'identity',
+                    label: IPA.messages.details.identity,
+                    fields:['cn']
+                }
+            ]}).
         adder_dialog({
             fields:['cn']
         }).
         build();
 };
+IPA.entity_factories.automountmap = function() {
+    return IPA.entity_builder().
+        entity({name:'automountmap',
+                title:IPA.messages.tabs.automount}).
+        containing_entity('automountlocation').
+        nested_search_facet({
+            facet_group: 'member',
+            nested_entity : 'automountkey',
+            label : IPA.metadata.objects.automountkey.label,
+            name: 'keys',
+            columns:['description']
+        }).
+        details_facet({
+            sections:[
+                {
+                    name:'identity',
+                    label: IPA.messages.details.identity,
+                    fields:['automountmapname','description']
+                }
+            ]
+        }).
+        adder_dialog({
+            fields:['automountmapname','description']
+        }).
+        build();
+};
 
-
+IPA.entity_factories.automountkey = function() {
+    return IPA.entity_builder().
+        entity({name:'automountkey',
+                title:IPA.messages.tabs.automount}).
+        containing_entity('automountmap').
+        details_facet({
+            sections:[
+                {
+                    name:'identity',
+                    label: IPA.messages.details.identity,
+                    fields:['automountkey','automountinformation','description']
+                }
+            ]
+        }).
+        adder_dialog({
+            fields:['automountkey','automountinformation']
+        }).
+        build();
+};
diff --git a/install/ui/details.js b/install/ui/details.js
index ee5b55545..a62b97fbd 100644
--- a/install/ui/details.js
+++ b/install/ui/details.js
@@ -310,13 +310,26 @@ IPA.details_facet = function(spec) {
         }
     };
 
-    that.get_primary_key = function() {
-        var pkey_name = IPA.metadata.objects[that.entity_name].primary_key;
-        if (that.record[pkey_name] instanceof Array){
-            return that.record[pkey_name][0];
+    /* the primary key used for show and update is built as an array.
+       for most entities, this will be a single element long, but for some
+       it requires the containing entities primary keys as well.*/
+    that.get_primary_key = function(from_url) {
+
+        var pkey = IPA.get_entity(that.entity_name).get_primary_key_prefix();
+
+        if (from_url){
+            pkey.push(that.pkey);
         }else{
-            return that.record[pkey_name];
+            var pkey_name = IPA.metadata.objects[that.entity_name].primary_key;
+            var pkey_val = that.record[pkey_name];
+            if (pkey_val instanceof Array){
+                pkey.push( pkey_val[0]);
+            }else{
+                pkey.push(pkey_val);
+            }
         }
+
+        return pkey;
     };
 
     that.create_header = function(container) {
@@ -577,9 +590,7 @@ IPA.details_facet = function(spec) {
             }
         }
 
-        var pkey = that.get_primary_key();
-
-        var args = pkey ? [pkey] : [];
+        var args = that.get_primary_key();
 
         var command = IPA.command({
             entity: entity_name,
@@ -597,7 +608,7 @@ IPA.details_facet = function(spec) {
 
     that.refresh = function() {
 
-        that.pkey = $.bbq.getState(that.entity_name + '-pkey', true) ;
+        that.pkey = $.bbq.getState(that.entity_name + '-pkey', true) || '';
 
         var command = IPA.command({
             entity: that.entity_name,
@@ -609,9 +620,17 @@ IPA.details_facet = function(spec) {
             IPA.details_refresh_devel_hook(that.entity_name,command,that.pkey);
         }
 
-
         if (that.pkey){
-            command.args =  [that.pkey];
+            command.args = that.get_primary_key(true);
+        }else if (that.entity.redirect_facet) {
+            var current_entity = that.entity;
+            while (current_entity.containing_entity){
+                current_entity = current_entity.containing_entity;
+            }
+            IPA.nav.show_page(
+                current_entity.name,
+                that.entity.redirect_facet);
+            return;
         }
 
         command.on_success = function(data, text_status, xhr) {
diff --git a/install/ui/entity.js b/install/ui/entity.js
index 8af4af968..889b6be38 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -147,20 +147,9 @@ IPA.table_facet = function(spec) {
 
     var that = IPA.facet(spec);
 
-    that.columns = $.ordered_map();
-
-    that.__defineGetter__('entity_name', function() {
-        return that._entity_name;
-    });
-
-    that.__defineSetter__('entity_name', function(entity_name) {
-        that._entity_name = entity_name;
+    that.managed_entity_name = spec.managed_entity_name || that.entity_name;
 
-        var columns = that.columns.values;
-        for (var i=0; i<columns.length; i++) {
-            columns[i].entity_name = entity_name;
-        }
-    });
+    that.columns = $.ordered_map();
 
     that.get_columns = function() {
         return that.columns.values;
@@ -171,7 +160,7 @@ IPA.table_facet = function(spec) {
     };
 
     that.add_column = function(column) {
-        column.entity_name = that.entity_name;
+        column.entity_name = that.managed_entity_name;
         that.columns.put(column.name, column);
     };
 
@@ -233,6 +222,7 @@ IPA.entity = function (spec) {
     that.metadata = spec.metadata;
     that.name = spec.name;
     that.label = spec.label || spec.metadata.label || spec.name;
+    that.title = spec.title || that.label;
 
     that.header = spec.header || IPA.entity_header({entity: that});
 
@@ -244,6 +234,8 @@ IPA.entity = function (spec) {
     // current facet
     that.facet_name = null;
 
+    that.redirect_facet = spec.redirect_facet;
+    that.containing_entity = null;
     that.get_dialog = function(name) {
         return that.dialogs.get(name);
     };
@@ -367,6 +359,28 @@ IPA.entity = function (spec) {
         that.facet.refresh();
     };
 
+    that.get_primary_key_prefix = function() {
+        var pkey = [];
+        var current_entity = that;
+        current_entity = current_entity.containing_entity;
+        while(current_entity !== null){
+            pkey.unshift(
+                $.bbq.getState(current_entity.name + '-pkey', true) || '');
+            current_entity = current_entity.containing_entity;
+        }
+        return pkey;
+    };
+
+    /*gets the primary key for trhe current entity out of the URL parameters */
+    that.get_primary_key = function() {
+        var pkey = that.get_primary_key_prefix();
+        var current_entity = that;
+        pkey.unshift(
+            $.bbq.getState(current_entity.name + '-pkey', true) || '');
+        return pkey;
+    };
+
+
     that.entity_init = that.init;
 
     return that;
@@ -375,7 +389,7 @@ IPA.entity = function (spec) {
 IPA.current_facet =  function (entity){
     var facet_name = $.bbq.getState(entity.name + '-facet', true);
     var facets = entity.facets.values;
-    if (!facet_name && facets.length) {
+    if (!facet_name  && facets.length) {
         facet_name = facets[0].name;
     }
     return facet_name;
@@ -471,12 +485,47 @@ IPA.entity_header = function(spec) {
     that.set_pkey = function(value) {
 
         if (value) {
-            var span = $('.entity-pkey', that.pkey);
-            span.text(value);
-            that.pkey.css('display', 'inline');
+            var breadcrumb = [];
+            var current_entity = IPA.current_entity.containing_entity;
+
+            while(current_entity){
+                breadcrumb.unshift($('<a/>',{
+                    text:$.bbq.getState(current_entity.name + '-pkey', true) ||
+                        '',
+                    title: current_entity.name,
+                    click: function() {
+                        var entity = IPA.get_entity((this.title));
+                        IPA.nav.show_page(entity.name, 'default');
+                        $('a', that.facet_tabs).removeClass('selected');
+                        return false;
+                    }
+                }));
+
+                current_entity = current_entity.containing_entity;
+            }
+
+            that.title_container.empty();
+            var h3 =  $('<h3/>').appendTo(that.title_container);
+
+            h3.empty();
+            h3.append(IPA.current_entity.title);
+            h3.append(': ');
+
+            for (var i = 0; i < breadcrumb.length; i+=1){
+                h3.append(breadcrumb[i]);
+                h3.append(' > ');
 
+            }
+            h3.append(
+                $('<span/>', {
+                    'class': 'entity-pkey',
+                    text:value
+                }));
         } else {
-            that.pkey.css('display', 'none');
+            that.title_container.empty();
+            var span =  $('<h3/>',{
+                text:IPA.current_entity.metadata.label
+            }).appendTo(that.title_container);
         }
     };
 
@@ -554,7 +603,12 @@ IPA.entity_header = function(spec) {
                     return false;
                 }
 
-                IPA.nav.show_page(that.entity.name, 'search');
+                var current_entity = that.entity;
+                while(current_entity.containing_entity){
+                    current_entity = current_entity.containing_entity;
+                }
+
+                IPA.nav.show_page(current_entity.name, 'search');
                 $('a', that.facet_tabs).removeClass('selected');
                 return false;
             }
@@ -655,12 +709,9 @@ IPA.entity_builder = function(){
     };
 
     that.facet = function(spec) {
-
         spec.entity_name  = entity.name;
-
         facet = spec.factory(spec);
         entity.add_facet(facet);
-
         return that;
     };
 
@@ -672,6 +723,19 @@ IPA.entity_builder = function(){
         var factory = spec.factory || IPA.search_facet;
         facet = factory(spec);
         entity.add_facet(facet);
+        add_redirect_info();
+
+        return that;
+    };
+
+    that.nested_search_facet = function(spec) {
+
+        spec.entity_name = entity.name;
+        spec.label = spec.label || IPA.messages.facets.search;
+
+        var factory = spec.factory || IPA.nested_search_facet;
+        facet = factory(spec);
+        entity.add_facet(facet);
 
         return that;
     };
@@ -701,22 +765,29 @@ IPA.entity_builder = function(){
         spec.entity_name = entity.name;
 
         var index = spec.name.indexOf('_');
-        spec.attribute_member = spec.attribute_member || spec.name.substring(0, index);
-        spec.other_entity = spec.other_entity || spec.name.substring(index+1);
+        spec.attribute_member = spec.attribute_member ||
+            spec.name.substring(0, index);
+        spec.other_entity = spec.other_entity ||
+            spec.name.substring(index+1);
 
-        spec.facet_group = spec.facet_group || spec.attribute_member;
+        spec.facet_group = spec.facet_group ||
+            spec.attribute_member;
 
-        if (spec.facet_group == 'memberindirect' || spec.facet_group == 'memberofindirect') {
+        if (spec.facet_group == 'memberindirect' ||
+            spec.facet_group == 'memberofindirect') {
             spec.read_only = true;
         }
 
-        spec.label = spec.label || (IPA.metadata.objects[spec.other_entity] ? IPA.metadata.objects[spec.other_entity].label : spec.other_entity);
+        spec.label = spec.label ||
+            (IPA.metadata.objects[spec.other_entity] ?
+             IPA.metadata.objects[spec.other_entity].label : spec.other_entity);
 
         if (!spec.title) {
-            if (spec.facet_group == 'member' || spec.facet_group == 'memberindirect') {
+            if (spec.facet_group == 'member' ||
+                spec.facet_group == 'memberindirect') {
                 spec.title = IPA.messages.association.member;
-
-            } else if (spec.facet_group == 'memberof' || spec.facet_group == 'memberofindirect') {
+            } else if (spec.facet_group == 'memberof' ||
+                       spec.facet_group == 'memberofindirect') {
                 spec.title = IPA.messages.association.memberof;
             }
         }
@@ -794,6 +865,18 @@ IPA.entity_builder = function(){
         }
     };
 
+    function add_redirect_info(facet_name){
+        if (!entity.redirect_facet){
+            entity.redirect_facet = 'search';
+        }
+    }
+
+    that.containing_entity = function(entity_name) {
+        add_redirect_info();
+        entity.containing_entity = IPA.get_entity(entity_name);
+        return that;
+    };
+
     that.dialog = function(spec) {
         var dialog;
         if (spec instanceof Object){
diff --git a/install/ui/host.js b/install/ui/host.js
index 4c43caaa3..cece90d11 100644
--- a/install/ui/host.js
+++ b/install/ui/host.js
@@ -273,7 +273,7 @@ IPA.host_provisioning_status_widget = function (spec) {
             name: that.entity_name+'_disable_'+pkey,
             entity: that.entity_name,
             method: 'disable',
-            args: [pkey],
+            args: pkey,
             options: { all: true, rights: true },
             on_success: on_success,
             on_error: on_error
@@ -291,7 +291,7 @@ IPA.host_provisioning_status_widget = function (spec) {
         var command = IPA.command({
             entity: that.entity_name,
             method: 'mod',
-            args: [pkey],
+            args: pkey,
             options: {
                 all: true,
                 rights: true,
diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index dc3926dbc..826bd180b 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -826,11 +826,15 @@ table.scrollable tbody {
 }
 
 .entity-header .entity-title {
-    text-transform: uppercase;
     color:gray;
     padding-right:5em;
 }
 
+
+.entity-header .entity-title span{
+    display: inline;
+}
+
 .entity-header .entity-title .entity-pkey {
     color:black;
 }
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index 13c894fa6..0266e3499 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -159,6 +159,7 @@ var IPA = ( function () {
         if (IPA.current_entity){
             var facet_name =   IPA.current_facet(IPA.current_entity);
             var facet = IPA.current_entity.get_facet(facet_name);
+            if (!facet) return false;
 
             if (facet.is_dirty()){
 
diff --git a/install/ui/search.js b/install/ui/search.js
index 8e64adff9..450b8a655 100644
--- a/install/ui/search.js
+++ b/install/ui/search.js
@@ -30,40 +30,47 @@ IPA.search_facet = function(spec) {
 
     spec.name = spec.name || 'search';
     spec.display_class = 'search-facet';
+    spec.managed_entity_name = spec.managed_entity_name || spec.entity_name;
 
     var that = IPA.table_facet(spec);
 
     that.search_all = spec.search_all || false;
 
-    that.setup_column = function(column) {
-        column.setup = function(container, record) {
-            container.empty();
-
-            var value = record[column.name];
-            value = value ? value.toString() : '';
-
-            $('<a/>', {
-                'href': '#'+value,
-                'html': value,
-                'click': function (value) {
-                    return function() {
-                        IPA.nav.show_page(that.entity_name, 'default', value);
-                        return false;
-                    };
-                }(value)
-            }).appendTo(container);
-        };
-    };
 
     that.init = function() {
-
         that.facet_init();
+        that.managed_entity = IPA.get_entity(that.managed_entity_name);
+        that.init_table(that.managed_entity);
+    };
+
+    that.init_table = function(entity){
+
+        function setup_column(column,entity) {
+            column.setup = function(container, record) {
+                container.empty();
+
+                var value = record[column.name];
+                value = value ? value.toString() : '';
+
+                $('<a/>', {
+                    'href': '#'+value,
+                    'html': value,
+                    'click': function (value) {
+                        return function() {
+                            IPA.nav.show_page(entity.name, 'default', value);
+                            return false;
+                        };
+                    }(value)
+                }).appendTo(container);
+            };
+        }
+
 
         that.table = IPA.table_widget({
-            id: that.entity_name+'-search',
+            id: entity.name+'-search',
             name: 'search',
-            label: IPA.metadata.objects[that.entity_name].label,
-            entity_name: that.entity_name,
+            label: IPA.metadata.objects[entity.name].label,
+            entity_name: entity.name,
             search_all: that.search_all
         });
 
@@ -71,11 +78,11 @@ IPA.search_facet = function(spec) {
         for (var i=0; i<columns.length; i++) {
             var column = columns[i];
 
-            var param_info = IPA.get_entity_param(that.entity_name, column.name);
+            var param_info = IPA.get_entity_param(entity.name, column.name);
             column.primary_key = param_info && param_info['primary_key'];
 
             if (column.primary_key) {
-                that.setup_column(column);
+                setup_column(column,entity);
             }
 
             that.table.add_column(column);
@@ -148,7 +155,6 @@ IPA.search_facet = function(spec) {
     };
 
     that.setup = function(container) {
-
         that.facet_setup(container);
     };
 
@@ -178,11 +184,16 @@ IPA.search_facet = function(spec) {
     };
 
     that.add = function() {
-        var dialog = that.entity.get_dialog('add');
+        var dialog = that.managed_entity.get_dialog('add');
         dialog.open(that.container);
     };
 
+
     that.remove = function() {
+        that.remove_instances(that.managed_entity);
+    };
+
+    that.remove_instances = function(entity) {
 
         var values = that.table.get_selected_values();
 
@@ -200,7 +211,8 @@ IPA.search_facet = function(spec) {
         var dialog = IPA.deleter_dialog({
             'title': title,
             'parent': that.container,
-            'values': values
+            'values': values,
+            entity_name: entity.name
         });
 
         dialog.execute = function() {
@@ -216,11 +228,19 @@ IPA.search_facet = function(spec) {
                 }
             });
 
+            var pkeys =
+                entity.get_primary_key_prefix();
+
             for (var i=0; i<values.length; i++) {
                 var command = IPA.command({
-                    entity: that.entity_name,
+                    entity: entity.name,
                     method: 'del'
                 });
+
+                for (var k=0; k<pkeys.length; k++) {
+                    command.add_arg(pkeys[k]);
+                }
+
                 command.add_arg(values[i]);
                 batch.add_command(command);
             }
@@ -236,11 +256,15 @@ IPA.search_facet = function(spec) {
     that.find = function() {
         var filter = that.filter.val();
         var state = {};
-        state[that.entity_name + '-filter'] = filter;
+        state[that.managed_entity_name + '-filter'] = filter;
         IPA.nav.push_state(state);
     };
 
     that.refresh = function() {
+        that.search_refresh(that.entity);
+    };
+
+    that.search_refresh = function(entity){
 
         function on_success(data, text_status, xhr) {
 
@@ -271,12 +295,21 @@ IPA.search_facet = function(spec) {
             summary.append('<p>'+error_thrown.message+'</p>');
         }
 
-        var filter = $.bbq.getState(that.entity_name + '-filter', true) || '';
+        var filter = [];
+        var current_entity = entity;
+        filter.unshift($.bbq.getState(current_entity.name + '-filter', true) || '');
+        current_entity = current_entity.containing_entity;
+        while(current_entity !== null){
+            filter.unshift(
+                $.bbq.getState(current_entity.name + '-pkey', true) || '');
+            current_entity = current_entity.containing_entity;
+        }
+
 
         var command = IPA.command({
-            entity: that.entity_name,
+            entity: entity.name,
             method: 'find',
-            args: [filter],
+            args: filter,
             options: {
                 all: that.search_all
             },
@@ -294,3 +327,49 @@ IPA.search_facet = function(spec) {
 
     return that;
 };
+
+
+/*TODO.  this has much copied code from above.  Refactor the search_facet
+To either be nested or not nested. */
+IPA.nested_search_facet = function(spec){
+    spec.managed_entity_name = spec.nested_entity;
+    var that = IPA.search_facet(spec);
+
+    that.show = function() {
+        that.facet_show();
+
+        //that.entity.header.set_pkey(null);
+        that.entity.header.back_link.css('visibility', 'visible');
+        that.entity.header.facet_tabs.css('visibility', 'visible');
+
+        that.entity.header.set_pkey(
+            $.bbq.getState(IPA.current_entity.name + '-pkey', true) || '');
+        if (that.filter) {
+            var filter = 
+                $.bbq.getState(that.managed_entity_name + '-filter', true) || '';
+            that.filter.val(filter);
+        }
+    };
+
+    that.refresh = function(){
+
+        var pkey = $.bbq.getState(that.entity.name + '-pkey', true) || '';
+
+        if ((!pkey) && (that.entity.redirect_facet)) {
+
+            var current_entity = that.entity;
+            while (current_entity.containing_entity){
+                current_entity = current_entity.containing_entity;
+            }
+
+            IPA.nav.show_page(
+                current_entity.name,
+                that.entity.redirect_facet);
+            return;
+        }
+
+        that.search_refresh(that.managed_entity);
+    };
+
+    return that;
+};
diff --git a/install/ui/test/data/automountkey_add.json b/install/ui/test/data/automountkey_add.json
new file mode 100644
index 000000000..2c0193cdd
--- /dev/null
+++ b/install/ui/test/data/automountkey_add.json
@@ -0,0 +1,24 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "result": {
+            "automountinformation": [
+                "mountinfogoeshere"
+            ],
+            "automountkey": [
+                "/var/log/ipa"
+            ],
+            "description": [
+                "/var/log/ipa mountinfogoeshere"
+            ],
+            "dn": "description=/var/log/ipa mountinfogoeshere,automountmapname=auto.master,cn=default,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "objectclass": [
+                "automount",
+                "top"
+            ]
+        },
+        "summary": null,
+        "value": "auto.master"
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountkey_find.json b/install/ui/test/data/automountkey_find.json
new file mode 100644
index 000000000..47326a33c
--- /dev/null
+++ b/install/ui/test/data/automountkey_find.json
@@ -0,0 +1,43 @@
+{
+    "error": null,
+    "id": 0,
+    "result": {
+        "count": 2,
+        "result": [
+            {
+                "automountinformation": [
+                    "/var/log/dirsrv"
+                ],
+                "automountkey": [
+                    "nfsserver:/var/log/dirsrv"
+                ],
+                "description": [
+                    "nfsserver:/var/log/dirsrv /var/log/dirsrv"
+                ],
+                "dn": "description=nfsserver:/var/log/dirsrv /var/log/dirsrv,automountmapname=auto.log,cn=bos,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "objectclass": [
+                    "automount",
+                    "top"
+                ]
+            },
+            {
+                "automountinformation": [
+                    "/var/log/ipa"
+                ],
+                "automountkey": [
+                    "nfsserver:/var/log/ipa"
+                ],
+                "description": [
+                    "nfsserver:/var/log/ipa /var/log/ipa"
+                ],
+                "dn": "description=nfsserver:/var/log/ipa /var/log/ipa,automountmapname=auto.log,cn=bos,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "objectclass": [
+                    "automount",
+                    "top"
+                ]
+            }
+        ],
+        "summary": null,
+        "truncated": false
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountkey_show.json b/install/ui/test/data/automountkey_show.json
new file mode 100644
index 000000000..f4c06716c
--- /dev/null
+++ b/install/ui/test/data/automountkey_show.json
@@ -0,0 +1,32 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "result": {
+            "attributelevelrights": {
+                "aci": "rscwo",
+                "automountinformation": "rscwo",
+                "automountkey": "rscwo",
+                "description": "rscwo",
+                "nsaccountlock": "rscwo",
+                "objectclass": "rscwo"
+            },
+            "automountinformation": [
+                "auto.home"
+            ],
+            "automountkey": [
+                "/home"
+            ],
+            "description": [
+                "/home auto.home"
+            ],
+            "dn": "description=/home auto.home,automountmapname=auto.master,cn=default,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "objectclass": [
+                "automount",
+                "top"
+            ]
+        },
+        "summary": null,
+        "value": "/home auto.home"
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountlocation_add.json b/install/ui/test/data/automountlocation_add.json
new file mode 100644
index 000000000..4e810eb0b
--- /dev/null
+++ b/install/ui/test/data/automountlocation_add.json
@@ -0,0 +1,18 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "result": {
+            "cn": [
+                "YYZ"
+            ],
+            "dn": "cn=yyz,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "objectclass": [
+                "nscontainer",
+                "top"
+            ]
+        },
+        "summary": null,
+        "value": "YYZ"
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountlocation_del.json b/install/ui/test/data/automountlocation_del.json
new file mode 100644
index 000000000..105052fd7
--- /dev/null
+++ b/install/ui/test/data/automountlocation_del.json
@@ -0,0 +1,17 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "count": 1,
+        "results": [
+            {
+                "error": null,
+                "result": {
+                    "failed": ""
+                },
+                "summary": null,
+                "value": "YYZ"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountlocation_find.json b/install/ui/test/data/automountlocation_find.json
index ea1a54e83..0adc74835 100644
--- a/install/ui/test/data/automountlocation_find.json
+++ b/install/ui/test/data/automountlocation_find.json
@@ -1,17 +1,35 @@
 {
-    "error": null, 
-    "id": 6, 
+    "error": null,
+    "id": null,
     "result": {
-        "count": 1, 
+        "count": 4,
         "result": [
             {
                 "cn": [
+                    "BOS"
+                ],
+                "dn": "cn=bos,cn=automount,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
+            },
+            {
+                "cn": [
+                    "BRNO"
+                ],
+                "dn": "cn=brno,cn=automount,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
+            },
+            {
+                "cn": [
                     "default"
-                ], 
+                ],
                 "dn": "cn=default,cn=automount,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
+            },
+            {
+                "cn": [
+                    "RDU"
+                ],
+                "dn": "cn=rdu,cn=automount,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
             }
-        ], 
-        "summary": null, 
+        ],
+        "summary": null,
         "truncated": false
     }
 }
\ No newline at end of file
diff --git a/install/ui/test/data/automountmap_add.json b/install/ui/test/data/automountmap_add.json
new file mode 100644
index 000000000..129aef1a8
--- /dev/null
+++ b/install/ui/test/data/automountmap_add.json
@@ -0,0 +1,18 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "result": {
+            "automountmapname": [
+                "auto.log"
+            ],
+            "dn": "automountmapname=auto.log,cn=mtv,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+            "objectclass": [
+                "automountmap",
+                "top"
+            ]
+        },
+        "summary": null,
+        "value": "auto.log"
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountmap_del.json b/install/ui/test/data/automountmap_del.json
new file mode 100644
index 000000000..d80f08d17
--- /dev/null
+++ b/install/ui/test/data/automountmap_del.json
@@ -0,0 +1,17 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "count": 1,
+        "results": [
+            {
+                "error": null,
+                "result": {
+                    "failed": ""
+                },
+                "summary": null,
+                "value": "auto.log"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountmap_find.json b/install/ui/test/data/automountmap_find.json
new file mode 100644
index 000000000..2cd077d74
--- /dev/null
+++ b/install/ui/test/data/automountmap_find.json
@@ -0,0 +1,51 @@
+{
+    "error": null,
+    "id": 0,
+    "result": {
+        "count": 4,
+        "result": [
+            {
+                "automountmapname": [
+                    "auto.direct"
+                ],
+                "dn": "automountmapname=auto.direct,cn=bos,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "objectclass": [
+                    "automountmap",
+                    "top"
+                ]
+            },
+            {
+                "automountmapname": [
+                    "auto.home"
+                ],
+                "dn": "automountmapname=auto.home,cn=bos,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "objectclass": [
+                    "automountmap",
+                    "top"
+                ]
+            },
+            {
+                "automountmapname": [
+                    "auto.log"
+                ],
+                "dn": "automountmapname=auto.log,cn=bos,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "objectclass": [
+                    "automountmap",
+                    "top"
+                ]
+            },
+            {
+                "automountmapname": [
+                    "auto.master"
+                ],
+                "dn": "automountmapname=auto.master,cn=bos,cn=automount,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                "objectclass": [
+                    "automountmap",
+                    "top"
+                ]
+            }
+        ],
+        "summary": null,
+        "truncated": false
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/automountmap_show.json b/install/ui/test/data/automountmap_show.json
new file mode 100644
index 000000000..8380a6ca1
--- /dev/null
+++ b/install/ui/test/data/automountmap_show.json
@@ -0,0 +1,14 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "result": {
+            "automountmapname": [
+                "live"
+            ],
+            "dn": "automountmapname=live,cn=bos,cn=automount,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
+        },
+        "summary": null,
+        "value": "live"
+    }
+}
\ No newline at end of file
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 538b36e0f..b7df77797 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -26,6 +26,7 @@
                         "__base64__": ""
                     },
                     "automountkey_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -86,18 +87,355 @@
                         ]
                     },
                     "automountkey_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "IA5Str",
+                                "cli_name": "key",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Automount key name.",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Key",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "automountkey",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "IA5Str",
+                                "cli_name": "info",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Mount information",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Mount information",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "automountinformation",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "automountkey_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "automountkey_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "IA5Str",
+                                "cli_name": "newinfo",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "New mount information",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "New mount information",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "newautomountinformation",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "automountkey_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "IA5Str",
+                                "cli_name": "key",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Automount key name.",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Key",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "automountkey",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "IA5Str",
+                                "cli_name": "info",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Mount information",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Mount information",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "automountinformation",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "automountlocation_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -158,21 +496,200 @@
                         ]
                     },
                     "automountlocation_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "automountlocation_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "automountlocation_import": {
-                        "__base64__": ""
+                        "takes_args": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "masterfile",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Automount master file.",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Master file",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "masterfile",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            }
+                        ],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous operation mode. Errors are reported but the process continues.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "automountlocation_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "automountlocation_tofiles": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "automountmap_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -233,6 +750,7 @@
                         ]
                     },
                     "automountmap_add_indirect": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -345,24 +863,353 @@
                         ]
                     },
                     "automountmap_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "automountmap_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "automountmap_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "automountmap_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "config_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "config_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "cosentry_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -423,16 +1270,222 @@
                         ]
                     },
                     "cosentry_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "cosentry_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "cosentry_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "cosentry_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "delegation_add": {
                         "__base64__": ""
@@ -450,6 +1503,7 @@
                         "__base64__": ""
                     },
                     "dnsrecord_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -544,21 +1598,173 @@
                         ]
                     },
                     "dnsrecord_add_record": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "dnsrecord_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "del_all",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Delete all associated records",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Delete all associated records",
+                                "multivalue": false,
+                                "name": "del_all",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "dnsrecord_delentry": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "dnsrecord_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "dnsrecord_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "dnszone_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -676,22 +1882,230 @@
                         ]
                     },
                     "dnszone_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "dnszone_disable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "dnszone_enable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "dnszone_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "dnszone_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "dnszone_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "entitle_consume": {
                         "takes_args": [
@@ -1095,6 +2509,7 @@
                         ]
                     },
                     "group_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1186,27 +2601,299 @@
                         ]
                     },
                     "group_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "group_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "group_detach": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "group_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "private",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "search for private groups",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<private>",
+                                "multivalue": false,
+                                "name": "private",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "group_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "posix",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "change to a POSIX group",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<posix>",
+                                "multivalue": false,
+                                "name": "posix",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "group_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "group_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacrule_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1267,48 +2954,265 @@
                         ]
                     },
                     "hbacrule_add_host": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_add_service": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_add_sourcehost": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_add_user": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacrule_disable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_enable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "hbacrule_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacrule_remove_host": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_remove_service": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_remove_sourcehost": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_remove_user": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacrule_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacsvc_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1369,18 +3273,225 @@
                         ]
                     },
                     "hbacsvc_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacsvc_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "hbacsvc_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacsvc_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacsvcgroup_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1441,24 +3552,233 @@
                         ]
                     },
                     "hbacsvcgroup_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacsvcgroup_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacsvcgroup_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "hbacsvcgroup_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hbacsvcgroup_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hbacsvcgroup_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "host_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1551,27 +3871,289 @@
                         ]
                     },
                     "host_add_managedby": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "host_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "updatedns",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Remove entries from DNS",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<updatedns>",
+                                "multivalue": false,
+                                "name": "updatedns",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "host_disable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "host_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "host_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": true,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "principalname",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Kerberos principal name for this host",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Principal name",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "krbprincipalname",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "host_remove_managedby": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "host_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "out",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "file to store certificate in",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<out>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "out",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "hostgroup_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1632,33 +4214,365 @@
                         ]
                     },
                     "hostgroup_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hostgroup_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hostgroup_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "hostgroup_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "hostgroup_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "hostgroup_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "krbtpolicy_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "krbtpolicy_reset": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "krbtpolicy_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "netgroup_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1719,24 +4633,264 @@
                         ]
                     },
                     "netgroup_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "netgroup_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "netgroup_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "private",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "search for private groups",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<private>",
+                                "multivalue": false,
+                                "name": "private",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "netgroup_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "netgroup_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "netgroup_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "permission_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1797,24 +4951,233 @@
                         ]
                     },
                     "permission_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "permission_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "permission_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "permission_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "permission_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "permission_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "privilege_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1875,30 +5238,241 @@
                         ]
                     },
                     "privilege_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "privilege_add_permission": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "privilege_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "privilege_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "privilege_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "privilege_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "privilege_remove_permission": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "privilege_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "pwpolicy_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -1959,18 +5533,251 @@
                         ]
                     },
                     "pwpolicy_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "pwpolicy_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "pwpolicy_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "pwpolicy_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "user",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Display effective policy for a specific user",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "User",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "user",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "role_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -2031,28 +5838,238 @@
                         ]
                     },
                     "role_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "role_add_privilege": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "role_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "role_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "role_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "role_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "role_remove_privilege": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "role_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "selfservice_add": {
                         "__base64__": ""
@@ -2070,6 +6087,7 @@
                         "__base64__": ""
                     },
                     "service_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -2105,27 +6123,263 @@
                         ]
                     },
                     "service_add_host": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "service_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "service_disable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "service_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "service_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "service_remove_host": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "service_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "out",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "file to store certificate in",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<out>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "out",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "sudocmd_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -2186,18 +6440,225 @@
                         ]
                     },
                     "sudocmd_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudocmd_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "sudocmd_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudocmd_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudocmdgroup_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -2258,24 +6719,233 @@
                         ]
                     },
                     "sudocmdgroup_add_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudocmdgroup_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudocmdgroup_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "sudocmdgroup_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudocmdgroup_remove_member": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudocmdgroup_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudorule_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -2336,66 +7006,343 @@
                         ]
                     },
                     "sudorule_add_allow_command": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_add_deny_command": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_add_host": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_add_option": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "sudooption",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Sudo Option",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Sudo Option",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "ipasudoopt",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "sudorule_add_runasgroup": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_add_runasuser": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_add_user": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudorule_disable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_enable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            }
+                        ]
                     },
                     "sudorule_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "sudorule_remove_allow_command": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_remove_deny_command": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_remove_host": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_remove_option": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "sudooption",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Sudo Option",
+                                "exclude": null,
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Sudo Option",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": false,
+                                "name": "ipasudoopt",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            }
+                        ]
                     },
                     "sudorule_remove_runasgroup": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_remove_runasuser": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_remove_user": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "sudorule_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "user_add": {
+                        "takes_args": [],
                         "takes_options": [
                             {
                                 "alwaysask": false,
@@ -2452,29 +7399,300 @@
                                 "query": false,
                                 "required": false,
                                 "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "noprivate",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Don't create user private group",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<noprivate>",
+                                "multivalue": false,
+                                "name": "noprivate",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
                             }
                         ]
                     },
                     "user_del": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "continue",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Continuous mode: Don't stop on errors.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<continue>",
+                                "multivalue": false,
+                                "name": "continue",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "user_disable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "user_enable": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     },
                     "user_find": {
-                        "__base64__": ""
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "timelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Time limit of search in seconds",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Time Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "timelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Int",
+                                "cli_name": "sizelimit",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Maximum number of entries returned",
+                                "exclude": null,
+                                "flags": [
+                                    "no_display"
+                                ],
+                                "hint": null,
+                                "include": null,
+                                "label": "Size Limit",
+                                "maxvalue": 2147483647,
+                                "minvalue": 0,
+                                "multivalue": false,
+                                "name": "sizelimit",
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "int"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "whoami",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display user record for current Kerberos principal",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Self",
+                                "multivalue": false,
+                                "name": "whoami",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "user_mod": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "addattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Add an attribute/value pair. Format is attr=value. The attribute must be part of the schema.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<addattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "addattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": false,
+                                "class": "Str",
+                                "cli_name": "setattr",
+                                "cli_short_name": null,
+                                "default": null,
+                                "doc": "Set an attribute to a name/value pair. Format is attr=value.\nFor multi-valued attributes, the command replaces the values already present.",
+                                "exclude": [
+                                    "webui"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "<setattr>",
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
+                                "multivalue": true,
+                                "name": "setattr",
+                                "pattern": null,
+                                "pattern_errmsg": null,
+                                "primary_key": false,
+                                "query": false,
+                                "required": false,
+                                "type": "unicode"
+                            },
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "user_show": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": [
+                            {
+                                "alwaysask": false,
+                                "attribute": false,
+                                "autofill": true,
+                                "class": "Flag",
+                                "cli_name": "rights",
+                                "cli_short_name": null,
+                                "default": false,
+                                "doc": "Display the access rights of this entry (requires --all). See ipa man page for details.",
+                                "exclude": null,
+                                "falsehoods": [
+                                    0,
+                                    "0",
+                                    "false"
+                                ],
+                                "flags": [],
+                                "hint": null,
+                                "include": null,
+                                "label": "Rights",
+                                "multivalue": false,
+                                "name": "rights",
+                                "primary_key": false,
+                                "query": false,
+                                "required": true,
+                                "truths": [
+                                    "1",
+                                    1,
+                                    "true"
+                                ],
+                                "type": "bool"
+                            }
+                        ]
                     },
                     "user_unlock": {
-                        "__base64__": ""
+                        "takes_args": [],
+                        "takes_options": []
                     }
                 },
                 "objects": {
@@ -2533,6 +7751,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -2639,7 +7862,7 @@
                             "objectclass",
                             "aci"
                         ],
-                        "label": "Automount",
+                        "label": "Automount Locations",
                         "methods": [
                             "add",
                             "del",
@@ -2673,6 +7896,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -2756,6 +7984,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -2863,6 +8096,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -4133,6 +9371,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -4472,6 +9715,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -4686,6 +9934,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -5076,6 +10329,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [],
@@ -5172,6 +10430,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -5355,6 +10618,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -5863,6 +11131,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -5986,6 +11259,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -6530,6 +11808,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -6592,7 +11875,7 @@
                         "aciattrs": [],
                         "attribute_members": {},
                         "bindable": false,
-                        "container_dn": "cn=AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
+                        "container_dn": "cn=SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
                         "default_attributes": [
                             "krbmaxticketlife",
                             "krbmaxrenewableage"
@@ -6630,6 +11913,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -7036,6 +12324,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -7345,6 +12638,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -7418,7 +12716,7 @@
                         ],
                         "attribute_members": {},
                         "bindable": false,
-                        "container_dn": "cn=AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
+                        "container_dn": "cn=SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
                         "default_attributes": [
                             "cn",
                             "cospriority",
@@ -7470,6 +12768,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -7730,11 +13033,7 @@
                                 "hostgroup"
                             ],
                             "memberof": [
-                                "privilege",
-                                "role"
-                            ],
-                            "memberofindirect": [
-                                "role"
+                                "privilege"
                             ]
                         },
                         "bindable": false,
@@ -7789,6 +13088,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -8135,6 +13439,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -8258,6 +13567,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -8493,6 +13807,11 @@
                                 "Member Of",
                                 "in_",
                                 "not_in_"
+                            ],
+                            "memberofindirect": [
+                                "Indirect Member Of",
+                                null,
+                                "not_in_indirect_"
                             ]
                         },
                         "takes_params": [
@@ -9687,7 +15006,7 @@
                                 "alwaysask": false,
                                 "attribute": false,
                                 "autofill": false,
-                                "class": "Int",
+                                "class": "Str",
                                 "cli_name": "postalcode",
                                 "cli_short_name": null,
                                 "default": null,
@@ -9697,14 +15016,17 @@
                                 "hint": null,
                                 "include": null,
                                 "label": "ZIP",
-                                "maxvalue": 2147483647,
-                                "minvalue": null,
+                                "length": null,
+                                "maxlength": null,
+                                "minlength": null,
                                 "multivalue": false,
                                 "name": "postalcode",
+                                "pattern": null,
+                                "pattern_errmsg": null,
                                 "primary_key": false,
                                 "query": false,
                                 "required": false,
-                                "type": "int"
+                                "type": "unicode"
                             },
                             {
                                 "alwaysask": false,
@@ -10022,10 +15344,16 @@
                         "aci": {
                             "attribute": "Attribute"
                         },
+                        "automountkey": {
+                            "add": "Add Automount Key"
+                        },
                         "automountlocation": {
                             "add": "Add Automount Location",
                             "identity": "Automount Location Settings"
                         },
+                        "automountmap": {
+                            "add": "Add Automount Map"
+                        },
                         "cert": {
                             "aa_compromise": "AA Compromise",
                             "affiliation_changed": "Affiliation Changed",
@@ -10240,7 +15568,8 @@
                     },
                     "tabs": {
                         "audit": "Audit",
-                        "hbac": "HBAC",
+                        "automount": "Automount",
+                        "hbac": "Host Based Access Control",
                         "identity": "Identity",
                         "ipaserver": "IPA Server",
                         "policy": "Policy",
@@ -10260,38 +15589,38 @@
                         "cn": [
                             "Administrator"
                         ],
-                        "dn": "uid=admin,cn=users,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                        "dn": "uid=admin,cn=users,cn=accounts,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
                         "gecos": [
                             "Administrator"
                         ],
                         "gidnumber": [
-                            "11400000"
+                            "469800000"
                         ],
                         "homedirectory": [
                             "/home/admin"
                         ],
                         "ipauniqueid": [
-                            "7db304be-5728-11e0-859f-52540029a798"
+                            "31758798-8707-11e0-9000-525400b55a47"
                         ],
                         "krbextradata": [
                             {
-                                "__base64__": "AAKIDI1Ncm9vdC9hZG1pbkBBWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
+                                "__base64__": "AAIiXN1Ncm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
                             },
                             {
                                 "__base64__": "AAgBAA=="
                             }
                         ],
                         "krblastpwdchange": [
-                            "20110325214336Z"
+                            "20110525194434Z"
                         ],
                         "krblastsuccessfulauth": [
-                            "20110326005032Z"
+                            "20110525211013Z"
                         ],
                         "krbpasswordexpiration": [
-                            "20110623214336Z"
+                            "20110823194434Z"
                         ],
                         "krbprincipalname": [
-                            "admin@AYOUNG.BOSTON.DEVEL.REDHAT.COM"
+                            "admin@SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
                         ],
                         "loginshell": [
                             "/bin/bash"
@@ -10318,7 +15647,7 @@
                             "admin"
                         ],
                         "uidnumber": [
-                            "11400000"
+                            "469800000"
                         ]
                     }
                 ],
@@ -10329,11 +15658,11 @@
                 "count": 67,
                 "error": null,
                 "result": {
-                    "basedn": "dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
+                    "basedn": "dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
                     "bin": "/var/www",
                     "ca_agent_port": 9443,
                     "ca_ee_port": 9444,
-                    "ca_host": "ipa14.ayoung.boston.devel.redhat.com",
+                    "ca_host": "server15.ayoung.boston.devel.redhat.com",
                     "ca_port": 9180,
                     "conf": "/etc/ipa/server.conf",
                     "conf_default": "/etc/ipa/default.conf",
@@ -10372,12 +15701,12 @@
                     "enable_ra": true,
                     "fallback": true,
                     "home": "/var/www",
-                    "host": "ipa14.ayoung.boston.devel.redhat.com",
+                    "host": "server15.ayoung.boston.devel.redhat.com",
                     "in_server": true,
                     "in_tree": false,
                     "interactive": true,
                     "ipalib": "/usr/lib/python2.7/site-packages/ipalib",
-                    "ldap_uri": "ldapi://%2fvar%2frun%2fslapd-AYOUNG-BOSTON-DEVEL-REDHAT-COM.socket",
+                    "ldap_uri": "ldapi://%2fvar%2frun%2fslapd-SERVER15-AYOUNG-BOSTON-DEVEL-REDHAT-COM.socket",
                     "log": null,
                     "logdir": "/var/log/ipa",
                     "mode": "production",
@@ -10385,8 +15714,8 @@
                     "mount_jsonserver": "json",
                     "mount_xmlserver": "xml",
                     "prompt_all": false,
-                    "ra_plugin": "dogtag",
-                    "realm": "AYOUNG.BOSTON.DEVEL.REDHAT.COM",
+                    "ra_plugin": "selfsign",
+                    "realm": "SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM",
                     "rpc_json_uri": "http://localhost:8888/ipa/json",
                     "script": "/var/www/mod_wsgi",
                     "site_packages": "/usr/lib/python2.7/site-packages",
@@ -10395,7 +15724,7 @@
                     "verbose": 0,
                     "webui_assets_dir": null,
                     "webui_prod": true,
-                    "xmlrpc_uri": "https://ipa14.ayoung.boston.devel.redhat.com/ipa/xml"
+                    "xmlrpc_uri": "https://server15.ayoung.boston.devel.redhat.com/ipa/xml"
                 },
                 "summary": "67 variables",
                 "total": 67
@@ -10408,4 +15737,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/install/ui/test/navigation_tests.html b/install/ui/test/navigation_tests.html
index a1a68f7f6..3a4e6f7d4 100644
--- a/install/ui/test/navigation_tests.html
+++ b/install/ui/test/navigation_tests.html
@@ -11,6 +11,8 @@
     <script type="text/javascript" src="../ipa.js"></script>
     <script type="text/javascript" src="../entity.js"></script>
     <script type="text/javascript" src="../navigation.js"></script>
+    <script type="text/javascript" src="../search.js"></script>
+    <script type="text/javascript" src="../widget.js"></script>
     <script type="text/javascript" src="navigation_tests.js"></script>
 </head>
 <body>
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index d9bcc8eb6..9126fae3a 100644
--- a/install/ui/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
@@ -41,10 +41,14 @@ test("Testing IPA.navigation.create().", function() {
     var entity;
     var user_mock_called = false;
     var group_mock_called = false;
+    //Force reset of entities
+    IPA.entities = $.ordered_map();
 
     IPA.entity_factories.user =  function() {
         var that = IPA.entity({name: 'user',
                                metadata:IPA.metadata.objects.user});
+        that.add_facet(IPA.search_facet({'entity_name':'user'}));
+
         that.setup = function(container){
             user_mock_called = true;
             same(container.attr('name'), 'user', 'user container name');
diff --git a/install/ui/webui.js b/install/ui/webui.js
index 00c35b459..ce2cf2dfe 100644
--- a/install/ui/webui.js
+++ b/install/ui/webui.js
@@ -51,7 +51,11 @@ IPA.admin_navigation = function(spec) {
                  {entity: 'sudocmd'},
                  {entity: 'sudocmdgroup'}
             ]},
-//            {entity: 'automountlocation'},
+            {name: 'automount', label: IPA.messages.tabs.automount, children: [
+                {entity: 'automountlocation'},
+                {entity: 'automountmap'},
+                {entity: 'automountkey'}
+            ]},
             {entity: 'pwpolicy'},
             {entity: 'krbtpolicy'}
         ]},
diff --git a/install/ui/widget.js b/install/ui/widget.js
index c76921938..94c75d42b 100644
--- a/install/ui/widget.js
+++ b/install/ui/widget.js
@@ -1047,7 +1047,12 @@ IPA.column = function (spec) {
     that.init = function() {
         if (that.entity_name && !that.label) {
             var param_info = IPA.get_entity_param(that.entity_name, that.name);
-            if (param_info) that.label = param_info.label;
+            if (param_info) {
+                that.label = param_info.label;
+            }else{
+                alert('cannot find label for ' + that.entity_name + ' ' +
+                      that.name);
+            }
         }
     };
 
@@ -1124,12 +1129,14 @@ IPA.table_widget = function (spec) {
         var table = $('<table/>', {
             'class': 'search-table'
         }).appendTo(container);
+        that.table = table;
 
         if (that.scrollable) {
             table.addClass('scrollable');
         }
 
         var thead = $('<thead/>').appendTo(table);
+        that.thead = thead;
 
         var tr = $('<tr/>').appendTo(thead);
 
@@ -1176,6 +1183,7 @@ IPA.table_widget = function (spec) {
         }
 
         var tbody = $('<tbody/>').appendTo(table);
+        that.tbody = tbody;
 
         if (that.height) {
             tbody.css('height', that.height);
@@ -1207,6 +1215,7 @@ IPA.table_widget = function (spec) {
         }
 
         var tfoot = $('<tfoot/>').appendTo(table);
+        that.tfoot = tfoot;
 
         tr = $('<tr/>').appendTo(tfoot);
 
@@ -1224,10 +1233,10 @@ IPA.table_widget = function (spec) {
 
         that.widget_setup(container);
 
-        that.table = $('table', that.container);
-        that.thead = $('thead', that.table);
-        that.tbody = $('tbody', that.table);
-        that.tfoot = $('tfoot', that.table);
+//        that.table = $('table', that.container);
+//        that.thead = $('thead', that.table);
+//        that.tbody = $('tbody', that.table);
+//        that.tfoot = $('tfoot', that.table);
 
         var select_all_checkbox = $('input[name=select]', that.thead);
         select_all_checkbox.attr('title', IPA.messages.search.select_all);