diff --git a/package-lock.json b/package-lock.json
index 6d9a403..4b5cc6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2692,9 +2692,7 @@
       }
     },
     "@farmmaps/common": {
-      "version": "0.0.1-prerelease.308",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.308.tgz",
-      "integrity": "sha512-sbX5NEHons4ZH3HAnMoOgyeoicbj8tS24s7Xtzx6xE6QQHeeuxi2EmQR9CwQENFynHi7C0U/+nxNTu1ClIuIjw=="
+      "version": "file:dist/common"
     },
     "@farmmaps/common-map": {
       "version": "0.0.1-prerelease.308",
diff --git a/package.json b/package.json
index 0fd7e6a..5f57f1c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@angular/platform-browser": "~9.1.0",
     "@angular/platform-browser-dynamic": "~9.1.0",
     "@angular/router": "~9.1.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.308 <0.0.1",
+    "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": ">=0.0.1-prerelease.308 <0.0.1",
     "@microsoft/signalr": "^3.1.3",
     "@ng-bootstrap/ng-bootstrap": "^6.0",
diff --git a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
index cb51398..bd24754 100644
--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
@@ -89,13 +89,13 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     var layerIndex = -1;
     var layer: Layer = null;  
     layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
-    let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}` });
+    let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
     layer = new Tile({ source: source });
     var data = item.data;
     var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
     if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
       var rt = l.rendering as IRenderoutputTiles;
-      let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}` });
+      let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
       layer = new Tile({ source: source });
     }
     if (l && l.rendering && l.rendering.renderoutputType == "Image") {
@@ -105,7 +105,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         units: 'pixels',
         extent: ri.extent
       });
-      let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${item.updated.getTime()}` });
+      let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
       layer = new Image({ source: source });
     }
     return layer;
@@ -125,7 +125,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           maxZoom: rt.maxzoom,
           minZoom: rt.minzoom,
           format: new MVT(),
-          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${item.updated.getTime()}`
+          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${Date.parse(item.updated)}`
         }),
         style: (feature) => {
           return this.getColorFromGradient(l, feature);
@@ -137,7 +137,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         source: new XYZ({
           maxZoom: rt.maxzoom,
           minZoom: rt.minzoom,
-          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${item.updated.getTime()}`
+          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}`
         })
       });
     } else {
diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
index 5d29bad..4d9ea3c 100644
--- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="item;let item">
   <div class="card border-0">
-    <img *ngIf="item.thumbnail" class="card-img-top" [src]="config.getConfig('apiEndPoint') +'/api/v1/items/'+item.code+'/thumbnail?v='+item.updated.getTime()" />
+    <img *ngIf="item.thumbnail" class="card-img-top" [src]="config.getConfig('apiEndPoint') +'/api/v1/items/'+item.code+'/thumbnail?v=' + Date.parse(item.updated)" />
     <div *ngIf="!item.thumbnail" class="big-icon" [style.background-color]="itemTypeService.getColor(item.itemType)">
       <i [ngClass]="itemTypeService.getIcon(item.itemType)"></i>
     </div>
diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts
index e676913..b98e86c 100644
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/projects/common-map/src/fm-map/effects/map.effects.ts
@@ -203,7 +203,7 @@ export class MapEffects {
           return this.itemService$.getChildItemList(action.item.code,null).pipe(
             map(items => new mapActions.SelectTemporalItemsSuccess(
               items.sort((a, b) => 
-                 -(b.dataDate.getTime() - a.dataDate.getTime())
+                 -(Date.parse(b.dataDate) - Date.parse(a.dataDate))
               )
             )),
             catchError(error => of(new commonActions.Fail(error))));
diff --git a/projects/common/src/fm/models/item.ts b/projects/common/src/fm/models/item.ts
index 4566d90..13b82f4 100644
--- a/projects/common/src/fm/models/item.ts
+++ b/projects/common/src/fm/models/item.ts
@@ -15,10 +15,10 @@ export class Item implements IItem {
   public geometry?:any;
   public url?: string;
   public name?: string;
-  public created?: Date;
-  public updated?: Date;
-  public dataDate?: Date;
-  public dataEndDate?: Date;
+  public created?: string;
+  public updated?: string;
+  public dataDate?: string;
+  public dataEndDate?: string;
   public itemType?: string;
   public sourceTask?: string;
   public size?: number;
diff --git a/projects/common/src/fm/models/list.item.ts b/projects/common/src/fm/models/list.item.ts
index ba1a605..9c52097 100644
--- a/projects/common/src/fm/models/list.item.ts
+++ b/projects/common/src/fm/models/list.item.ts
@@ -2,10 +2,10 @@ export interface IListItem {
     url?: string;
     code?: string;
     name?: string;
-    created?: Date;
-    updated?: Date;
-    dataDate?: Date;
-    dataEndDate?: Date;
+    created?: string;
+    updated?: string;
+    dataDate?: string;
+    dataEndDate?: string;
     itemType?: string;
     sourceTask?: string;
     size?: number;
diff --git a/projects/common/src/fm/services/folder.service.ts b/projects/common/src/fm/services/folder.service.ts
index 3e81ac1..f491509 100644
--- a/projects/common/src/fm/services/folder.service.ts
+++ b/projects/common/src/fm/services/folder.service.ts
@@ -18,40 +18,32 @@ export class FolderService {
     return this.appConfig.getConfig("apiEndPoint");
   }
 
-  parseDates(item: any): IListItem {
-    item.created = new Date(Date.parse(item.created));
-    item.updated = new Date(Date.parse(item.updated));
-    item.dataDate = new Date(Date.parse(item.dataDate));
-    item.dataEndDate = new Date(Date.parse(item.dataEndDate));
-    return item;
-  }
-
-    getFolder(code: string): Observable<IListItem> {
-      return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/${code}`).pipe(map(i => this.parseDates(i)));            
+     getFolder(code: string): Observable<IListItem> {
+      return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/${code}`);            
     }
 
     getMyRoots(): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/my_roots`).pipe(map(ia => ia.map(i => this.parseDates(i))));
