diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
index 1a68b72b..16dda447 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,7 +1,9 @@
-log4j.rootLogger=DEBUG, stdout, R
+log4j.rootLogger=INFO, stdout, R
 log4j.logger.com.wisemapping=DEBUG,R
-log4j.logger.org.springframework=DEBUG,R
-log4j.logger.org.hibernate=DEBUG,R
+log4j.logger.org.springframework=INFO,R
+log4j.logger.org.hibernate=INFO,R
+log4j.logger.org.hibernate.type.descriptor.sql.BasicBinder=TRACE,R
+log4j.logger.org.hibernate.SQL=DEBUG,R
 
 # Stdout logger �
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
index 16c42dd1..bfb9b5a0 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
@@ -39,6 +39,7 @@
                 <prop key="hibernate.dialect">${database.hibernate.dialect}</prop>
                 <prop key="hibernate.cache.use_second_level_cache">true</prop>
                 <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</prop>
+                <prop key="hibernate.default_batch_fetch_size">200</prop>
             </props>
         </property>
     </bean>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
index 1084d836..3999bb07 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
@@ -15,16 +15,6 @@
     <context:component-scan base-package="com.wisemapping.rest"/>
     <context:annotation-config/>
 
-    <!-- Interceptors Registration -->
-    <mvc:interceptors>
-        <bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
-            <property name="cacheSeconds" value="0"/>
-            <property name="useExpiresHeader" value="true"/>
-            <property name="useCacheControlHeader" value="true"/>
-            <property name="useCacheControlNoStore" value="true"/>
-        </bean>
-    </mvc:interceptors>
-
     <mvc:annotation-driven>
         <mvc:message-converters>
             <bean class="com.wisemapping.rest.DebugMappingJacksonHttpMessageConverter"/>
@@ -55,22 +45,11 @@
         <property name="favorParameter" value="true"/>
         <property name="parameterName" value="mediaType"/>
         <property name="defaultContentType" value="application/json" />
-        <property name="useJaf" value="false" />
 
         <property name="mediaTypes">
             <map>
                 <entry key="xml" value="application/xml"/>
                 <entry key="json" value="application/json"/>
-                <entry key="freemind" value="application/freemind"/>
-                <entry key="pdf" value="application/pdf"/>
-                <entry key="png" value="image/png"/>
-                <entry key="jpg" value="image/jpeg"/>
-                <entry key="svg" value="image/svg+xml"/>
-                <entry key="wxml" value="application/wisemapping+xml"/>
-                <entry key="txt" value="text/plain"/>
-                <entry key="xls" value="application/vnd.ms-excel"/>
-                <entry key="otd" value="application/vnd.oasis.opendocument.text"/>
-                <entry key="mmap" value="application/vnd.mindjet.mindmanager"/>
             </map>
         </property>
     </bean>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index 93a978d3..073c65bb 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -20,13 +20,6 @@
     <mvc:interceptors>
         <bean id="userLocaleInterceptor" class="com.wisemapping.filter.UserLocaleInterceptor"/>
         <bean id="requestInterceptor" class="com.wisemapping.filter.RequestPropertiesInterceptor"/>
-
-        <bean id="webContentInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
-            <property name="cacheSeconds" value="0"/>
-            <property name="useExpiresHeader" value="true"/>
-            <property name="useCacheControlHeader" value="true"/>
-            <property name="useCacheControlNoStore" value="true"/>
-        </bean>
     </mvc:interceptors>
 
     <bean id="exceptionHandlerResolver"