diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs
index 07b7eb57e..3597e55a3 100644
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs
@@ -53,6 +53,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets
                     new CreateIndexModel<MongoAssetEntity>(
                         Index
                             .Ascending(x => x.AppId)
+                            .Ascending(x => x.IsDeleted)
                             .Ascending(x => x.Slug))
                 },
                 ct);
@@ -114,32 +115,22 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets
             using (Profiler.TraceMethod<MongoAssetRepository>())
             {
                 var assetEntity =
-                    await Collection.Find(x => x.IndexedAppId == appId && x.Slug == slug)
+                    await Collection.Find(x => x.IndexedAppId == appId && !x.IsDeleted && x.Slug == slug)
                         .FirstOrDefaultAsync();
 
-                if (assetEntity?.IsDeleted == true)
-                {
-                    return null;
-                }
-
                 return assetEntity;
             }
         }
 
-        public async Task<IAssetEntity> FindAssetByHashAsync(Guid appId, string hash)
+        public async Task<IList<IAssetEntity>> QueryByHashAsync(Guid appId, string hash)
         {
             using (Profiler.TraceMethod<MongoAssetRepository>())
             {
-                var assetEntity =
+                var assetEntities =
                     await Collection.Find(x => x.IndexedAppId == appId && !x.IsDeleted && x.FileHash == hash)
-                        .FirstOrDefaultAsync();
-
-                if (assetEntity?.IsDeleted == true)
-                {
-                    return null;
-                }
+                        .ToListAsync();
 
-                return assetEntity;
+                return assetEntities.OfType<IAssetEntity>().ToList();
             }
         }
 
diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs
index dd15cdd28..f5366299b 100644
--- a/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs
+++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs
@@ -11,7 +11,6 @@ using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Orleans;
 using Squidex.Domain.Apps.Entities.Assets.Commands;
-using Squidex.Domain.Apps.Entities.Assets.Repositories;
 using Squidex.Domain.Apps.Entities.Tags;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Assets;
