diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
index 6e3eaa6..a6a9eef 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
@@ -73,161 +73,248 @@ public interface TDGWTServiceAsync {
 	public static TDGWTServiceAsync INSTANCE = (TDGWTServiceAsync) GWT
 			.create(TDGWTService.class);
 
-	void hello(AsyncCallback<String> callback);	
-	
-	//TabularResource
-	void getCurrentTRId(AsyncCallback<TRId> callback);
-	void createTabularResource(TabResource tabResource,AsyncCallback<TabResource> callback);
-	void removeTabularResource(TRId trId, AsyncCallback<Void> callback);   
-	void isTabularResourceValid(TRId trId,AsyncCallback<Boolean> callback);
-	void getTabResourceInformation(AsyncCallback<TabResource> callback);
-	void getTabResourceInformation(TRId trId,AsyncCallback<TabResource> callback);	
-	void setTabResourceInformation(TabResource tabResource, AsyncCallback<Void> callback);
-	void getTRCreationDate(TRId trId,AsyncCallback<String> callback);
-    void setTabResource(TabResource tabResource, AsyncCallback<Void> callback);
-    void getTabularResources(AsyncCallback<ArrayList<TabResource>> callback);
-    void getTabularResourcesAndLastTables(AsyncCallback<ArrayList<TabResource>> callback);
-    void getLastTable(TRId trId, AsyncCallback<TableData> callback);
-    void getTable(TRId trId, AsyncCallback<TableData> callback);
-    void getTableMetadata(TRId trId, AsyncCallback<ArrayList<TabMetadata>> callback);
-    void getTRMetadata(TRId trId, AsyncCallback<ArrayList<TRMetadata>> callback);
-    void getColumns(AsyncCallback<ArrayList<ColumnData>> callback);
-    void getColumns(TRId trId, AsyncCallback<ArrayList<ColumnData>> callback);
-    void getColumnsForDimension(TRId trId, AsyncCallback<ArrayList<ColumnData>> callback);
-    void getColumn(TRId trId, String columnName, AsyncCallback<ColumnData> callback);
-    void getColumn(String columnLocalId,TRId trId, AsyncCallback<ColumnData> callback);
-    void getConnection(RefColumn refColumn, AsyncCallback<ColumnData> callback);
-    
-    //Task
-    void startTaskResubmit(TaskResubmitSession taskResubmitSession,AsyncCallback<String> callback);	
-	void startTaskResume(TaskResumeSession taskResumeSession,AsyncCallback<String> callback);	
-	
+	void hello(AsyncCallback<String> callback);
 
-    //Validations
-    void getValidationsTasksMetadata(TRId trId,AsyncCallback<ValidationsTasksMetadata> callback);
-    void getTableValidationsMetadata(TRId trId,AsyncCallback<TabValidationsMetadata> callback);
-    void getValidationColumns(TRId trId, String columnName, AsyncCallback<ArrayList<ColumnData>> callback);
-    
-    
-    //RollBack
-    void startRollBack(RollBackSession rollBackSession,AsyncCallback<String> callback);
-    void startDiscard(TRId trId,AsyncCallback<String> callback);
-    
-    //Share
-    void getShareInfo(TRId trId, AsyncCallback<ShareInfo> callback);
-    
-    void setShare(ShareInfo shareInfo, AsyncCallback<Void> callback);
-    
-    //CodelistPagingLoaded
+	// TabularResource
+	void getCurrentTRId(AsyncCallback<TRId> callback);
+
+	void createTabularResource(TabResource tabResource,
+			AsyncCallback<TabResource> callback);
+
+	void removeTabularResource(TRId trId, AsyncCallback<Void> callback);
+
+	void isTabularResourceValid(TRId trId, AsyncCallback<Boolean> callback);
+
+	void getTabResourceInformation(AsyncCallback<TabResource> callback);
+
+	void getTabResourceInformation(TRId trId,
+			AsyncCallback<TabResource> callback);
+
+	void setTabResourceInformation(TabResource tabResource,
+			AsyncCallback<Void> callback);
+
+	void getTRCreationDate(TRId trId, AsyncCallback<String> callback);
+
+	void setTabResource(TabResource tabResource, AsyncCallback<Void> callback);
+
+	void getTabularResources(AsyncCallback<ArrayList<TabResource>> callback);
+
+	void getTabularResourcesAndLastTables(
+			AsyncCallback<ArrayList<TabResource>> callback);
+
+	void getLastTable(TRId trId, AsyncCallback<TableData> callback);
+
+	void getTable(TRId trId, AsyncCallback<TableData> callback);
+
+	void getTableMetadata(TRId trId,
+			AsyncCallback<ArrayList<TabMetadata>> callback);
+
+	void getTRMetadata(TRId trId, AsyncCallback<ArrayList<TRMetadata>> callback);
+
+	void getColumns(AsyncCallback<ArrayList<ColumnData>> callback);
+
+	void getColumns(TRId trId, AsyncCallback<ArrayList<ColumnData>> callback);
+
+	void getColumnsForDimension(TRId trId,
+			AsyncCallback<ArrayList<ColumnData>> callback);
+
+	void getColumn(TRId trId, String columnName,
+			AsyncCallback<ColumnData> callback);
+
+	void getColumn(String columnLocalId, TRId trId,
+			AsyncCallback<ColumnData> callback);
+
+	void getConnection(RefColumn refColumn, AsyncCallback<ColumnData> callback);
+
+	// Task
+	void startTaskResubmit(TaskResubmitSession taskResubmitSession,
+			AsyncCallback<String> callback);
+
+	void startTaskResume(TaskResumeSession taskResumeSession,
+			AsyncCallback<String> callback);
+
+	// Validations
+	void getValidationsTasksMetadata(TRId trId,
+			AsyncCallback<ValidationsTasksMetadata> callback);
+
+	void getTableValidationsMetadata(TRId trId,
+			AsyncCallback<TabValidationsMetadata> callback);
+
+	void getValidationColumns(TRId trId, String columnName,
+			AsyncCallback<ArrayList<ColumnData>> callback);
+
+	// RollBack
+	void startRollBack(RollBackSession rollBackSession,
+			AsyncCallback<String> callback);
+
+	void startDiscard(TRId trId, AsyncCallback<String> callback);
+
+	// Share
+	void getShareInfo(TRId trId, AsyncCallback<ShareInfo> callback);
+
+	void setShare(ShareInfo shareInfo, AsyncCallback<Void> callback);
+
+	// CodelistPagingLoaded
 	void setCodelistsPagingLoader(AsyncCallback<Void> callback);
 
 	void getCodelistsPagingLoader(
 			CodelistPagingLoadConfig codelistPagingLoadConfig,
 			AsyncCallback<CodelistPagingLoadResult> callback);
 
-    //Open
-    void tdOpen(TDOpenSession tdOpenSession, AsyncCallback<Void> callback);
-	
-    //Clone
-	String startCloneTabularResource(CloneTabularResourceSession cloneTabularResourceSession, AsyncCallback<String> callback);
-	
-    
-    //SDMX
-    void getCodelists(AsyncCallback<ArrayList<Codelist>> callback);
+	// Open
+	void tdOpen(TDOpenSession tdOpenSession, AsyncCallback<Void> callback);
+
+	// Clone
+	void startCloneTabularResource(
+			CloneTabularResourceSession cloneTabularResourceSession,
+			AsyncCallback<String> callback);
+
+	// SDMX
+	void getCodelists(AsyncCallback<ArrayList<Codelist>> callback);
 
 	void getDatasets(AsyncCallback<ArrayList<Dataset>> callback);
-	
-	void getAgencies(AsyncCallback<ArrayList<Agencies>> callback);
-	
-	void setSDMXRegistrySource(SDMXRegistrySource sdmxRegistrySource, AsyncCallback<Void> callback);
-	
-	//Import SDMX 
-	void startSDMXImport(SDMXImportSession sdmxImportSession,AsyncCallback<String> callback);
-    
-	
-	//Import CSV
-	
-	void setCSVSession(CSVImportSession csvImportSession, AsyncCallback<Void> callback);
 
-	void getFileFromWorkspace(CSVImportSession csvImportSession, AsyncCallback<Void> callback);
+	void getAgencies(AsyncCallback<ArrayList<Agencies>> callback);
+
+	void setSDMXRegistrySource(SDMXRegistrySource sdmxRegistrySource,
+			AsyncCallback<Void> callback);
+
+	// Import SDMX
+	void startSDMXImport(SDMXImportSession sdmxImportSession,
+			AsyncCallback<String> callback);
+
+	// Import CSV
+
+	void setCSVSession(CSVImportSession csvImportSession,
+			AsyncCallback<Void> callback);
+
+	void getFileFromWorkspace(CSVImportSession csvImportSession,
+			AsyncCallback<Void> callback);
 
 	void getAvailableCharset(AsyncCallback<AvailableCharsetList> callback);
-	
-	void configureCSVParser(String encoding, HeaderPresence headerPresence, char delimiter, char comment, AsyncCallback<ArrayList<String>> callback);
-	
-	void checkCSV(long errorsLimit, AsyncCallback<CheckCSVSession> callback);
-	
-	void startCSVImport(CSVImportSession csvImportSession, AsyncCallback<String> callback);
-	
-	//Export CSV
-	void startCSVExport(CSVExportSession csvExportSession, AsyncCallback<String> callback);
-	
-	//Export SDMX
-	void startSDMXExport(SDMXExportSession exportSession, AsyncCallback<String> callback);
-	
-	
-	//Table Operation
-	void startChangeTableType(ChangeTableTypeSession changeTableTypeSession,AsyncCallback<String> callback);	
-	void startUnion(UnionSession unionSession, AsyncCallback<String> callback);
-		
-	
-	//Rows Operation
-	void startEditRow(EditRowSession editRowSession,AsyncCallback<String> callback);	
-	void startDeleteRows(DeleteRowsSession deleteRowsSession,AsyncCallback<String> callback);	
-	void startDuplicates(DuplicatesSession duplicatesSession,AsyncCallback<String> callback);	
 
-	//Column Operation 
-	void startChangeColumnType(ChangeColumnTypeSession changeColumnTypeSession,AsyncCallback<String> callback);
-	void startAddColumn(AddColumnSession addColumnSession,AsyncCallback<String> callback);
-	void startDeleteColumn(DeleteColumnSession deleteColumnSession,AsyncCallback<String> callback);
-	void startLabelColumn(LabelColumnSession labelColumnSession,AsyncCallback<String> callback);	
-	
-	/*void startSplitColumn(SplitColumnSession splitColumnSession,AsyncCallback<Void> callback);*/	
-	/*void startSplitColumn(MergeColumnSession mergeColumnSession,AsyncCallback<Void> callback);	*/
-	/*void startGroupBy(GroupBySession groupBySession,AsyncCallback<Void> callback);*/	
-	
-	
-	
-	//BatchReplace Operation
-	void getOccurrencesForBatchReplace(OccurrencesForReplaceBatchColumnSession occurrencesForReplaceBatchColumnSession, AsyncCallback<ArrayList<Occurrences>> callback); 
-	void startReplaceBatchColumn(ReplaceBatchColumnSession replaceBatchColumnSession,AsyncCallback<String> callback);	
-	
-	//Replace Operation
-	void startReplaceColumn(ReplaceColumnSession replaceColumnSession,AsyncCallback<String> callback);	
-	
-	//Templates
+	void configureCSVParser(String encoding, HeaderPresence headerPresence,
+			char delimiter, char comment,
+			AsyncCallback<ArrayList<String>> callback);
+
+	void checkCSV(long errorsLimit, AsyncCallback<CheckCSVSession> callback);
+
+	void startCSVImport(CSVImportSession csvImportSession,
+			AsyncCallback<String> callback);
+
+	// Export CSV
+	void startCSVExport(CSVExportSession csvExportSession,
+			AsyncCallback<String> callback);
+
+	// Export SDMX
+	void startSDMXExport(SDMXExportSession exportSession,
+			AsyncCallback<String> callback);
+
+	// Table Operation
+	void startChangeTableType(ChangeTableTypeSession changeTableTypeSession,
+			AsyncCallback<String> callback);
+
+	void startUnion(UnionSession unionSession, AsyncCallback<String> callback);
+
+	// Rows Operation
+	void startEditRow(EditRowSession editRowSession,
+			AsyncCallback<String> callback);
+
+	void startDeleteRows(DeleteRowsSession deleteRowsSession,
+			AsyncCallback<String> callback);
+
+	void startDuplicates(DuplicatesSession duplicatesSession,
+			AsyncCallback<String> callback);
+
+	// Column Operation
+	void startChangeColumnType(ChangeColumnTypeSession changeColumnTypeSession,
+			AsyncCallback<String> callback);
+
+	void startAddColumn(AddColumnSession addColumnSession,
+			AsyncCallback<String> callback);
+
+	void startDeleteColumn(DeleteColumnSession deleteColumnSession,
+			AsyncCallback<String> callback);
+
+	void startLabelColumn(LabelColumnSession labelColumnSession,
+			AsyncCallback<String> callback);
+
+	/*
+	 * void startSplitColumn(SplitColumnSession
+	 * splitColumnSession,AsyncCallback<Void> callback);
+	 */
+	/*
+	 * void startSplitColumn(MergeColumnSession
+	 * mergeColumnSession,AsyncCallback<Void> callback);
+	 */
+	/*
+	 * void startGroupBy(GroupBySession groupBySession,AsyncCallback<Void>
+	 * callback);
+	 */
+
+	// BatchReplace Operation
+	void getOccurrencesForBatchReplace(
+			OccurrencesForReplaceBatchColumnSession occurrencesForReplaceBatchColumnSession,
+			AsyncCallback<ArrayList<Occurrences>> callback);
+
+	void startReplaceBatchColumn(
+			ReplaceBatchColumnSession replaceBatchColumnSession,
+			AsyncCallback<String> callback);
+
+	// Replace Operation
+	void startReplaceColumn(ReplaceColumnSession replaceColumnSession,
+			AsyncCallback<String> callback);
+
+	// Templates
 	void getTemplates(AsyncCallback<ArrayList<TemplateData>> callback);
-	void startTemplateApply(TemplateApplySession templateDeleteSession,AsyncCallback<String> callback);	
-	void templateDelete(TemplateDeleteSession templateDeleteSession,AsyncCallback<Void> callback);	
-	
-	//Locales
+
+	void startTemplateApply(TemplateApplySession templateDeleteSession,
+			AsyncCallback<String> callback);
+
+	void templateDelete(TemplateDeleteSession templateDeleteSession,
+			AsyncCallback<Void> callback);
+
+	// Locales
 	void getLocales(AsyncCallback<ArrayList<String>> callback);
-	
-	//History
+
+	// History
 	void getHistory(AsyncCallback<ArrayList<OpHistory>> callback);
+
 	void getHistory(TRId trId, AsyncCallback<ArrayList<OpHistory>> callback);
+
 	void getLastOperationInfo(AsyncCallback<OpHistory> callback);
+
 	void getLastOperationInfo(TRId trId, AsyncCallback<OpHistory> callback);
-	
-	//Helper Extract Codelist
-	void startExtractCodelist(ExtractCodelistSession extractCodelistSession, AsyncCallback<String> callback);
-	
-	//Helper Codelist Mapping Import		
-	void setCodelistMappingSession(CodelistMappingSession codelistMappingSession, AsyncCallback<Void> callback);
-	void getFileFromWorkspace(CodelistMappingSession codelistMappingSession, AsyncCallback<Void> callback);		
-	void startCodelistMappingImport(CodelistMappingSession codelistMappingSession, AsyncCallback<String> callback);
-	
-	//Normalization
-	void startNormalization(NormalizationSession normalizationSession, AsyncCallback<String> callback);
-	
-	//Denormalization	
-	void startDenormalization(DenormalizationSession denormalizationSession, AsyncCallback<String> callback);
-	
-	//Operation Monitor
-	void getOperationMonitor(OperationMonitorSession operationMonitorSession, AsyncCallback<OperationMonitor> callback);
-	
-	//File Upload Monitor
+
+	// Helper Extract Codelist
+	void startExtractCodelist(ExtractCodelistSession extractCodelistSession,
+			AsyncCallback<String> callback);
+
+	// Helper Codelist Mapping Import
+	void setCodelistMappingSession(
+			CodelistMappingSession codelistMappingSession,
+			AsyncCallback<Void> callback);
+
+	void getFileFromWorkspace(CodelistMappingSession codelistMappingSession,
+			AsyncCallback<Void> callback);
+
+	void startCodelistMappingImport(
+			CodelistMappingSession codelistMappingSession,
+			AsyncCallback<String> callback);
+
+	// Normalization
+	void startNormalization(NormalizationSession normalizationSession,
+			AsyncCallback<String> callback);
+
+	// Denormalization
+	void startDenormalization(DenormalizationSession denormalizationSession,
+			AsyncCallback<String> callback);
+
+	// Operation Monitor
+	void getOperationMonitor(OperationMonitorSession operationMonitorSession,
+			AsyncCallback<OperationMonitor> callback);
+
+	// File Upload Monitor
 	void getFileUploadMonitor(AsyncCallback<FileUploadMonitor> callback);
-		
-	
+
 }