diff --git a/api-ref/src/docbkx/ch_identity-v2-ext.xml b/api-ref/src/docbkx/ch_identity-v2-ext.xml
index 657dd25f6..5bd843058 100644
--- a/api-ref/src/docbkx/ch_identity-v2-ext.xml
+++ b/api-ref/src/docbkx/ch_identity-v2-ext.xml
@@ -11,8 +11,8 @@
     version="5.0-extension RackBook-2.0" xml:id="identity-v2-ext"
     xlink:href="#identity-v2-ext" role="api-reference">
     <title>Identity API v2.0 extensions</title>
-    <para>Query the Identity API to list available extensions
-        with a &GET; request to <code>v2.0/extensions</code>.</para>
+    <para>Query the Identity API to list available extensions with a
+        &GET; request to <code>v2.0/extensions</code>.</para>
     <section xml:id="hp-idm-admin-ext">
         <title>HP-IDM-serviceId extended parameter</title>
         <wadl:resources
@@ -21,9 +21,76 @@
     </section>
     <section xml:id="os-ksadm-admin-ext">
         <title>OS-KSADM admin extension</title>
-        <wadl:resources
-            href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl"
-            xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#users-v2.0">
+                <wadl:method href="#listUsers"/>
+                <wadl:method href="#addUser"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userById-v2.0">
+                <wadl:method href="#updateUser"/>
+                <wadl:method href="#deleteUser"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userRoles-v2.0">
+                <wadl:method href="#listUserRoles"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userRoleById-v2.0">
+                <wadl:method href="#addUserRole"/>
+                <wadl:method href="#deleteUserRole"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#tenants-v2.0">
+                <wadl:method href="#addTenant"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#tenantById-v2.0">
+                <wadl:method href="#updateTenant"/>
+                <wadl:method href="#deleteTenant"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#usersForTenant-v2.0">
+                <wadl:method href="#listUsersForTenant"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#userSpecificRoleForTenant-v2.0">
+                <wadl:method href="#addRolesToUserOnTenant"/>
+                <wadl:method href="#deleteRoleFromUserOnTenant"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles-v2.0">
+                <wadl:method href="#getRoleByName"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles_list-v2.0">
+                <wadl:method href="#listRoles"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roles-v2.0">
+                <wadl:method href="#addRole"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#roleId-v2.0">
+                <wadl:method href="#getRole"/>
+                <wadl:method href="#deleteRole"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#services-v2.0">
+                <wadl:method href="#listServices"/>
+                <wadl:method href="#addService"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#serviceName-v2.0">
+                <wadl:method href="#getServiceByName"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl#serviceId-v2.0">
+                <wadl:method href="#getService"/>
+                <wadl:method href="#deleteService"/>
+            </wadl:resource>
+        </wadl:resources>
     </section>
     <section xml:id="os-kscatalog-ext">
         <title>OS-KSCATALOG admin extension</title>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
index 0b26df2a7..bd1ed88d7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
@@ -11,7 +11,6 @@
 <!ENTITY % common  SYSTEM "common.ent">
 %common;
 ]>
-
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
@@ -27,7 +26,6 @@
     <!--*******************************************************-->
     <!--             All Resources                             -->
     <!--*******************************************************-->
-
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-KSADM-admin-v2.0">
         <resource id="version-v2.0" path="//v2.0">
@@ -209,7 +207,6 @@
                     </param>
                     <method href="#listServices"/>
                     <method href="#addService"/>
-
                     <resource id="serviceName-v2.0">
                         <param name="name" style="query"
                             type="xsd:string" required="true">
@@ -218,7 +215,6 @@
                                 xml:lang="EN"><para>The service
                                    name.</para></wadl:doc>
                         </param>
-
                         <method href="#getServiceByName"/>
                     </resource>
                     <resource id="serviceId-v2.0" path="{serviceId}">