@@ -22,13 +21,13 @@ namespace Squidex.Domain.Apps.Entities.Assets
     public sealed class AssetCommandMiddleware : GrainCommandMiddleware<AssetCommand, IAssetGrain>
     {
         private readonly IAssetStore assetStore;
-        private readonly AssetQueryService assetQueryService;
+        private readonly IAssetQueryService assetQueryService;
         private readonly IAssetThumbnailGenerator assetThumbnailGenerator;
         private readonly IEnumerable<ITagGenerator<CreateAsset>> tagGenerators;
 
         public AssetCommandMiddleware(
             IGrainFactory grainFactory,
-            AssetQueryService assetQueryService,
+            IAssetQueryService assetQueryService,
             IAssetStore assetStore,
             IAssetThumbnailGenerator assetThumbnailGenerator,
             IEnumerable<ITagGenerator<CreateAsset>> tagGenerators)
@@ -63,21 +62,27 @@ namespace Squidex.Domain.Apps.Entities.Assets
 
                         try
                         {
-                            var existing = await assetQueryService.FindAssetByHashAsync(createAsset.AppId.Id, createAsset.FileHash);
+                            var existings = await assetQueryService.QueryByHashAsync(createAsset.AppId.Id, createAsset.FileHash);
 
-                            AssetCreatedResult result;
+                            AssetCreatedResult result = null;
 
-                            if (IsDuplicate(createAsset, existing))
+                            foreach (var existing in existings)
                             {
-                                result = new AssetCreatedResult(
-                                    existing.Id,
-                                    existing.Tags,
-                                    existing.Version,
-                                    existing.FileVersion,
-                                    existing.FileHash,
-                                    true);
+                                if (IsDuplicate(createAsset, existing))
+                                {
+                                    result = new AssetCreatedResult(
+                                        existing.Id,
+                                        existing.Tags,
+                                        existing.Version,
+                                        existing.FileVersion,
+                                        existing.FileHash,
+                                        true);
+                                }
+
+                                break;
                             }
-                            else
+
+                            if (result == null)
                             {
                                 foreach (var tagGenerator in tagGenerators)
                                 {
@@ -147,7 +152,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
             {
                 await assetStore.UploadAsync(context.ContextId.ToString(), hashStream);
 
-                hash = hashStream.GetHashStringAndReset();
+                hash = $"{hashStream.GetHashStringAndReset()}{file.FileName}{file.FileSize}".Sha256Base64();
             }
 
             return hash;
diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs
index 5965d1030..9edfe22fb 100644
--- a/src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs
+++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetQueryService.cs
@@ -38,14 +38,14 @@ namespace Squidex.Domain.Apps.Entities.Assets
             this.tagService = tagService;
         }
 
-        public virtual Task<IAssetEntity> FindAssetAsync(QueryContext context, Guid id)
+        public Task<IAssetEntity> FindAssetAsync(QueryContext context, Guid id)
         {
             Guard.NotNull(context, nameof(context));
 
             return FindAssetAsync(context.App.Id, id);
         }
 
-        public virtual async Task<IAssetEntity> FindAssetAsync(Guid appId, Guid id)
+        public async Task<IAssetEntity> FindAssetAsync(Guid appId, Guid id)
         {
             var asset = await assetRepository.FindAssetAsync(id);
 
@@ -57,19 +57,18 @@ namespace Squidex.Domain.Apps.Entities.Assets
             return asset;
         }
 
-        public virtual async Task<IAssetEntity> FindAssetByHashAsync(Guid appId, string hash)
+        public async Task<IList<IAssetEntity>> QueryByHashAsync(Guid appId, string hash)
         {
-            var asset = await assetRepository.FindAssetByHashAsync(appId, hash);
+            Guard.NotNull(hash, nameof(hash));
 
-            if (asset != null)
-            {
-                await DenormalizeTagsAsync(appId, Enumerable.Repeat(asset, 1));
-            }
+            var assets = await assetRepository.QueryByHashAsync(appId, hash);
 
-            return asset;
+            await DenormalizeTagsAsync(appId, assets);
+
+            return assets;
         }
 
-        public virtual async Task<IResultList<IAssetEntity>> QueryAsync(QueryContext context, Q query)
+        public async Task<IResultList<IAssetEntity>> QueryAsync(QueryContext context, Q query)
         {
             Guard.NotNull(context, nameof(context));
             Guard.NotNull(query, nameof(query));
diff --git a/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs b/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs
index fa17c0731..f93f0f69b 100644
--- a/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs
+++ b/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs
@@ -6,6 +6,7 @@
 // ==========================================================================
 
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Squidex.Infrastructure;
 
@@ -13,6 +14,8 @@ namespace Squidex.Domain.Apps.Entities.Assets
 {
     public interface IAssetQueryService
     {
+        Task<IList<IAssetEntity>> QueryByHashAsync(Guid appId, string hash);
+
         Task<IResultList<IAssetEntity>> QueryAsync(QueryContext contex, Q query);
 
         Task<IAssetEntity> FindAssetAsync(QueryContext context, Guid id);
diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs b/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs
index 81481f99b..12de8c72a 100644
--- a/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs
+++ b/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs
@@ -15,6 +15,8 @@ namespace Squidex.Domain.Apps.Entities.Assets.Repositories
 {
     public interface IAssetRepository
     {
+        Task<IList<IAssetEntity>> QueryByHashAsync(Guid appId, string hash);
+
         Task<IResultList<IAssetEntity>> QueryAsync(Guid appId, Query query);
 
         Task<IResultList<IAssetEntity>> QueryAsync(Guid appId, HashSet<Guid> ids);
@@ -23,8 +25,6 @@ namespace Squidex.Domain.Apps.Entities.Assets.Repositories
 
         Task<IAssetEntity> FindAssetBySlugAsync(Guid appId, string slug);
 
-        Task<IAssetEntity> FindAssetByHashAsync(Guid appId, string hash);
-
         Task RemoveAsync(Guid appId);
     }
 }
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs
index b5d470564..23417373c 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs
@@ -101,10 +101,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
 
             AddField(new FieldType
             {
-                Name = "slug",
+                Name = "fileHash",
                 ResolvedType = AllTypes.NonNullString,
-                Resolver = Resolve(x => x.Slug),
-                Description = "The file name as slug."
+                Resolver = Resolve(x => x.FileHash),
+                Description = "The hash of the file. Can be null for old files."
             });
 
             AddField(new FieldType
@@ -131,6 +131,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types
                 Description = "The version of the file."
             });
 
+            AddField(new FieldType
+            {
+                Name = "slug",
+                ResolvedType = AllTypes.NonNullString,
+                Resolver = Resolve(x => x.Slug),
+                Description = "The file name as slug."
+            });
+
             AddField(new FieldType
             {
                 Name = "isImage",
diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
index 056250ff0..b7bd86d8e 100644
--- a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs
@@ -108,7 +108,7 @@ namespace Squidex.Areas.Api.Controllers.Assets
             }
             else
             {
-                entity = await assetRepository.FindAssetByHashAsync(App.Id, idOrSlug);
+                entity = await assetRepository.FindAssetBySlugAsync(App.Id, idOrSlug);
             }
 
             return DeliverAsset(entity, version, width, height, quality, mode);
diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
index 53d3871db..dddcf8cf6 100644
--- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
+++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html
@@ -40,7 +40,7 @@
                         <div *ngSwitchCase="'Completed'" class="backup-status backup-status-success">
                             <i class="icon-checkmark"></i>
                         </div>
-                        <div *NgSwitchDefault class="backup-status backup-status-pending spin">
+                        <div *ngSwitchDefault class="backup-status backup-status-pending spin">
                             <i class="icon-hour-glass"></i>
                         </div>
                     </div>
diff --git a/src/Squidex/app/framework/utils/rxjs-extensions.ts b/src/Squidex/app/framework/utils/rxjs-extensions.ts
index b93664ec6..a0ad45487 100644
--- a/src/Squidex/app/framework/utils/rxjs-extensions.ts
+++ b/src/Squidex/app/framework/utils/rxjs-extensions.ts
@@ -52,4 +52,12 @@ export function switchSafe<T, R>(project: (source: T) => Observable<R>) {
     return function mapOperation(source: Observable<T>) {
         return source.pipe(switchMap(project), onErrorResumeNext<R, R>());
     };
+}
+
+export function ofForever<T>(...values: T[]) {
+    return new Observable<T>(s => {
+        for (let value of values) {
+            s.next(value);
+        }
+    });
 }
\ No newline at end of file
diff --git a/src/Squidex/app/shared/components/asset-uploader.component.html b/src/Squidex/app/shared/components/asset-uploader.component.html
index abb338d95..57a00d5c7 100644
--- a/src/Squidex/app/shared/components/asset-uploader.component.html
+++ b/src/Squidex/app/shared/components/asset-uploader.component.html
@@ -12,12 +12,23 @@
                     No upload in progress, drop files here.
                 </small>
     
-                <div class="upload row no-gutters" *ngFor="let upload of uploads">
+                <div class="upload row no-gutters" *ngFor="let upload of uploads; trackBy: trackByUpload">
+                    <div class="col-auto" [ngSwitch]="upload.status">
+                        <div *ngSwitchCase="'Failed'" class="upload-status upload-status-failed">
+                            <i class="icon-exclamation"></i>
+                        </div>
+                        <div *ngSwitchCase="'Completed'" class="upload-status upload-status-success">
+                            <i class="icon-checkmark"></i>
+                        </div>
+                        <div *ngSwitchDefault class="upload-status upload-status-running">
+                            <i class="icon-hour-glass"></i>
+                        </div>
+                    </div>
                     <div class="col-6">
                         <div class="upload-name">{{upload.name}}</div>
                     </div>
                     <div class="col">
-                        <sqx-progress-bar [value]="upload.progress" [trailWidth]="0.8" [strokeWidth]="0.8" [showText]="false" [animated]="false"></sqx-progress-bar>
+                        <sqx-progress-bar [value]="upload.progress" [trailWidth]="1.5" [strokeWidth]="1.5" [showText]="false" [animated]="false"></sqx-progress-bar>
                     </div>
                     <div class="col-auto">
                         <button type="button" class="btn btn-text-secondary" (click)="stopUpload(upload)">
diff --git a/src/Squidex/app/shared/components/asset-uploader.component.scss b/src/Squidex/app/shared/components/asset-uploader.component.scss
index a6dd0a60e..8a794dfef 100644
--- a/src/Squidex/app/shared/components/asset-uploader.component.scss
+++ b/src/Squidex/app/shared/components/asset-uploader.component.scss
@@ -37,10 +37,12 @@
 .uploads {
     & {
         border: 2px solid transparent;
+        background: none;
+        min-height: 2rem;
     }
     
     &-empty {
-        line-height: 2rem;
+        line-height: 1.8rem;
     }
 }
 
@@ -63,6 +65,34 @@
     }
 }
 
+$circle-size: 1.6rem;
+
+.upload-status {
+    & {
+        @include circle($circle-size);
+        display: inline-block;
+        line-height: $circle-size + .1rem;
+        text-align: center;
+        font-size: .4 * $circle-size;
+        font-weight: normal;
+        background: $color-border;
+        color: $color-dark-foreground;
+        cursor: none;
+    }
+
+    &-running {
+        color: inherit;
+    }
+
+    &-failed {
+        background: $color-theme-error;
+    }
+
+    &-success {
+        background: $color-theme-green;
+    }
+}
+
 .drag {
     & > .uploads {
         border-color: $color-theme-blue;
diff --git a/src/Squidex/app/shared/components/asset-uploader.component.ts b/src/Squidex/app/shared/components/asset-uploader.component.ts
index a67594332..df6b81565 100644
--- a/src/Squidex/app/shared/components/asset-uploader.component.ts
+++ b/src/Squidex/app/shared/components/asset-uploader.component.ts
@@ -44,4 +44,8 @@ export class AssetUploaderComponent {
     public stopUpload(upload: Upload) {
         this.assetUploader.stopUpload(upload);
     }
+
+    public trackByUpload(index: number, upload: Upload) {
+        return upload.id;
+    }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html
index bb466fb5c..8aa751b69 100644
--- a/src/Squidex/app/shared/components/asset.component.html
+++ b/src/Squidex/app/shared/components/asset.component.html
@@ -1,4 +1,4 @@
- <ng-container *ngIf="!isListView; else listTemplate">
+<ng-container *ngIf="!isListView; else listTemplate">
     <div class="card" [class.selectable]="isSelectable" [class.border-primary]="isSelected" (click)="emitSelect()" (sqxFileDrop)="updateFile($event)" [noDrop]="true">
         <div class="card-body">
             <div class="file-preview" *ngIf="asset && snapshot.progress === 0" @fade>
diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts
index b1b1800fa..2f6d989ce 100644
--- a/src/Squidex/app/shared/components/asset.component.ts
+++ b/src/Squidex/app/shared/components/asset.component.ts
@@ -9,7 +9,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Ho
 
 import {
     AssetDto,
-    AuthService,
     DialogModel,
     DialogService,
     fadeAnimation,
@@ -113,7 +112,7 @@ export class AssetComponent extends StatefulComponent<State> implements OnInit {
         if (files.length === 1) {
             this.setProgress(1);
 
-            this.assetUploader.uploadUpdate(this.asset, files[0])
+            this.assetUploader.uploadAsset(this.asset, files[0])
                 .subscribe(dto => {
                     if (Types.isNumber(dto)) {
                         this.setProgress(dto);
@@ -123,6 +122,8 @@ export class AssetComponent extends StatefulComponent<State> implements OnInit {
                 }, error => {
                     this.dialogs.notifyError(error);
 
+                    this.setProgress(0);
+                }, () => {
                     this.setProgress(0);
                 });
         }
diff --git a/src/Squidex/app/shared/components/assets-list.component.html b/src/Squidex/app/shared/components/assets-list.component.html
index abbc38f07..592e44e29 100644
--- a/src/Squidex/app/shared/components/assets-list.component.html
+++ b/src/Squidex/app/shared/components/assets-list.component.html
@@ -15,21 +15,20 @@
 </div>
 
 <div class="row assets" [class.unrow]="isListView" *ngIf="state.tagsNames | async; let tags" (paste)="addFiles($event)">
-    <ng-container *ngIf="state.uploads | async; let uploads">
-        <sqx-asset *ngFor="let upload of uploads; trackBy: trackByUpload" [upload]="upload"
-            [isListView]="isListView">
-        </sqx-asset>
-    </ng-container>
+    <sqx-asset *ngFor="let file of newFiles" [initFile]="file"
+        [isListView]="isListView"
+        (loadError)="remove(file)" 
+        (load)="add(file, $event)">
+    </sqx-asset>
 
-    <ng-container *ngIf="state.assetsWithUploads | async; let assets">
-        <sqx-asset *ngFor="let a of assets; trackBy: trackByAsset" [asset]="a.asset" [upload]="a.upload"
+    <ng-container *ngIf="state.assets | async; let assets">
+        <sqx-asset *ngFor="let asset of assets; trackBy: trackByAsset" [asset]="asset"
             [isListView]="isListView"
             [isDisabled]="isDisabled"
             [isSelectable]="selectedIds"
-            [isSelected]="isSelected(a.asset)"
+            [isSelected]="isSelected(asset)"
             [allTags]="tags"
             (update)="update($event)"
-            (uploadFile)="updateFile(a.asset, $event)"
             (select)="emitSelect($event)"
             (delete)="delete($event)">
         </sqx-asset>
diff --git a/src/Squidex/app/shared/state/asset-uploader.state.spec.ts b/src/Squidex/app/shared/state/asset-uploader.state.spec.ts
new file mode 100644
index 000000000..b24c45891
--- /dev/null
+++ b/src/Squidex/app/shared/state/asset-uploader.state.spec.ts
@@ -0,0 +1,211 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
+ */
+
+import { never, of, throwError } from 'rxjs';
+import { onErrorResumeNext } from 'rxjs/operators';
+import { IMock, Mock } from 'typemoq';
+
+import {
+    AssetUploaderState,
+    DialogService,
+    ofForever,
+    Types,
+    Version,
+    versioned
+} from './../';
+
+import { AssetDto, AssetReplacedDto, AssetsService } from '../services/assets.service';
+import { TestValues } from './_test-helpers';
+
+describe('AssetsState', () => {
+    const {
+        app,
+        appsState,
+        authService,
+        creator,
+        creation,
+        modified,
+        modifier,
+        now,
+        userId
+    } = TestValues;
+
+    let assetsService: IMock<AssetsService>;
+    let dialogs: IMock<DialogService>;
+    let assetUploader: AssetUploaderState;
+
+    const asset = new AssetDto('id1',
+        creator,
+        creator,
+        creation,
+        creation,
+        'my-asset',
+        'my-hash',
+        'png',
+        100,
+        1,
+        'image/png',
+        true,
+        true,
+        800,
+        600,
+        'my-slug',
+        [],
+        'http://url',
+        new Version('1'));
+
+    beforeEach(() => {
+        dialogs = Mock.ofType<DialogService>();
+
+        assetsService = Mock.ofType<AssetsService>();
+        assetUploader = new AssetUploaderState(appsState.object, assetsService.object, authService.object, dialogs.object);
+    });
+
+    afterEach(() => {
+        assetsService.verifyAll();
+    });
+
+    it('should create initial state when uploading file', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.uploadFile(app, file, userId, now))
+            .returns(() => never()).verifiable();
+
+        assetUploader.uploadFile(file, undefined, now).subscribe();
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Running');
+        expect(upload.progress).toBe(1);
+    });
+
+    it('should update progress when uploading file makes progress', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.uploadFile(app, file, userId, now))
+            .returns(() => ofForever(10, 20)).verifiable();
+
+        assetUploader.uploadFile(file, undefined, now).subscribe();
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Running');
+        expect(upload.progress).toBe(20);
+    });
+
+    it('should update status when uploading file failed', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.uploadFile(app, file, userId, now))
+            .returns(() => throwError('Error')).verifiable();
+
+        assetUploader.uploadFile(file, undefined, now).pipe(onErrorResumeNext()).subscribe();
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Failed');
+        expect(upload.progress).toBe(1);
+    });
+
+    it('should update status when uploading file completes', (cb) => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.uploadFile(app, file, userId, now))
+            .returns(() => of(10, 20, asset)).verifiable();
+
+        let uploadedAsset: AssetDto;
+
+        assetUploader.uploadFile(file, undefined, now).subscribe(dto => {
+            if (Types.is(dto, AssetDto)) {
+                uploadedAsset = dto;
+            }
+
+            cb();
+        });
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Completed');
+        expect(upload.progress).toBe(100);
+        expect(uploadedAsset!).toBe(asset);
+    });
+
+    it('should create initial state when uploading asset', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.replaceFile(app, asset.id, file, asset.version))
+            .returns(() => never()).verifiable();
+
+        assetUploader.uploadAsset(asset, file, now).subscribe();
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Running');
+        expect(upload.progress).toBe(1);
+    });
+
+    it('should update progress when uploading asset makes progress', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.replaceFile(app, asset.id, file, asset.version))
+            .returns(() => ofForever(10, 20)).verifiable();
+
+        assetUploader.uploadAsset(asset, file, now).subscribe();
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Running');
+        expect(upload.progress).toBe(20);
+    });
+
+    it('should update status when uploading asset failed', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        assetsService.setup(x => x.replaceFile(app, asset.id, file, asset.version))
+            .returns(() => throwError('Error')).verifiable();
+
+        assetUploader.uploadAsset(asset, file, now).pipe(onErrorResumeNext()).subscribe();
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Failed');
+        expect(upload.progress).toBe(1);
+    });
+
+    it('should update status when uploading asset completes', () => {
+        const file: File = <any>{ name: 'my-file' };
+
+        let update: AssetReplacedDto = {
+            isImage: true,
+            mimeType: 'image/jpeg',
+            pixelWidth: 800,
+            pixelHeight: 600,
+            fileHash: 'my-hash2',
+            fileSize: 200,
+            fileVersion: 2
+        };
+
+        const newAsset = asset.update(update, modifier, new Version('2'), modified);
+
+        assetsService.setup(x => x.replaceFile(app, asset.id, file, asset.version))
+            .returns(() => of(10, 20, versioned(new Version('2'), update))).verifiable();
+
+        let uploadedAsset: AssetDto;
+
+        assetUploader.uploadAsset(asset, file, modified).subscribe(dto => {
+            if (Types.is(dto, AssetDto)) {
+                uploadedAsset = dto;
+            }
+        });
+
+        const upload = assetUploader.snapshot.uploads.at(0);
+
+        expect(upload.status).toBe('Completed');
+        expect(upload.progress).toBe(100);
+        expect(uploadedAsset!).toEqual(newAsset);
+    });
+});
\ No newline at end of file
diff --git a/src/Squidex/app/shared/state/asset-uploader.state.ts b/src/Squidex/app/shared/state/asset-uploader.state.ts
index 7ca0500c6..4d2dece60 100644
--- a/src/Squidex/app/shared/state/asset-uploader.state.ts
+++ b/src/Squidex/app/shared/state/asset-uploader.state.ts
@@ -6,8 +6,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable, Subject, Subscription } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { Observable, ReplaySubject, Subject, Subscription } from 'rxjs';
+import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
 
 import {
     DateTime,
@@ -31,7 +31,10 @@ export interface Upload {
     name: string;
 
     // The upload subscription.
-    subscription: Subscription;
+    subscription?: Subscription;
+
+    // The subject to notify subscribers.
+    subject: ReplaySubject<UploadResult>;
 
     // The progress.
     progress: number;
@@ -64,7 +67,10 @@ export class AssetUploaderState extends State<Snapshot> {
     }
 
     public stopUpload(upload: Upload) {
-        upload.subscription.unsubscribe();
+        if (upload.subscription) {
+            upload.subscription.unsubscribe();
+            upload.subject.complete();
+        }
 
         this.next(s => {
             const uploads = s.uploads.removeBy('id', upload);
@@ -74,76 +80,61 @@ export class AssetUploaderState extends State<Snapshot> {
     }
 
     public uploadFile(file: File, target?: AssetsState, now?: DateTime): Observable<UploadResult> {
-        const observable = this.assetsService.uploadFile(this.appName, file, this.user, now || DateTime.now());
-
-        let upload: Upload;
-
-        const subject = new Subject<UploadResult>();
-        const subscription = observable.subscribe(event => {
-            if (Types.isNumber(event)) {
-                this.update(upload, { progress: event });
-            } else {
-                if (event.isDuplicate) {
-                    this.dialogs.notifyError('Asset has already been uploaded.');
-                }
+        const stream = this.assetsService.uploadFile(this.appName, file, this.user, now || DateTime.now());
 
-                if (target) {
-                    target.add(event);
-                }
+        return this.upload(stream, MathHelper.guid(), file, (asset, subject) => {
+            if (asset.isDuplicate) {
+                this.dialogs.notifyError('Asset has already been uploaded.');
+            } else if (target) {
+                target.add(asset);
             }
 
-            subject.next(event);
-        }, error => {
-            subject.error(error);
-
-            this.remove(upload, 'failed');
-        }, () => {
-            subject.complete();
-
-            this.remove(upload, 'completed');
+            subject.next(asset);
         });
+    }
 
-        upload = { id: MathHelper.guid(), name: file.name, progress: 1, subscription, status: 'running' };
+    public uploadAsset(asset: AssetDto, file: File, now?: DateTime): Observable<UploadResult> {
+        const stream = this.assetsService.replaceFile(this.appName, asset.id, file, asset.version);
 
-        this.addUpload(upload);
-
-        return subject;
+        return this.upload(stream, asset.id, file, ({ version, payload }, subject) => {
+            subject.next(asset.update(payload, this.user, version, now));
+        });
     }
 
-    public uploadUpdate(asset: AssetDto, file: File, now?: DateTime): Observable<UploadResult> {
-        const observable = this.assetsService.replaceFile(this.appName, asset.id, file, asset.version);
+    private upload<T, R>(stream: Observable<number | R>, id: string, file: File, complete: (completion: R, subject: Subject<UploadResult>) => void) {
+        const subject = new ReplaySubject<UploadResult>();
+
+        let upload = { id, name: file.name, progress: 1, status: 'Running', subject };
 
-        let upload: Upload;
+        this.addUpload(upload);
 
-        const subject = new Subject<UploadResult>();
-        const subscription = observable.subscribe(event => {
+        const subscription = stream.subscribe(event => {
             if (Types.isNumber(event)) {
-                this.update(upload, { progress: event });
+                upload = this.update(upload, { progress: event });
 
                 subject.next(event);
             } else {
-                subject.next(asset.update(event.payload, this.user, event.version, now));
+                complete(event, subject);
             }
-
         }, error => {
             subject.error(error);
 
-            this.remove(upload, 'failed');
+            upload = this.remove(upload, { status: 'Failed' });
         }, () => {
-            subject.complete();
+            if (!subject.isStopped) {
+                subject.complete();
+            }
 
-            this.remove(upload, 'completed');
+            upload = this.remove(upload, { status: 'Completed', progress: 100 });
         });
 
-        upload = { id: asset.id, name: file.name, progress: 1, subscription, status: 'running' };
+        upload = this.update(upload, { subscription });
 
-        this.addUpload(upload);
-
-        return subject;
+        return subject.pipe(shareReplay());
     }
 
-    private remove(upload: Upload, status: string) {
-        this.update(upload, { status });
+    private remove(upload: Upload, update: Partial<Upload>) {
+        upload = this.update(upload, update);
 
         setTimeout(() => {
             this.next(s => {
@@ -153,14 +144,20 @@ export class AssetUploaderState extends State<Snapshot> {
             });
 
         }, 10000);
+
+        return upload;
     }
 
     private update(upload: Upload, update: Partial<Upload>) {
+        upload = { ...upload, ...update };
+
         this.next(s => {
-            const uploads = s.uploads.replaceBy('id', { ...upload, ...update });
+            const uploads = s.uploads.replaceBy('id', upload);
 
             return { ...s, uploads };
         });
+
+        return upload;
     }
 
     private addUpload(upload: Upload) {
diff --git a/src/Squidex/app/shared/state/roles.state.ts b/src/Squidex/app/shared/state/roles.state.ts
index 2896227e3..4958415a5 100644
--- a/src/Squidex/app/shared/state/roles.state.ts
+++ b/src/Squidex/app/shared/state/roles.state.ts
@@ -64,7 +64,7 @@ export class RolesState extends State<Snapshot> {
         }
 
        return this.rolesService.getRoles(this.appName).pipe(
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 if (isReload) {
                     this.dialogs.notifyInfo('Roles reloaded.');
                 }
diff --git a/src/Squidex/app/shared/state/schemas.state.ts b/src/Squidex/app/shared/state/schemas.state.ts
index b75e22de2..f4bb90346 100644
--- a/src/Squidex/app/shared/state/schemas.state.ts
+++ b/src/Squidex/app/shared/state/schemas.state.ts
@@ -271,7 +271,7 @@ export class SchemasState extends State<Snapshot> {
     public lockField<T extends FieldDto>(schema: SchemaDetailsDto, field: T, now?: DateTime): Observable<T> {
         return this.schemasService.lockField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe(
             mapVersioned(() => setLocked(field, true)),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.replaceField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs, { project: x => x.payload }));
@@ -280,7 +280,7 @@ export class SchemasState extends State<Snapshot> {
     public enableField<T extends FieldDto>(schema: SchemaDetailsDto, field: T, now?: DateTime): Observable<T> {
         return this.schemasService.enableField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe(
             mapVersioned(() => setDisabled(field, false)),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.replaceField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs, { project: x => x.payload }));
@@ -289,7 +289,7 @@ export class SchemasState extends State<Snapshot> {
     public disableField<T extends FieldDto>(schema: SchemaDetailsDto, field: T, now?: DateTime): Observable<T> {
         return this.schemasService.disableField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe(
             mapVersioned(() => setDisabled(field, true)),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.replaceField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs, { project: x => x.payload }));
@@ -298,7 +298,7 @@ export class SchemasState extends State<Snapshot> {
     public showField<T extends FieldDto>(schema: SchemaDetailsDto, field: T, now?: DateTime): Observable<T> {
         return this.schemasService.showField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe(
             mapVersioned(() => setHidden(field, false)),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.replaceField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs, { project: x => x.payload }));
@@ -307,7 +307,7 @@ export class SchemasState extends State<Snapshot> {
     public hideField<T extends FieldDto>(schema: SchemaDetailsDto, field: T, now?: DateTime): Observable<T> {
         return this.schemasService.hideField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe(
             mapVersioned(() => setHidden(field, true)),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.replaceField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs, { project: x => x.payload }));
@@ -316,7 +316,7 @@ export class SchemasState extends State<Snapshot> {
     public updateField<T extends FieldDto>(schema: SchemaDetailsDto, field: T, request: UpdateFieldDto, now?: DateTime): Observable<T> {
         return this.schemasService.putField(this.appName, schema.name, field.fieldId, request, pidof(field), schema.version).pipe(
             mapVersioned(() => update(field, request.properties)),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.replaceField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs, { project: x => x.payload }));
@@ -325,7 +325,7 @@ export class SchemasState extends State<Snapshot> {
     public deleteField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable<any> {
         return this.schemasService.deleteField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe(
             mapVersioned(() => field),
-            tap(({ payload, version }) => {
+            tap(({ version, payload }) => {
                 this.removeField(schema, payload, version, now);
             }),
             shareSubscribed(this.dialogs));
diff --git a/src/Squidex/package-lock.json b/src/Squidex/package-lock.json
index 2aa19ca66..12d349d08 100644
--- a/src/Squidex/package-lock.json
+++ b/src/Squidex/package-lock.json
@@ -5,12 +5,12 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/core": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz",
-      "integrity": "sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
+      "integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
       "dev": true,
       "requires": {
-        "ajv": "6.9.1",
+        "ajv": "6.7.0",
         "chokidar": "2.0.4",
         "fast-json-stable-stringify": "2.0.0",
         "rxjs": "6.3.3",
@@ -18,9 +18,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
+          "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -409,38 +409,38 @@
       }
     },
     "@angular/animations": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.14.tgz",
-      "integrity": "sha512-K+wdq7TslmvDhrbwy65x7owE8wezI0fDdO+8SO9RU4m/w6R6vo4QS3uSdc5I2pxwm4QSXSc5eKhoWJkq0muTbQ==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz",
+      "integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/common": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.14.tgz",
-      "integrity": "sha512-c2QBhVpbQhg1FDhOQkyVdFvU11mfvYHW5ZaXzxdCpq2rZXCureYiCSnlv++EsIAKqi22+2a6GACHF9Gh8kBmSg==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz",
+      "integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.14.tgz",
-      "integrity": "sha512-Idhs+5HIzx+1+hrXIDaRpSqobMB7UvSvPlvCvtb3EDYjmltTNG68TtwMzGM8W2jdayliYuFOjFrnw1wCTkK3Ag==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz",
+      "integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.14.tgz",
-      "integrity": "sha512-w5qn1nIPjiCP3WdbqicofpKpiRlh6NMYjWhe6mJysSBnVd34aSuGisYW/gVPQrmD46E1gmfpWTnWPeABVnjj6w==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz",
+      "integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
-        "chokidar": "^2.1.1",
+        "chokidar": "^1.4.2",
         "convert-source-map": "^1.5.1",
         "dependency-graph": "^0.7.2",
         "magic-string": "^0.25.0",
@@ -450,977 +450,52 @@
         "source-map": "^0.6.1",
         "tslib": "^1.9.0",
         "yargs": "9.0.1"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-          "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.8",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.8.tgz",
-          "integrity": "sha512-tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "nan": "^2.12.1",
-            "node-pre-gyp": "^0.12.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            },
-            "deep-extend": {
-              "version": "0.6.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "1.2.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "7.1.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "has-unicode": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.4.24",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-              }
-            },
-            "ignore-walk": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minipass": {
-              "version": "2.3.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.2.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "2.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.3.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "debug": "^4.1.0",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
-            "node-pre-gyp": {
-              "version": "0.12.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.1",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.2.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "1.0.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.4.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              }
-            },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
-                  "dev": true,
-                  "optional": true
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.1.3"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.7.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-json-comments": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "string-width": "^1.0.2 || 2"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "nan": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
-          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==",
-          "dev": true,
-          "optional": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        }
       }
     },
     "@angular/core": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.14.tgz",
-      "integrity": "sha512-XeZZJCyBKSKo0E/7Ef0SfJejmn+E7uBXa5cR1QapafS0Hnrq/hZu/NI039IDU/51NoycMDH2vTV19SmKu9Mkow==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz",
+      "integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/forms": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.14.tgz",
-      "integrity": "sha512-jL5YbTk7VZmz4l0++iFVUNa1vGM+nnALjHKi1Ub8VWioRDRboYUsHyxzlgWW9gZRbHpnLEXFiUz1td+v7TouJw==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz",
+      "integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/http": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.14.tgz",
-      "integrity": "sha512-rSdH2JojApDU83qVm7RabIlNo3Ni3yr2gwsmQWs4XZ7SC8jLNnDkzdUbQ6T0vfuVX3v/FtAuMJl0yaVcG3EUJg==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz",
+      "integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.14.tgz",
-      "integrity": "sha512-yAq2+3W4J4B48HEmZYQucdEb9AHwRnv72q9CC/SxU7g59vaLhl1nv7cAWGJ4XFaJTbB7aB4Y4rLffuR+Gxkn7A==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz",
+      "integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.14.tgz",
-      "integrity": "sha512-lmTCBiDRbOPtniIqBjm1n5jl1TdyQM0qWQdBcoCsKpMNS/6/RacRcQsJZApAMdWm6gIVuLgmRQzaCLkSoekfYA==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz",
+      "integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/platform-server": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.14.tgz",
-      "integrity": "sha512-ijFqRrxpbPQiAlbRtw0uKX8Qf+wWZhY5vNwV8wfP5oVziJdO7Vdtcmmw2NQxHAIHUrK7FQ5yklUxfglKa2G7SQ==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.3.tgz",
+      "integrity": "sha512-RXTFuuTlvy02YOtjWsrs8q+wnmXNW1JHueEseb8cWrgJz46ezhjuW3vwquDv1PwO5KZD2wlamZcrlbkwsdyzZw==",
       "requires": {
         "domino": "^2.1.0",
         "tslib": "^1.9.0",
@@ -1428,9 +503,9 @@
       }
     },
     "@angular/router": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.14.tgz",
-      "integrity": "sha512-uqg0SKy79voEOIOvzVbCzFDD9XOAfZWkYt01ca2qLFXMx+6jWeVQIDuXc8Dmz5udIXNK5Ae//9R+nt5UZUZrSA==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz",
+      "integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -1606,12 +681,12 @@
       }
     },
     "@ngtools/webpack": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.8.tgz",
-      "integrity": "sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz",
+      "integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "7.3.8",
+        "@angular-devkit/core": "7.3.0",
         "enhanced-resolve": "4.1.0",
         "rxjs": "6.3.3",
         "tree-kill": "1.2.1",
@@ -10642,9 +9717,9 @@
       "integrity": "sha512-5mWWBePwvEPsNd/HkdbD543Q9mPyJofL6zkNydl8/Ah3qrrvZT2DaEPbknY08OgkXpI2qUGksc01OzzVlRQ9dQ=="
     },
     "ngx-color-picker": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-7.5.0.tgz",
-      "integrity": "sha512-bTW16A3IitWUNGc3kZtE+N1r3FpmUj7uJTG80eym2nQLvsROkMntalKJDo1SQVQhh9Nh4N9C88UezdMg8fjR5Q=="
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-7.3.0.tgz",
+      "integrity": "sha512-ICFR+bGfDFqiXadv8EuKylQGKn8JwkRxor0Grx6hVQVsmvLve/Z2mCDtCMItRQXjLI+4yO3iBDf9Oi1pGuBraQ=="
     },
     "nice-try": {
       "version": "1.0.5",
@@ -12873,9 +11948,9 @@
       }
     },
     "raw-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-2.0.0.tgz",
-      "integrity": "sha512-kZnO5MoIyrojfrPWqrhFNLZemIAX8edMOCp++yC5RKxzFB3m92DqKNhKlU6+FvpOhWtvyh3jOaD7J6/9tpdIKg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+      "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
diff --git a/src/Squidex/package.json b/src/Squidex/package.json
index cb7a6c5f8..6f0c1c166 100644
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@@ -15,15 +15,15 @@
     "build:clean": "rimraf wwwroot/build"
   },
   "dependencies": {
-    "@angular/animations": "7.2.14",
-    "@angular/common": "7.2.14",
-    "@angular/core": "7.2.14",
-    "@angular/forms": "7.2.14",
-    "@angular/http": "7.2.14",
-    "@angular/platform-browser": "7.2.14",
-    "@angular/platform-browser-dynamic": "7.2.14",
-    "@angular/platform-server": "7.2.14",
-    "@angular/router": "7.2.14",
+    "@angular/animations": "7.2.3",
+    "@angular/common": "7.2.3",
+    "@angular/core": "7.2.3",
+    "@angular/forms": "7.2.3",
+    "@angular/http": "7.2.3",
+    "@angular/platform-browser": "7.2.3",
+    "@angular/platform-browser-dynamic": "7.2.3",
+    "@angular/platform-server": "7.2.3",
+    "@angular/router": "7.2.3",
     "angular2-chartjs": "0.5.1",
     "babel-polyfill": "6.26.0",
     "bootstrap": "4.3.1",
@@ -34,7 +34,7 @@
     "moment": "2.24.0",
     "mousetrap": "1.6.3",
     "ng2-dnd": "5.0.2",
-    "ngx-color-picker": "7.5.0",
+    "ngx-color-picker": "7.3.0",
     "oidc-client": "1.7.1",
     "pikaday": "1.8.0",
     "progressbar.js": "1.0.1",
@@ -47,9 +47,9 @@
     "zone.js": "0.9.0"
   },
   "devDependencies": {
-    "@angular/compiler": "7.2.14",
-    "@angular/compiler-cli": "7.2.14",
-    "@ngtools/webpack": "7.3.8",
+    "@angular/compiler": "7.2.3",
+    "@angular/compiler-cli": "7.2.3",
+    "@ngtools/webpack": "7.3.0",
     "@types/core-js": "2.5.0",
     "@types/jasmine": "3.3.12",
     "@types/marked": "0.6.5",
@@ -84,7 +84,7 @@
     "mini-css-extract-plugin": "0.6.0",
     "node-sass": "4.12.0",
     "optimize-css-assets-webpack-plugin": "5.0.1",
-    "raw-loader": "2.0.0",
+    "raw-loader": "1.0.0",
     "rimraf": "2.6.3",
     "rxjs-tslint": "0.1.7",
     "sass-lint": "1.13.1",
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs
index e21102546..1ec545b2c 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs
@@ -27,7 +27,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
 {
     public class AssetCommandMiddlewareTests : HandlerTestBase<AssetState>
     {
-        private readonly AssetQueryService assetQueryService = A.Fake<AssetQueryService>();
+        private readonly IAssetQueryService assetQueryService = A.Fake<IAssetQueryService>();
         private readonly IAssetThumbnailGenerator assetThumbnailGenerator = A.Fake<IAssetThumbnailGenerator>();
         private readonly IAssetStore assetStore = A.Fake<MemoryAssetStore>();
         private readonly ITagService tagService = A.Fake<ITagService>();
@@ -52,6 +52,9 @@ namespace Squidex.Domain.Apps.Entities.Assets
             asset = new AssetGrain(Store, tagService, A.Dummy<ISemanticLog>());
             asset.ActivateAsync(Id).Wait();
 
+            A.CallTo(() => assetQueryService.QueryByHashAsync(AppId, A<string>.Ignored))
+                .Returns(new List<IAssetEntity>());
+
             A.CallTo(() => tagService.NormalizeTagsAsync(AppId, TagGroups.Assets, A<HashSet<string>>.Ignored, A<HashSet<string>>.Ignored))
                 .Returns(new Dictionary<string, string>());
 
@@ -202,8 +205,8 @@ namespace Squidex.Domain.Apps.Entities.Assets
             A.CallTo(() => temp.FileName).Returns(fileName);
             A.CallTo(() => temp.FileSize).Returns(fileSize);
 
-            A.CallTo(() => assetQueryService.FindAssetByHashAsync(A<Guid>.Ignored, A<string>.Ignored))
-                .Returns(existing);
+            A.CallTo(() => assetQueryService.QueryByHashAsync(A<Guid>.Ignored, A<string>.Ignored))
+                .Returns(new List<IAssetEntity> { existing });
         }
 
         private void SetupImageInfo()
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs
index 308faf158..a9796bd40 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetQueryServiceTests.cs
@@ -70,12 +70,12 @@ namespace Squidex.Domain.Apps.Entities.Assets
         {
             var id = Guid.NewGuid();
 
-            A.CallTo(() => assetRepository.FindAssetByHashAsync(appId.Id, "hash"))
-                .Returns(CreateAsset(id, "id1", "id2", "id3"));
+            A.CallTo(() => assetRepository.QueryByHashAsync(appId.Id, "hash"))
+                .Returns(new List<IAssetEntity> { CreateAsset(id, "id1", "id2", "id3") });
 
-            var result = await sut.FindAssetByHashAsync(appId.Id, "hash");
+            var result = await sut.QueryByHashAsync(appId.Id, "hash");
 
-            Assert.Equal(HashSet.Of("name1", "name2", "name3"), result.Tags);
+            Assert.Equal(HashSet.Of("name1", "name2", "name3"), result[0].Tags);
         }
 
         [Fact]
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs
index 5ce16495d..fd501cf93 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs
@@ -51,6 +51,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                     sourceUrl
                     mimeType
                     fileName
+                    fileHash
                     fileSize
                     fileVersion
                     isImage
@@ -86,6 +87,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                             sourceUrl = $"assets/source/{asset.Id}",
                             mimeType = "image/png",
                             fileName = "MyFile.png",
+                            fileHash = "ABC123",
                             fileSize = 1024,
                             fileVersion = 123,
                             isImage = true,
@@ -119,6 +121,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                       sourceUrl
                       mimeType
                       fileName
+                      fileHash
                       fileSize
                       fileVersion
                       isImage
@@ -158,6 +161,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                                 sourceUrl = $"assets/source/{asset.Id}",
                                 mimeType = "image/png",
                                 fileName = "MyFile.png",
+                                fileHash = "ABC123",
                                 fileSize = 1024,
                                 fileVersion = 123,
                                 isImage = true,
@@ -193,6 +197,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                     sourceUrl
                     mimeType
                     fileName
+                    fileHash
                     fileSize
                     fileVersion
                     isImage
@@ -224,6 +229,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                         sourceUrl = $"assets/source/{asset.Id}",
                         mimeType = "image/png",
                         fileName = "MyFile.png",
+                        fileHash = "ABC123",
                         fileSize = 1024,
                         fileVersion = 123,
                         isImage = true,
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs
index fb1ea1376..40d612c10 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs
@@ -172,6 +172,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL
                 FileName = "MyFile.png",
                 Slug = "myfile.png",
                 FileSize = 1024,
+                FileHash = "ABC123",
                 FileVersion = 123,
                 MimeType = "image/png",
                 IsImage = true,