Optimised import
Merge branch 'feature/image-downloader' into develop

* feature/image-downloader:
  Optimised import