+      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/my_roots`);
     }    
 
     getFolderParents(code: string): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/parents`).pipe(map(ia => ia.map(i => this.parseDates(i))));
+      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/parents`);
     }
 
     getChildFolders(code: string): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/listfolders`).pipe(map(ia => ia.map(i => this.parseDates(i))));
+      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/listfolders`);
     }
 
     getItems(code: string,skip:number, take:number): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/list?skip=${skip}&take=${take}`).pipe(map(ia => ia.map(i => this.parseDates(i))));
+      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/list?skip=${skip}&take=${take}`);
     }
 
     moveItem(itemCode: string, newParentCode: string): Observable<IListItem> {
         const body = { itemCode: itemCode,newParentCode: newParentCode };
-      return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/items/move`, body).pipe(map(i => this.parseDates(i)));
+      return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/items/move`, body);
     }
 
     createFolder(folder: IItem): Observable<IListItem> {
-      return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/`, folder).pipe(map(i => this.parseDates(i)));
+      return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/`, folder);
     }
 }
diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts
index da7eb0b..b673dee 100644
--- a/projects/common/src/fm/services/item.service.ts
+++ b/projects/common/src/fm/services/item.service.ts
@@ -20,14 +20,6 @@ export class ItemService {
     return this.appConfig.getConfig("apiEndPoint");
   }
 
-  parseDates(item: any): IItem {
-    item.created = new Date(Date.parse(item.created));
-    item.updated = new Date(Date.parse(item.updated));
-    item.dataDate = new Date(Date.parse(item.dataDate));
-    item.dataEndDate = new Date(Date.parse(item.dataEndDate));
-    return item;
-  }
-
   getItemTypes(): Observable<{ [id: string]: IItemType }> {
     return this.httpClient.get<{ [id: string]: IItemType }>(`${this.ApiEndpoint()}/api/v1/itemtypes/`);
   }
@@ -60,7 +52,7 @@ export class ItemService {
   }
 
   getItem(code: string): Observable<IItem> {
-    return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}`).pipe(map(i => this.parseDates(i)));
+    return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}`);
   }
 
   getItemByCodeAndType(code: string, itemType: string): Observable<IItem> {
@@ -74,7 +66,7 @@ export class ItemService {
     if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode);    
     if(indexed) params = params.append("ind",indexed?"true":"false");    
     if(level) params = params.append("lvl", level.toFixed());
-    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }).pipe(map(ia => ia.map(i => this.parseDates(i))));
+    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
 
   getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level: number = 1, deep: boolean = true): Observable<IItem[]> {
@@ -87,7 +79,7 @@ export class ItemService {
     }
     params = params.append("lvl", level.toString());
     params = params.append("deep", deep.toString());
-    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }).pipe(map(ia => ia.map(i => this.parseDates(i))));
+    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 
   getChildItemListCount(parentcode: string, itemType: string): Observable<Number> {
@@ -105,7 +97,7 @@ export class ItemService {
       params = params.append("df", JSON.stringify(dataFilter));
     }
     params = params.append("lvl", level.toString());
-    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }).pipe(map(ia => ia.map(i => this.parseDates(i))));
+    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 
   getItemFeatures(code: string, extent: number[], crs: string, layerIndex?:number): Observable<any> {
@@ -154,6 +146,6 @@ export class ItemService {
   getItemTaskList(itemcode: string, unfinishedOnly?: boolean): Observable<IItemTask[]> {
     var params = new HttpParams();
     if (unfinishedOnly) params = params.append("unfinishedOnly", unfinishedOnly.toString());
-    return this.httpClient.get<IItemTask[]>(`${this.ApiEndpoint()}/api/v1/items/${itemcode}/tasks`, { params: params }).pipe(map(ia => ia.map(i => this.parseDates(i))));
+    return this.httpClient.get<IItemTask[]>(`${this.ApiEndpoint()}/api/v1/items/${itemcode}/tasks`, { params: params });
   }
 }
\ No newline at end of file