diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index d85fcb4..bdff2e9 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -8,7 +8,7 @@
         <dependent-module archiveName="workspace-tree-widget-6.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="fileupload-progress-bar-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/fileupload-progress-bar-TRUNK/fileupload-progress-bar-TRUNK">
+        <dependent-module archiveName="workspace-uploader-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-1.0.0-SNAPSHOT-TRUNK/workspace-uploader-1.0.0-SNAPSHOT-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>
 
diff --git a/pom.xml b/pom.xml
index 449df0d..8935b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,13 @@
 
 	<dependencies>
 
+		<!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>xerces</groupId> -->
+<!-- 			<artifactId>xerces</artifactId> -->
+<!-- 			<version>2.4.0</version> -->
+<!-- 		</dependency> -->
+		
 		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
 			without old Xerces version of gCore complaining -->
 		<dependency>
@@ -130,7 +137,7 @@
 			<artifactId>custom-portal-handler</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
index adbb319..1006bf1 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
@@ -1341,10 +1341,8 @@ public class AppController implements SubscriberInterface {
 			@Override
 			public void onSuccess(List<FileGridModel> result) {
 				wsPortlet.getGridGroupContainer().setCurrentFolderView(parent); //SET folder as current view
-
 				wsPortlet.getGridGroupContainer().unmask();
 				wsPortlet.getGridGroupContainer().updateStore(result);
-
 			}
 		});
 	}
@@ -1365,7 +1363,39 @@ public class AppController implements SubscriberInterface {
 
 	@Override
 	public void addedFile(String itemIdentifier, FileModel parent) {
-		updateStoreByRpc(parent);
+//		updateStoreByRpc(parent);
+		GWT.log("Calling addFileToStoreById "+parent.getIdentifier());
+		addFileToStoreById(itemIdentifier, parent);
+		
+	}
+	
+	//TODO
+	private void addFileToStoreById(String itemIdentifier, FileModel parent){
+		
+		GxtBreadcrumbPathPanel breadCrumb = this.wsPortlet.getToolBarPath();
+		FileModel breadParent = breadCrumb.getLastParent();
+		
+		//UPDATE GRID ONLY IF TREE AND GRID DISPLAYING THE SAME PARENT 
+		if(breadParent!=null && parent!=null && breadParent.getIdentifier().compareTo(parent.getIdentifier())==0){
+//			wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.LOADING,ConstantsExplorer.LOADINGSTYLE);
+			
+			appContrExplorer.getRpcWorkspaceService().getItemForFileGrid(itemIdentifier, new AsyncCallback<FileGridModel>() {
+
+				@Override
+				public void onFailure(Throwable caught) {
+//					wsPortlet.getGridGroupContainer().unmask();
+					
+				}
+
+				@Override
+				public void onSuccess(FileGridModel result) {
+					wsPortlet.getGridGroupContainer().addToStore(result);
+//					wsPortlet.getGridGroupContainer().unmask();
+				}
+			});
+		}
+
+		
 	}
 
 	@Override
@@ -1385,10 +1415,7 @@ public class AppController implements SubscriberInterface {
 				wsPortlet.getSearchAndFilterContainer().searchCancel(); //TODO added in 05/04/2012
 				AppController.getEventBus().fireEvent(new SearchTextEvent(null));
 				wsPortlet.getSearchAndFilterContainer().setSearchActive(false);  
-				//				setSearchActive(false);
-
 				resetSmartFolderSelected();
-
 				updatGridViewForSelectedItem(item);
 				return; 
 			}
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
index 15d1d2e..c5701b5 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
@@ -358,6 +358,17 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
 		return false;
 	}
 	
+	
+	public boolean addToStore(FileGridModel result){
+		
+		if(result!= null){
+			result.setIcon();
+			store.add(result);
+			return true;
+		}
+		return false;
+	}
+	
 	public FileGridModel getSelectedItem(){
 		
 		return currenItemSelected;
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ba5f44f..a03cde6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -69,6 +69,29 @@
 		<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
 	</servlet>
 
+	<!-- Servlets UploadServletStream -->
+	<servlet>
+		<servlet-name>workspaceUploadServletStream</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploadServletStream</servlet-class>
+	</servlet>
+
+	<servlet>
+		<servlet-name>workspaceUploaderService</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>workspaceUploadServletStream</servlet-name>
+		<url-pattern>/workspace/workspaceUploadServletStream</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>workspaceUploaderService</servlet-name>
+		<url-pattern>/workspace/workspaceUploaderService</url-pattern>
+	</servlet-mapping>
+
+	<!-- END Servlets UploadServletStream -->
+	
 	<servlet-mapping>
 		<servlet-name>ImageService</servlet-name>
 		<url-pattern>/workspace/ImageService</url-pattern>