diff --git a/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl b/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
index c9120b76b..254a0bb3f 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
@@ -75,16 +75,28 @@
             </param>
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
-                    <xsdxt:code href="samples/os-flavorextradata-single-response.json"/>
+                    <xsdxt:code href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml"/>
                 </doc>
             </representation>
         </request>
         <response status="200">
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
-                    <xsdxt:code href="samples/os-flavorextradata-single-response.json"/>
+                    <xsdxt:code href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.json"/>
                 </doc>
             </representation>
+            <response status="200">
+                <representation mediaType="application/xml">
+                    <doc xml:lang="EN">
+                        <xsdxt:code href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml"/>
+                    </doc>
+                </representation>
+            </response>
         </response>
     </method>
 
@@ -98,7 +110,15 @@
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
                     <xsdxt:code 
-                        href="samples/os-flavorextradata-single-response.json"/>
+                        href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json"/>
+                </doc>
+            </representation>
+        </response>
+        <response status="200">
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code 
+                        href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml"/>
                 </doc>
             </representation>
         </response>
@@ -114,7 +134,15 @@
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
                     <xsdxt:code 
-                        href="samples/os-flavorextradata-list-response.json"/>
+                        href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json"/>
+                </doc>
+            </representation>
+        </response>
+        <response status="200">
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code 
+                        href="../api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml"/>
                 </doc>
             </representation>
         </response>
diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/os-flavorextradata-list-response.json b/api-ref/src/wadls/compute-api/src/ext/samples/os-flavorextradata-list-response.json
deleted file mode 100644
index 978f8611b..000000000
--- a/api-ref/src/wadls/compute-api/src/ext/samples/os-flavorextradata-list-response.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "flavors": [
-        {
-            "name": "flavor-12",
-            "ram": 1024,
-            "vcpus": 2,
-            "disk": 10,
-            "id": 12,
-            "swap": 5,
-            "rxtx_factor": 2,
-            "OS-FLV-EXT-DATA:ephemeral": 30
-        },
-        {
-            "name": "flavor-13",
-            "ram": 512,
-            "vcpus": 1,
-            "disk": 20,
-            "id": 13,
-            "swap": 0,
-            "rxtx_factor": 1,
-            "OS-FLV-EXT-DATA:ephemeral": 0
-        }
-    ]
-}
diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/os-flavorextradata-single-response.json b/api-ref/src/wadls/compute-api/src/ext/samples/os-flavorextradata-single-response.json
deleted file mode 100644
index 8abde590e..000000000
--- a/api-ref/src/wadls/compute-api/src/ext/samples/os-flavorextradata-single-response.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "flavor": {
-        "name": "flavor-12",
-        "ram": 1024,
-        "vcpus": 2,
-        "disk": 10,
-        "id": 12,
-        "swap": 5,
-        "rxtx_factor": 2,
-        "OS-FLV-EXT-DATA:ephemeral": 30
-    }
-}