diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php
index d894ab07f1..72a8b232e0 100644
--- a/lib/Alchemy/Phrasea/Core/Version.php
+++ b/lib/Alchemy/Phrasea/Core/Version.php
@@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core;
  */
 class Version
 {
-    protected static $number = '3.7.0.0.a3';
+    protected static $number = '3.7.0.0.a4';
     protected static $name = 'Carnosaurus';
 
     public static function getNumber()
diff --git a/lib/classes/patch/370a4.class.php b/lib/classes/patch/370a4.class.php
new file mode 100644
index 0000000000..f24c03ce3e
--- /dev/null
+++ b/lib/classes/patch/370a4.class.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2012 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
+ * @link        www.phraseanet.com
+ */
+class patch_370a4 implements patchInterface
+{
+    /**
+     *
+     * @var string
+     */
+    private $release = '3.7.0.0.a4';
+
+    /**
+     *
+     * @var Array
+     */
+    private $concern = array(base::DATA_BOX);
+
+    /**
+     *
+     * @return string
+     */
+    function get_release()
+    {
+        return $this->release;
+    }
+
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     *
+     * @return Array
+     */
+    function concern()
+    {
+        return $this->concern;
+    }
+
+    function apply(base &$databox)
+    {
+
+        $sql = 'SELECT id, src FROM metadatas_structure';
+        $stmt = $databox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+
+        $update = array();
+
+        $tagDirname = new \Alchemy\Phrasea\Metadata\Tag\TfDirname();
+        $tagBasename = new \Alchemy\Phrasea\Metadata\Tag\TfBasename();
+
+        foreach ($rs as $row) {
+
+            if (strpos(strtolower($row['src']), 'tf-parentdir') !== false) {
+                $update[] = array('id'  => $row['id'], 'src' => $tagDirname->getTagname());
+            }
+            if (strpos(strtolower($row['src']), 'tf-filename') !== false) {
+                $update[] = array('id'  => $row['id'], 'src' => $tagBasename->getTagname());
+            }
+        }
+
+        $sql = 'UPDATE metadatas_structure SET src = :src WHERE id = :id';
+        $stmt = $databox->get_connection()->prepare($sql);
+
+        foreach ($update as $row) {
+            $stmt->execute(array(':src' => $row['src'], ':id'  => $row['id']));
+        }
+
+        $stmt->closeCursor();
+
+        return true;
+    }
+}
+
diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml
index 0edf94035a..3e26cb119c 100644
--- a/lib/conf.d/data_templates/en-simple.xml
+++ b/lib/conf.d/data_templates/en-simple.xml
@@ -1,212 +1,162 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <record>
-  <path>{{datapathnoweb}}{{basename}}/documents</path>
+    <path>{{datapathnoweb}}{{basename}}/documents</path>
 
-  <subdefs>
-    <subdefgroup name="image">
-      <subdef class="preview" name="preview" downloadable="true">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <size>800</size>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <strip>no</strip>
-        <quality>75</quality>
-        <meta>yes</meta>
-        <baseurl></baseurl>
-        <mediatype>image</mediatype>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <size>200</size>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <strip>yes</strip>
-        <quality>75</quality>
-        <meta>no</meta>
-        <mediatype>image</mediatype>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
+    <subdefs>
+        <subdefgroup name="image">
+            <subdef class="preview" name="preview" downloadable="true">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <size>800</size>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <strip>no</strip>
+                <quality>75</quality>
+                <meta>yes</meta>
+                <baseurl></baseurl>
+                <mediatype>image</mediatype>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <size>200</size>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <strip>yes</strip>
+                <quality>75</quality>
+                <meta>no</meta>
+                <mediatype>image</mediatype>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
 
-    <subdefgroup name="video">
-      <subdef class="preview" name="preview" downloadable="true">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <size>800</size>
-        <mediatype>video</mediatype>
-        <writeDatas>yes</writeDatas>
-        <baseurl></baseurl>
-        <acodec>libfaac</acodec>
-        <vcodec>libx264</vcodec>
-        <bitrate>1000</bitrate>
-        <threads>8</threads>
-        <fps>15</fps>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnailgif" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <size>200</size>
-        <mediatype>gif</mediatype>
-        <delay>500</delay>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Animation GIF</label>
-        <label lang="en">GIF Animation</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <size>200</size>
-        <mediatype>image</mediatype>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
+        <subdefgroup name="video">
+            <subdef class="preview" name="preview" downloadable="true">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <size>800</size>
+                <mediatype>video</mediatype>
+                <writeDatas>yes</writeDatas>
+                <baseurl></baseurl>
+                <acodec>libfaac</acodec>
+                <vcodec>libx264</vcodec>
+                <bitrate>1000</bitrate>
+                <threads>8</threads>
+                <fps>15</fps>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnailgif" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <size>200</size>
+                <mediatype>gif</mediatype>
+                <delay>500</delay>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Animation GIF</label>
+                <label lang="en">GIF Animation</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <size>200</size>
+                <mediatype>image</mediatype>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
 
-    <subdefgroup name="audio">
-      <subdef class="preview" name="preview" downloadable="true">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <mediatype>audio</mediatype>
-        <writeDatas>yes</writeDatas>
-        <baseurl></baseurl>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-    <subdefgroup name="document">
-      <subdef class="preview" name="preview" downloadable="false">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <mediatype>flexpaper</mediatype>
-        <writeDatas>no</writeDatas>
-        <baseurl></baseurl>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="false">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <size>200</size>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-    <subdefgroup name="flash">
-      <subdef class="preview" name="preview" downloadable="false">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <size>200</size>
-        <writeDatas>no</writeDatas>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <baseurl></baseurl>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="false">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <writeDatas>no</writeDatas>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-  </subdefs>
+        <subdefgroup name="audio">
+            <subdef class="preview" name="preview" downloadable="true">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <mediatype>audio</mediatype>
+                <writeDatas>yes</writeDatas>
+                <baseurl></baseurl>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+        <subdefgroup name="document">
+            <subdef class="preview" name="preview" downloadable="false">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <mediatype>flexpaper</mediatype>
+                <writeDatas>no</writeDatas>
+                <baseurl></baseurl>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="false">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <size>200</size>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+        <subdefgroup name="flash">
+            <subdef class="preview" name="preview" downloadable="false">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <size>200</size>
+                <writeDatas>no</writeDatas>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <baseurl></baseurl>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="false">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <writeDatas>no</writeDatas>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+    </subdefs>
 
-  <description>
-        <!-- 2:5 -->
-    <Object src="/rdf:RDF/rdf:Description/IPTC:ObjectName" />
+    <description>
+        <Object src="/rdf:RDF/rdf:Description/IPTC:ObjectName" />
+        <Category src="/rdf:RDF/rdf:Description/IPTC:Category"/>
+        <SupplCategory src="/rdf:RDF/rdf:Description/IPTC:SupplementalCategories"/>
+        <Keywords src="/rdf:RDF/rdf:Description/IPTC:Keywords" multi="1"/>
+        <SpecialInstruct src="/rdf:RDF/rdf:Description/IPTC:SpecialInstructions"/>
+        <Date src="/rdf:RDF/rdf:Description/IPTC:DateCreated" type="date" />
+        <Byline src="/rdf:RDF/rdf:Description/IPTC:By-line"/>
+        <BylineTitle src="/rdf:RDF/rdf:Description/IPTC:By-lineTitle"/>
+        <City src="/rdf:RDF/rdf:Description/IPTC:City" />
+        <Province src="/rdf:RDF/rdf:Description/IPTC:Province-State" />
+        <Country src="/rdf:RDF/rdf:Description/IPTC:Country-PrimaryLocationName" />
+        <OriginalRef src="/rdf:RDF/rdf:Description/IPTC:OriginalTransmissionReference" />
+        <Headline src="/rdf:RDF/rdf:Description/IPTC:Headline" report="1" />
+        <Credit src="/rdf:RDF/rdf:Description/IPTC:Credit" report="1" />
+        <Source src="/rdf:RDF/rdf:Description/IPTC:Source" />
+        <Caption src="/rdf:RDF/rdf:Description/IPTC:Caption-Abstract" />
+        <CaptionWriter src="/rdf:RDF/rdf:Description/IPTC:Writer-Editor" />
+        <Longitude src="/rdf:RDF/rdf:Description/GPS:GPSLongitude" readonly="1"/>
+        <Latitude src="/rdf:RDF/rdf:Description/GPS:GPSLatitude" readonly="1"/>
+        <CameraModel src="/rdf:RDF/rdf:Description/IFD0:Model" readonly="1"/>
+        <FileName src="/rdf:RDF/rdf:Description/PHRASEANET:tf-basename" readonly="1" type="text" />
+    </description>
 
-        <!-- 2:15 -->
-    <Category src="/rdf:RDF/rdf:Description/IPTC:Category"/>
-
-        <!-- 2:20 -->
-    <SupplCategory src="/rdf:RDF/rdf:Description/IPTC:SupplementalCategories"/>
-
-        <!-- 2:25 -->
-    <Keywords src="/rdf:RDF/rdf:Description/IPTC:Keywords" multi="1"/>
-
-        <!-- 2:40 -->
-    <SpecialInstruct src="/rdf:RDF/rdf:Description/IPTC:SpecialInstructions"/>
-
-        <!-- 2:55 -->
-    <Date src="/rdf:RDF/rdf:Description/IPTC:DateCreated" type="date" />
-
-        <!-- 2:80 -->
-    <Byline src="/rdf:RDF/rdf:Description/IPTC:By-line"/>
-
-        <!-- 2:85 -->
-    <BylineTitle src="/rdf:RDF/rdf:Description/IPTC:By-lineTitle"/>
-
-        <!-- 2:90 -->
-    <City src="/rdf:RDF/rdf:Description/IPTC:City" />
-
-        <!-- 2:95 -->
-    <Province src="/rdf:RDF/rdf:Description/IPTC:Province-State" />
-
-        <!-- 2:101 -->
-    <Country src="/rdf:RDF/rdf:Description/IPTC:Country-PrimaryLocationName" />
-
-        <!-- 2:103 -->
-    <OriginalRef src="/rdf:RDF/rdf:Description/IPTC:OriginalTransmissionReference" />
-
-        <!-- 2:105 -->
-    <Headline src="/rdf:RDF/rdf:Description/IPTC:Headline" report="1" />
-
-        <!-- 2:110 -->
-    <Credit src="/rdf:RDF/rdf:Description/IPTC:Credit" report="1" />
-
-        <!-- 2:115 -->
-    <Source src="/rdf:RDF/rdf:Description/IPTC:Source" />
-
-        <!-- 2:120 -->
-    <Caption src="/rdf:RDF/rdf:Description/IPTC:Caption-Abstract" />
-
-        <!-- 2:122 -->
-    <CaptionWriter src="/rdf:RDF/rdf:Description/IPTC:Writer-Editor" />
-
-        <!-- 2:25 -->
-    <Longitude src="/rdf:RDF/rdf:Description/GPS:GPSLongitude" readonly="1"/>
-
-        <!-- 2:25 -->
-    <Latitude src="/rdf:RDF/rdf:Description/GPS:GPSLatitude" readonly="1"/>
-
-        <!-- 2:25 -->
-    <CameraModel src="/rdf:RDF/rdf:Description/IFD0:Model" readonly="1"/>
-
-       <!-- Technical Fields -->
-    <FileName src="/rdf:RDF/rdf:Description/PHRASEANET:tf-filename" readonly="1" type="text" />
-    <FilePath src="/rdf:RDF/rdf:Description/PHRASEANET:tf-filepath" index="0" readonly="1" type="text" />
-    <Recordid src="/rdf:RDF/rdf:Description/PHRASEANET:tf-recordid" index="0" readonly="1" type="number" />
-    <MimeType src="/rdf:RDF/rdf:Description/PHRASEANET:tf-mimetype" index="0" readonly="1" type="text" />
-    <Size src="/rdf:RDF/rdf:Description/PHRASEANET:tf-size" index="0" readonly="1" type="number" />
-    <Extension src="/rdf:RDF/rdf:Description/PHRASEANET:tf-extension" index="0" readonly="1" type="text" />
-    <Width src="/rdf:RDF/rdf:Description/PHRASEANET:tf-width" index="0" readonly="1" type="number" />
-    <Height src="/rdf:RDF/rdf:Description/PHRASEANET:tf-height" index="0" readonly="1" type="number" />
-    <Bits src="/rdf:RDF/rdf:Description/PHRASEANET:tf-bits" index="0" readonly="1" type="number" />
-    <Channels src="/rdf:RDF/rdf:Description/PHRASEANET:tf-channels" index="0" readonly="1" type="number" />
-  </description>
-
-  <statbits>
-    <bit n="4">Online</bit>
-  </statbits>
+    <statbits>
+        <bit n="4">Online</bit>
+    </statbits>
 </record>
diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml
index c2b1719b08..6a50f07e96 100755
--- a/lib/conf.d/data_templates/fr-simple.xml
+++ b/lib/conf.d/data_templates/fr-simple.xml
@@ -1,212 +1,162 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <record>
-  <path>{{datapathnoweb}}{{basename}}/documents</path>
-  <subdefs>
-    <subdefgroup name="image">
-      <subdef class="preview" name="preview" downloadable="true">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <size>800</size>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <strip>no</strip>
-        <quality>75</quality>
-        <meta>yes</meta>
-        <baseurl></baseurl>
-        <mediatype>image</mediatype>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <size>200</size>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <strip>yes</strip>
-        <quality>75</quality>
-        <meta>no</meta>
-        <mediatype>image</mediatype>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-    <subdefgroup name="video">
-      <subdef class="preview" name="preview" downloadable="true">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <size>800</size>
-        <mediatype>video</mediatype>
-        <writeDatas>yes</writeDatas>
-        <baseurl></baseurl>
-        <acodec>libfaac</acodec>
-        <vcodec>libx264</vcodec>
-        <bitrate>1000</bitrate>
-        <threads>8</threads>
-        <fps>15</fps>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnailgif" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <size>200</size>
-        <mediatype>gif</mediatype>
-        <delay>500</delay>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Animation GIF</label>
-        <label lang="en">GIF Animation</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <size>200</size>
-        <mediatype>image</mediatype>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-    <subdefgroup name="audio">
-      <subdef class="preview" name="preview" downloadable="true">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <mediatype>audio</mediatype>
-        <writeDatas>yes</writeDatas>
-        <baseurl></baseurl>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="true">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <size>200</size>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-    <subdefgroup name="document">
-      <subdef class="preview" name="preview" downloadable="false">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <mediatype>flexpaper</mediatype>
-        <writeDatas>no</writeDatas>
-        <baseurl></baseurl>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="false">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <size>200</size>
-        <writeDatas>no</writeDatas>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-    <subdefgroup name="flash">
-      <subdef class="preview" name="preview" downloadable="false">
-        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <size>200</size>
-        <writeDatas>no</writeDatas>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <baseurl></baseurl>
-        <label lang="fr">Prévisualisation</label>
-        <label lang="en">Preview</label>
-      </subdef>
-      <subdef class="thumbnail" name="thumbnail" downloadable="false">
-        <path>{{datapathweb}}{{basename}}/subdefs</path>
-        <mediatype>image</mediatype>
-        <writeDatas>no</writeDatas>
-        <method>resample</method>
-        <dpi>72</dpi>
-        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
-        <label lang="fr">Imagette</label>
-        <label lang="en">Thumbnail</label>
-      </subdef>
-    </subdefgroup>
-  </subdefs>
+    <path>{{datapathnoweb}}{{basename}}/documents</path>
+    <subdefs>
+        <subdefgroup name="image">
+            <subdef class="preview" name="preview" downloadable="true">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <size>800</size>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <strip>no</strip>
+                <quality>75</quality>
+                <meta>yes</meta>
+                <baseurl></baseurl>
+                <mediatype>image</mediatype>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <size>200</size>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <strip>yes</strip>
+                <quality>75</quality>
+                <meta>no</meta>
+                <mediatype>image</mediatype>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+        <subdefgroup name="video">
+            <subdef class="preview" name="preview" downloadable="true">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <size>800</size>
+                <mediatype>video</mediatype>
+                <writeDatas>yes</writeDatas>
+                <baseurl></baseurl>
+                <acodec>libfaac</acodec>
+                <vcodec>libx264</vcodec>
+                <bitrate>1000</bitrate>
+                <threads>8</threads>
+                <fps>15</fps>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnailgif" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <size>200</size>
+                <mediatype>gif</mediatype>
+                <delay>500</delay>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Animation GIF</label>
+                <label lang="en">GIF Animation</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <size>200</size>
+                <mediatype>image</mediatype>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+        <subdefgroup name="audio">
+            <subdef class="preview" name="preview" downloadable="true">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <mediatype>audio</mediatype>
+                <writeDatas>yes</writeDatas>
+                <baseurl></baseurl>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="true">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <size>200</size>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+        <subdefgroup name="document">
+            <subdef class="preview" name="preview" downloadable="false">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <mediatype>flexpaper</mediatype>
+                <writeDatas>no</writeDatas>
+                <baseurl></baseurl>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="false">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <size>200</size>
+                <writeDatas>no</writeDatas>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+        <subdefgroup name="flash">
+            <subdef class="preview" name="preview" downloadable="false">
+                <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <size>200</size>
+                <writeDatas>no</writeDatas>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <baseurl></baseurl>
+                <label lang="fr">Prévisualisation</label>
+                <label lang="en">Preview</label>
+            </subdef>
+            <subdef class="thumbnail" name="thumbnail" downloadable="false">
+                <path>{{datapathweb}}{{basename}}/subdefs</path>
+                <mediatype>image</mediatype>
+                <writeDatas>no</writeDatas>
+                <method>resample</method>
+                <dpi>72</dpi>
+                <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+                <label lang="fr">Imagette</label>
+                <label lang="en">Thumbnail</label>
+            </subdef>
+        </subdefgroup>
+    </subdefs>
 
 
 
-  <description>
-        <!-- 2:5 -->
-    <Objet src="/rdf:RDF/rdf:Description/IPTC:ObjectName" />
+    <description>
+        <Objet src="/rdf:RDF/rdf:Description/IPTC:ObjectName" />
+        <Categorie src="/rdf:RDF/rdf:Description/IPTC:Category"/>
+        <AutresCategories src="/rdf:RDF/rdf:Description/IPTC:SupplementalCategories"/>
+        <MotsCles src="/rdf:RDF/rdf:Description/IPTC:Keywords" multi="1"/>
+        <Observations src="/rdf:RDF/rdf:Description/IPTC:SpecialInstructions"/>
+        <Date src="/rdf:RDF/rdf:Description/IPTC:DateCreated" type="date" />
+        <Signature src="/rdf:RDF/rdf:Description/IPTC:By-line"/>
+        <TitreCredits src="/rdf:RDF/rdf:Description/IPTC:By-lineTitle"/>
+        <Ville src="/rdf:RDF/rdf:Description/IPTC:City" />
+        <Province src="/rdf:RDF/rdf:Description/IPTC:Province-State" />
+        <Pays src="/rdf:RDF/rdf:Description/IPTC:Country-PrimaryLocationName" />
+        <ReferencesOriginales src="/rdf:RDF/rdf:Description/IPTC:OriginalTransmissionReference" />
+        <Titre src="/rdf:RDF/rdf:Description/IPTC:Headline" report="1" />
+        <Credit src="/rdf:RDF/rdf:Description/IPTC:Credit" report="1" />
+        <Source src="/rdf:RDF/rdf:Description/IPTC:Source" />
+        <Legende src="/rdf:RDF/rdf:Description/IPTC:Caption-Abstract" />
+        <Redacteur src="/rdf:RDF/rdf:Description/IPTC:Writer-Editor" />
+        <Longitude src="/rdf:RDF/rdf:Description/GPS:GPSLongitude" readonly="1"/>
+        <Latitude src="/rdf:RDF/rdf:Description/GPS:GPSLatitude" readonly="1"/>
+        <AppareilPhoto src="/rdf:RDF/rdf:Description/IFD0:Model" readonly="1"/>
+        <NomDeFichier src="/rdf:RDF/rdf:Description/PHRASEANET:tf-basename" readonly="1" type="text" />
+    </description>
 
-        <!-- 2:15 -->
-    <Categorie src="/rdf:RDF/rdf:Description/IPTC:Category"/>
-
-        <!-- 2:20 -->
-    <AutresCategories src="/rdf:RDF/rdf:Description/IPTC:SupplementalCategories"/>
-
-        <!-- 2:25 -->
-    <MotsCles src="/rdf:RDF/rdf:Description/IPTC:Keywords" multi="1"/>
-
-        <!-- 2:40 -->
-    <Observations src="/rdf:RDF/rdf:Description/IPTC:SpecialInstructions"/>
-
-        <!-- 2:55 -->
-    <Date src="/rdf:RDF/rdf:Description/IPTC:DateCreated" type="date" />
-
-        <!-- 2:80 -->
-    <Signature src="/rdf:RDF/rdf:Description/IPTC:By-line"/>
-
-        <!-- 2:85 -->
-    <TitreCredits src="/rdf:RDF/rdf:Description/IPTC:By-lineTitle"/>
-
-        <!-- 2:90 -->
-    <Ville src="/rdf:RDF/rdf:Description/IPTC:City" />
-
-        <!-- 2:95 -->
-    <Province src="/rdf:RDF/rdf:Description/IPTC:Province-State" />
-
-        <!-- 2:101 -->
-    <Pays src="/rdf:RDF/rdf:Description/IPTC:Country-PrimaryLocationName" />
-
-        <!-- 2:103 -->
-    <ReferencesOriginales src="/rdf:RDF/rdf:Description/IPTC:OriginalTransmissionReference" />
-
-        <!-- 2:105 -->
-    <Titre src="/rdf:RDF/rdf:Description/IPTC:Headline" report="1" />
-
-        <!-- 2:110 -->
-    <Credit src="/rdf:RDF/rdf:Description/IPTC:Credit" report="1" />
-
-        <!-- 2:115 -->
-    <Source src="/rdf:RDF/rdf:Description/IPTC:Source" />
-
-        <!-- 2:120 -->
-    <Legende src="/rdf:RDF/rdf:Description/IPTC:Caption-Abstract" />
-
-        <!-- 2:122 -->
-    <Redacteur src="/rdf:RDF/rdf:Description/IPTC:Writer-Editor" />
-
-        <!-- 2:25 -->
-    <Longitude src="/rdf:RDF/rdf:Description/GPS:GPSLongitude" readonly="1"/>
-
-        <!-- 2:25 -->
-    <Latitude src="/rdf:RDF/rdf:Description/GPS:GPSLatitude" readonly="1"/>
-
-        <!-- 2:25 -->
-    <AppareilPhoto src="/rdf:RDF/rdf:Description/IFD0:Model" readonly="1"/>
-
-        <!-- Champs Techniques -->
-    <NomDeFichier src="/rdf:RDF/rdf:Description/PHRASEANET:tf-filename" readonly="1" type="text" />
-    <Chemin src="/rdf:RDF/rdf:Description/PHRASEANET:tf-filepath" index="0" readonly="1" type="text" />
-    <Recordid src="/rdf:RDF/rdf:Description/PHRASEANET:tf-recordid" index="0" readonly="1" type="number" />
-    <TypeMime src="/rdf:RDF/rdf:Description/PHRASEANET:tf-mimetype" index="0" readonly="1" type="text" />
-    <Taille src="/rdf:RDF/rdf:Description/PHRASEANET:tf-size" index="0" readonly="1" type="number" />
-    <Extension src="/rdf:RDF/rdf:Description/PHRASEANET:tf-extension" index="0" readonly="1" type="text" />
-    <Largeur src="/rdf:RDF/rdf:Description/PHRASEANET:tf-width" index="0" readonly="1" type="number" />
-    <Hauteur src="/rdf:RDF/rdf:Description/PHRASEANET:tf-height" index="0" readonly="1" type="number" />
-    <Bits src="/rdf:RDF/rdf:Description/PHRASEANET:tf-bits" index="0" readonly="1" type="number" />
-    <Couche src="/rdf:RDF/rdf:Description/PHRASEANET:tf-channels" index="0" readonly="1" type="number" />
-  </description>
-
-  <statbits>
-    <bit n="4">Online</bit>
-  </statbits>
+    <statbits>
+        <bit n="4">Online</bit>
+    </statbits>
 </record>