From a5de53f93debf86bcd80b082ce255abf6ee31028 Mon Sep 17 00:00:00 2001
From: ThibaultBee <ThibaultBee@users.noreply.github.com>
Date: Tue, 6 Dec 2022 10:43:53 +0000
Subject: [PATCH] Feature/ios task cancellation

---
 .openapi-generator/FILES                      |   8 +-
 .../Controller/UploaderViewController.swift   |  24 +-
 README.md                                     |  18 +-
 Sources/APIs.swift                            |  19 +-
 Sources/APIs/AuthenticationAPI.swift          |   4 +-
 Sources/APIs/CaptionsAPI.swift                |  10 +-
 Sources/APIs/ChaptersAPI.swift                |   8 +-
 Sources/APIs/LiveStreamsAPI.swift             |  14 +-
 Sources/APIs/PlayerThemesAPI.swift            |  14 +-
 Sources/APIs/RawStatisticsAPI.swift           |   6 +-
 Sources/APIs/UploadTokensAPI.swift            |   8 +-
 Sources/APIs/VideosAPI.swift                  | 263 +++++++-----------
 Sources/APIs/WatermarksAPI.swift              |   6 +-
 Sources/APIs/WebhooksAPI.swift                |   8 +-
 Sources/AlamofireImplementations.swift        |  16 +-
 Sources/Extensions.swift                      |  16 ++
 Sources/Models.swift                          |  35 +++
 Sources/Upload/ChunkInputStream.swift         |  49 ----
 Sources/Upload/FileChunkInputStream.swift     |  69 +++++
 Sources/Upload/FileChunksBuilder.swift        |  23 --
 Sources/Upload/FileReaders.swift              |  82 ------
 .../ProgressiveUploadSessionProtocol.swift    |  12 +
 .../Upload/ProgressiveUploadSessioning.swift  |   9 -
 Sources/Upload/RequestTaskQueue.swift         | 102 +++++++
 .../Upload/UploadChunkRequestTaskQueue.swift  | 118 ++++++++
 .../Integration/VideosApiTests.swift          |  36 ++-
 26 files changed, 566 insertions(+), 411 deletions(-)
 delete mode 100644 Sources/Upload/ChunkInputStream.swift
 create mode 100644 Sources/Upload/FileChunkInputStream.swift
 delete mode 100644 Sources/Upload/FileChunksBuilder.swift
 delete mode 100644 Sources/Upload/FileReaders.swift
 create mode 100644 Sources/Upload/ProgressiveUploadSessionProtocol.swift
 delete mode 100644 Sources/Upload/ProgressiveUploadSessioning.swift
 create mode 100644 Sources/Upload/RequestTaskQueue.swift
 create mode 100644 Sources/Upload/UploadChunkRequestTaskQueue.swift

diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
index f59fb3e..3a2ac86 100644
--- a/.openapi-generator/FILES
+++ b/.openapi-generator/FILES
@@ -95,10 +95,10 @@ Sources/Models/WebhooksCreationPayload.swift
 Sources/Models/WebhooksListResponse.swift
 Sources/OpenISO8601DateFormatter.swift
 Sources/SynchronizedDictionary.swift
-Sources/Upload/ChunkInputStream.swift
-Sources/Upload/FileChunksBuilder.swift
-Sources/Upload/FileReaders.swift
-Sources/Upload/ProgressiveUploadSessioning.swift
+Sources/Upload/FileChunkInputStream.swift
+Sources/Upload/ProgressiveUploadSessionProtocol.swift
+Sources/Upload/RequestTaskQueue.swift
+Sources/Upload/UploadChunkRequestTaskQueue.swift
 docs/AccessToken.md
 docs/AuthenticatePayload.md
 docs/AuthenticationAPI.md
diff --git a/Example/Example/Controller/UploaderViewController.swift b/Example/Example/Controller/UploaderViewController.swift
index f28e74f..99864af 100644
--- a/Example/Example/Controller/UploaderViewController.swift
+++ b/Example/Example/Controller/UploaderViewController.swift
@@ -194,18 +194,22 @@ class UploaderViewController: UIViewController, UIImagePickerControllerDelegate,
     func upload(url: URL) {
         VideosAPI.create(videoCreationPayload: VideoCreationPayload(title: "my video")) { video, error in
             if let video = video {
-                VideosAPI.upload(
-                    videoId: video.videoId,
-                    file: url,
-                    onProgressReady: { progress in
-                        print("Progress: \(progress)")
-                    }) { video, error in
+                do {
+                    try VideosAPI.upload(
+                            videoId: video.videoId,
+                            file: url,
+                            onProgressReady: { progress in
+                                print("Progress: \(progress)")
+                            }) { video, error in
                         if video != nil {
-                        self.thumbnailImageView.image = nil
-                    }
-                    if let error = error {
-                        print("Upload error: \(error)")
+                            self.thumbnailImageView.image = nil
+                        }
+                        if let error = error {
+                            print("Upload error: \(error)")
+                        }
                     }
+                } catch {
+                    print("Upload error: \(error)")
                 }
             }
             if let error = error {
diff --git a/README.md b/README.md
index 99789ab..dc3d510 100644
--- a/README.md
+++ b/README.md
@@ -67,14 +67,18 @@ import ApiVideoClient
 
     VideosAPI.create(videoCreationPayload: VideoCreationPayload(title: "my video")) { video, error in
     if let video = video {
-        VideosAPI.upload(videoId: video.videoId,
-                         file: url) { video, error in
-            if let video = video {
-                // Manage upload success here
-            }
-            if let error = error {
-                // Manage upload error here
+        do {
+            try VideosAPI.upload(videoId: video.videoId,
+                             file: url) { video, error in
+                if let video = video {
+                    // Manage upload success here
+                }
+                if let error = error {
+                    // Manage upload error here
+                }
             }
+        } catch {
+            // Manage error on file here
         }
     }
     if let error = error {
diff --git a/Sources/APIs.swift b/Sources/APIs.swift
index a80d68f..ab61cae 100644
--- a/Sources/APIs.swift
+++ b/Sources/APIs.swift
@@ -5,11 +5,6 @@
 //
 
 import Foundation
-enum ApiVideoClientError: Error {
-    case invalidName
-    case invalidVersion
-}
-
 public class ApiVideoClient {
     public static var apiKey: String? = nil
     public static var basePath = "https://ws.api.video"
@@ -18,6 +13,7 @@ public class ApiVideoClient {
     internal static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
     internal static var credential = ApiVideoCredential()
     public static var apiResponseQueue: DispatchQueue = .main
+    public static var timeout: TimeInterval = 60
 
     public static func setChunkSize(chunkSize: Int) throws {
         if (chunkSize > 128 * 1024 * 1024) {
@@ -56,11 +52,11 @@ public class ApiVideoClient {
 
     static func setName(key: String, name: String, version: String) throws {
         if(!isValidName(name: name)) {
-            throw ApiVideoClientError.invalidName
+            throw ParameterError.invalidName
         }
  
         if(!isValidVersion(version: version)) {
-            throw ApiVideoClientError.invalidVersion
+            throw ParameterError.invalidVersion
         }
         ApiVideoClient.customHeaders[key] = name + ":" + version
     }
@@ -77,12 +73,13 @@ public class ApiVideoClient {
 
 open class RequestBuilder<T> {
     var headers: [String: String]
-    public let parameters: [String: Any]?
+    public var parameters: [String: Any]?
     public let method: String
     public let URLString: String
+    public let requestTask: RequestTask = RequestTask()
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public let onProgressReady: ((Progress) -> Void)?
+    public var onProgressReady: ((Progress) -> Void)?
 
     required public init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], onProgressReady: ((Progress) -> Void)? = nil) {
         self.method = method
@@ -101,8 +98,8 @@ open class RequestBuilder<T> {
     }
 
     @discardableResult
-    open func execute(_ apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) -> URLSessionTask? {
-        return nil
+    open func execute(_ apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) -> RequestTask {
+        return requestTask
     }
 
     public func addHeader(name: String, value: String) -> Self {
diff --git a/Sources/APIs/AuthenticationAPI.swift b/Sources/APIs/AuthenticationAPI.swift
index e09d88c..b84d3d4 100644
--- a/Sources/APIs/AuthenticationAPI.swift
+++ b/Sources/APIs/AuthenticationAPI.swift
@@ -20,7 +20,7 @@ open class AuthenticationAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func authenticate(authenticatePayload: AuthenticatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: AccessToken?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func authenticate(authenticatePayload: AuthenticatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: AccessToken?, _ error: Error?) -> Void)) -> RequestTask {
             return authenticateWithRequestBuilder(authenticatePayload: authenticatePayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -66,7 +66,7 @@ open class AuthenticationAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func refresh(refreshTokenPayload: RefreshTokenPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: AccessToken?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func refresh(refreshTokenPayload: RefreshTokenPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: AccessToken?, _ error: Error?) -> Void)) -> RequestTask {
             return refreshWithRequestBuilder(refreshTokenPayload: refreshTokenPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/CaptionsAPI.swift b/Sources/APIs/CaptionsAPI.swift
index 1d290a6..901c709 100644
--- a/Sources/APIs/CaptionsAPI.swift
+++ b/Sources/APIs/CaptionsAPI.swift
@@ -22,7 +22,7 @@ open class CaptionsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func upload(videoId: String, language: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Caption?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func upload(videoId: String, language: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Caption?, _ error: Error?) -> Void)) -> RequestTask {
             return uploadWithRequestBuilder(videoId: videoId, language: language, file: file).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -81,7 +81,7 @@ open class CaptionsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func get(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Caption?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func get(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Caption?, _ error: Error?) -> Void)) -> RequestTask {
             return getWithRequestBuilder(videoId: videoId, language: language).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -138,7 +138,7 @@ Tutorials that use the [captions endpoint](https://api.video/blog/endpoints/capt
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func update(videoId: String, language: String, captionsUpdatePayload: CaptionsUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Caption?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func update(videoId: String, language: String, captionsUpdatePayload: CaptionsUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Caption?, _ error: Error?) -> Void)) -> RequestTask {
             return updateWithRequestBuilder(videoId: videoId, language: language, captionsUpdatePayload: captionsUpdatePayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -193,7 +193,7 @@ Tutorials that use the [captions endpoint](https://api.video/blog/endpoints/capt
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(videoId: videoId, language: language).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -248,7 +248,7 @@ Tutorials that use the [captions endpoint](https://api.video/blog/endpoints/capt
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(videoId: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: CaptionsListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(videoId: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: CaptionsListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(videoId: videoId, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/ChaptersAPI.swift b/Sources/APIs/ChaptersAPI.swift
index 42c1476..a631da4 100644
--- a/Sources/APIs/ChaptersAPI.swift
+++ b/Sources/APIs/ChaptersAPI.swift
@@ -22,7 +22,7 @@ open class ChaptersAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func upload(videoId: String, language: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Chapter?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func upload(videoId: String, language: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Chapter?, _ error: Error?) -> Void)) -> RequestTask {
             return uploadWithRequestBuilder(videoId: videoId, language: language, file: file).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -81,7 +81,7 @@ open class ChaptersAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func get(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Chapter?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func get(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Chapter?, _ error: Error?) -> Void)) -> RequestTask {
             return getWithRequestBuilder(videoId: videoId, language: language).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -135,7 +135,7 @@ open class ChaptersAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(videoId: String, language: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(videoId: videoId, language: language).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -190,7 +190,7 @@ open class ChaptersAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(videoId: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: ChaptersListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(videoId: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: ChaptersListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(videoId: videoId, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/LiveStreamsAPI.swift b/Sources/APIs/LiveStreamsAPI.swift
index 7183d2d..fb066fd 100644
--- a/Sources/APIs/LiveStreamsAPI.swift
+++ b/Sources/APIs/LiveStreamsAPI.swift
@@ -20,7 +20,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func create(liveStreamCreationPayload: LiveStreamCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func create(liveStreamCreationPayload: LiveStreamCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> RequestTask {
             return createWithRequestBuilder(liveStreamCreationPayload: liveStreamCreationPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -66,7 +66,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func get(liveStreamId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func get(liveStreamId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> RequestTask {
             return getWithRequestBuilder(liveStreamId: liveStreamId).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -116,7 +116,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func update(liveStreamId: String, liveStreamUpdatePayload: LiveStreamUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func update(liveStreamId: String, liveStreamUpdatePayload: LiveStreamUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> RequestTask {
             return updateWithRequestBuilder(liveStreamId: liveStreamId, liveStreamUpdatePayload: liveStreamUpdatePayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -166,7 +166,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(liveStreamId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(liveStreamId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(liveStreamId: liveStreamId).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -228,7 +228,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(streamKey: String? = nil, name: String? = nil, sortBy: String? = nil, sortOrder: SortOrder_list? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStreamListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(streamKey: String? = nil, name: String? = nil, sortBy: String? = nil, sortOrder: SortOrder_list? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStreamListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(streamKey: streamKey, name: name, sortBy: sortBy, sortOrder: sortOrder, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -288,7 +288,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func uploadThumbnail(liveStreamId: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func uploadThumbnail(liveStreamId: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> RequestTask {
             return uploadThumbnailWithRequestBuilder(liveStreamId: liveStreamId, file: file).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -342,7 +342,7 @@ open class LiveStreamsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func deleteThumbnail(liveStreamId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func deleteThumbnail(liveStreamId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: LiveStream?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteThumbnailWithRequestBuilder(liveStreamId: liveStreamId).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/PlayerThemesAPI.swift b/Sources/APIs/PlayerThemesAPI.swift
index e3ad841..a2d0255 100644
--- a/Sources/APIs/PlayerThemesAPI.swift
+++ b/Sources/APIs/PlayerThemesAPI.swift
@@ -20,7 +20,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func create(playerThemeCreationPayload: PlayerThemeCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func create(playerThemeCreationPayload: PlayerThemeCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> RequestTask {
             return createWithRequestBuilder(playerThemeCreationPayload: playerThemeCreationPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -66,7 +66,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func get(playerId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func get(playerId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> RequestTask {
             return getWithRequestBuilder(playerId: playerId).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -116,7 +116,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func update(playerId: String, playerThemeUpdatePayload: PlayerThemeUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func update(playerId: String, playerThemeUpdatePayload: PlayerThemeUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> RequestTask {
             return updateWithRequestBuilder(playerId: playerId, playerThemeUpdatePayload: playerThemeUpdatePayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -166,7 +166,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(playerId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(playerId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(playerId: playerId).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -235,7 +235,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(sortBy: SortBy_list? = nil, sortOrder: SortOrder_list? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerThemesListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(sortBy: SortBy_list? = nil, sortOrder: SortOrder_list? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerThemesListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(sortBy: sortBy, sortOrder: sortOrder, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -292,7 +292,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func uploadLogo(playerId: String, file: URL, link: String? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func uploadLogo(playerId: String, file: URL, link: String? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: PlayerTheme?, _ error: Error?) -> Void)) -> RequestTask {
             return uploadLogoWithRequestBuilder(playerId: playerId, file: file, link: link).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -348,7 +348,7 @@ open class PlayerThemesAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func deleteLogo(playerId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func deleteLogo(playerId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteLogoWithRequestBuilder(playerId: playerId).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
diff --git a/Sources/APIs/RawStatisticsAPI.swift b/Sources/APIs/RawStatisticsAPI.swift
index edb27bd..d0638ad 100644
--- a/Sources/APIs/RawStatisticsAPI.swift
+++ b/Sources/APIs/RawStatisticsAPI.swift
@@ -23,7 +23,7 @@ open class RawStatisticsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func listLiveStreamSessions(liveStreamId: String, period: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: RawStatisticsListLiveStreamAnalyticsResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func listLiveStreamSessions(liveStreamId: String, period: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: RawStatisticsListLiveStreamAnalyticsResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listLiveStreamSessionsWithRequestBuilder(liveStreamId: liveStreamId, period: period, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -81,7 +81,7 @@ open class RawStatisticsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func listSessionEvents(sessionId: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: RawStatisticsListPlayerSessionEventsResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func listSessionEvents(sessionId: String, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: RawStatisticsListPlayerSessionEventsResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listSessionEventsWithRequestBuilder(sessionId: sessionId, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -140,7 +140,7 @@ open class RawStatisticsAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func listVideoSessions(videoId: String, period: String, metadata: [String: String]? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: RawStatisticsListSessionsResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func listVideoSessions(videoId: String, period: String, metadata: [String: String]? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: RawStatisticsListSessionsResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listVideoSessionsWithRequestBuilder(videoId: videoId, period: period, metadata: metadata, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/UploadTokensAPI.swift b/Sources/APIs/UploadTokensAPI.swift
index f67ba7c..16b4723 100644
--- a/Sources/APIs/UploadTokensAPI.swift
+++ b/Sources/APIs/UploadTokensAPI.swift
@@ -20,7 +20,7 @@ open class UploadTokensAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func createToken(tokenCreationPayload: TokenCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: UploadToken?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func createToken(tokenCreationPayload: TokenCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: UploadToken?, _ error: Error?) -> Void)) -> RequestTask {
             return createTokenWithRequestBuilder(tokenCreationPayload: tokenCreationPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -66,7 +66,7 @@ open class UploadTokensAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func getToken(uploadToken: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: UploadToken?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func getToken(uploadToken: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: UploadToken?, _ error: Error?) -> Void)) -> RequestTask {
             return getTokenWithRequestBuilder(uploadToken: uploadToken).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -115,7 +115,7 @@ open class UploadTokensAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func deleteToken(uploadToken: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func deleteToken(uploadToken: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteTokenWithRequestBuilder(uploadToken: uploadToken).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -183,7 +183,7 @@ open class UploadTokensAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(sortBy: SortBy_list? = nil, sortOrder: SortOrder_list? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: TokenListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(sortBy: SortBy_list? = nil, sortOrder: SortOrder_list? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: TokenListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(sortBy: sortBy, sortOrder: sortOrder, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/VideosAPI.swift b/Sources/APIs/VideosAPI.swift
index ac9c61a..383aab8 100644
--- a/Sources/APIs/VideosAPI.swift
+++ b/Sources/APIs/VideosAPI.swift
@@ -20,7 +20,7 @@ open class VideosAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func create(videoCreationPayload: VideoCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func create(videoCreationPayload: VideoCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
             return createWithRequestBuilder(videoCreationPayload: videoCreationPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -68,15 +68,10 @@ open class VideosAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func upload(videoId: String, file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-        let fileReader: FileChunksReader
-        do {
-            fileReader = try FileChunksReader(fileURL: file.encodeToJSON() as! URL)
-        } catch {
-            completion(nil, error)
-            return nil
-        }
-        if (fileReader.getTotalNumberOfChunks() == 1) {
+    open class func upload(videoId: String, file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask {
+        if (try file.isMultiChunk) {
+            return try UploadChunkRequestTaskQueue(videoId: videoId, file: file, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        } else {
             return uploadWithRequestBuilder(videoId: videoId, file: file, onProgressReady: onProgressReady).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -85,33 +80,6 @@ open class VideosAPI {
                     completion(nil, error)
                 }
             }
-        } else {
-            return upload(videoId: videoId, file: fileReader, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
-        }
-    }
-
-    /**
-     Upload a video
-     
-     - parameter videoId: (path) Enter the videoId you want to use to upload your video. 
-     - parameter file: (form) The reader that constains file chunks 
-     - parameter onProgressReady: progress handler to receive request progress.
-     - parameter apiResponseQueue: The queue on which api response is dispatched.
-     - parameter completion: completion handler to receive the data and the error objects.
-     */
-    @discardableResult
-    private class func upload(videoId: String, file: ChunksReader, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-        return uploadWithRequestBuilder(videoId: videoId, file: file, onProgressReady: onProgressReady).execute(apiResponseQueue) { result in
-            switch result {
-            case let .success(response):
-                if (file.remainingNumberOfChunks == 0) {
-                    completion(response.body, nil)
-                } else {
-                    upload(videoId: videoId, file: file, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
-                }
-            case let .failure(error):
-                completion(nil, error)
-            }
         }
     }
 
@@ -120,36 +88,48 @@ open class VideosAPI {
      *
      * - returns: a progressive upload session
      */
-    open class func buildProgressiveUploadSession(videoId: String) -> ProgressiveUploadSession {
-        return ProgressiveUploadSession(videoId: videoId)
+    public class func buildProgressiveUploadSession(videoId: String) -> ProgressiveUploadSession {
+        ProgressiveUploadSession(videoId: videoId)
     }
    
-    open class ProgressiveUploadSession: ProgressiveUploadSessioning {
+    public class ProgressiveUploadSession: RequestTaskQueue<Video>, ProgressiveUploadSessionProtocol {
         private var partId = 1
-        private var fileReader = FilePartsReader()
         
-        private var videoId: String
+        private let videoId: String
 
         public init(videoId: String) {
             self.videoId = videoId
+            super.init(queueLabel: videoId)
         }
         
-        public func uploadPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-            return uploadPart(file: file, isLastPart: false, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        public func uploadPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            let chunkId = partId
+            partId += 1
+            return uploadPart(file: file, partId: chunkId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
         }
         
-        public func uploadLastPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-            return uploadPart(file: file, isLastPart: true, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        public func uploadLastPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            let chunkId = partId
+            partId += 1
+            return uploadLastPart(file: file, partId: chunkId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
         }
-        
-        private func uploadPart(file: URL, isLastPart: Bool, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-            do {
-                try fileReader.append(fileURL: file, isLastPart: isLastPart)
-            } catch {
-                completion(nil, error)
-                return nil
+
+        public func uploadPart(file: URL, partId: Int, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            uploadPart(file: file, partId: partId, isLastPart: false, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        }
+
+        public func uploadLastPart(file: URL, partId: Int, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            uploadPart(file: file, partId: partId, isLastPart: true, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        }
+
+        public func uploadPart(file: URL, partId: Int, isLastPart: Bool, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            var numOfChunks: Int? = nil
+            if (isLastPart) {
+                numOfChunks = partId
             }
-            return upload(videoId: self.videoId, file: fileReader, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+            let requestBuilder = uploadWithRequestBuilder(videoId: videoId, file: file, chunkId: partId, numOfChunks: numOfChunks, onProgressReady: onProgressReady)
+            execute(requestBuilder, apiResponseQueue: apiResponseQueue, completion: completion)
+            return requestBuilder.requestTask
         }
     }
 
@@ -179,10 +159,12 @@ The latter allows you to split a video source into X chunks and send those chunk
 
      - parameter videoId: (path) Enter the videoId you want to use to upload your video. 
      - parameter file: (form) The path to the video you would like to upload. The path must be local. If you want to use a video from an online source, you must use the \\\&quot;/videos\\\&quot; endpoint and add the \\\&quot;source\\\&quot; parameter when you create a new video. 
+     - parameter chunkId: chunk or part id. If nil, it is not add to the request.
+     - parameter numOfChunks: total number of chunks or parts. If nil, it is not add to the request. In case, it is not nil, chunkId must not be nil.
      - parameter onProgressReady: progress handler to receive request progress.
      - returns: RequestBuilder<Video> 
      */
-    open class func uploadWithRequestBuilder(videoId: String, file: URL, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
+    open class func uploadWithRequestBuilder(videoId: String, file: URL, chunkId: Int? = nil, numOfChunks: Int? = nil, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
         var localVariablePath = "/videos/{videoId}/source"
         let videoIdPreEscape = "\(APIHelper.mapValueToPathItem(videoId))"
         let videoIdPostEscape = videoIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
@@ -196,10 +178,14 @@ The latter allows you to split a video source into X chunks and send those chunk
 
         let localVariableUrlComponents = URLComponents(string: localVariableURLString)
 
-        let localVariableNillableHeaders: [String: Any?] = [
+        var localVariableNillableHeaders: [String: Any?] = [
             "Content-Type": "multipart/form-data",
         ]
 
+        if let chunkId = chunkId {
+            localVariableNillableHeaders["Content-Range"] = "part \(chunkId)/" + (numOfChunks != nil ? "\(numOfChunks!)" : "*")
+        }
+
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
         let localVariableRequestBuilder: RequestBuilder<Video>.Type = ApiVideoClient.requestBuilderFactory.getBuilder()
@@ -231,23 +217,21 @@ The latter allows you to split a video source into X chunks and send those chunk
 
      - parameter videoId: (path) Enter the videoId you want to use to upload your video. 
      - parameter file: (form) The path to the video you would like to upload. The path must be local. If you want to use a video from an online source, you must use the \\\&quot;/videos\\\&quot; endpoint and add the \\\&quot;source\\\&quot; parameter when you create a new video. 
+     - parameter chunkId: chunk or part id. If nil, it is not add to the request.
+     - parameter numOfChunks: total number of chunks or parts. If nil, it is not add to the request. In case, it is not nil, chunkId must not be nil.
      - parameter onProgressReady: progress handler to receive request progress.
      - returns: RequestBuilder<Video> 
      */
-    private class func uploadWithRequestBuilder(videoId: String, file: ChunksReader, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
+    open class func uploadWithRequestBuilder(videoId: String, file: FileChunkInputStream, chunkId: Int? = nil, numOfChunks: Int? = nil, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
         var localVariablePath = "/videos/{videoId}/source"
         let videoIdPreEscape = "\(APIHelper.mapValueToPathItem(videoId))"
         let videoIdPostEscape = videoIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         localVariablePath = localVariablePath.replacingOccurrences(of: "{videoId}", with: videoIdPostEscape, options: .literal, range: nil)
         let localVariableURLString = ApiVideoClient.basePath + localVariablePath
-        let nextChunk = file.getNextChunk()
         let localVariableFormParams: [String: Any?] = [
-            "file": nextChunk.chunk
+            "file": file
         ]
 
-        let chunkId = nextChunk.index
-        let totalNumberOfChunks: Int? = file.getTotalNumberOfChunks()
-
         let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams)
         let localVariableParameters = APIHelper.convertBoolToString(localVariableNonNullParameters)
 
@@ -256,22 +240,15 @@ The latter allows you to split a video source into X chunks and send those chunk
         var localVariableNillableHeaders: [String: Any?] = [
             "Content-Type": "multipart/form-data",
         ]
-        localVariableNillableHeaders["Content-Range"] = "part \(chunkId)/" +  (totalNumberOfChunks != nil ? "\(totalNumberOfChunks!)" : "*")
+        if let chunkId = chunkId {
+            localVariableNillableHeaders["Content-Range"] = "part \(chunkId)/" + (numOfChunks != nil ? "\(numOfChunks!)" : "*")
+        }
 
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
         let localVariableRequestBuilder: RequestBuilder<Video>.Type = ApiVideoClient.requestBuilderFactory.getBuilder()
 
-        return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, onProgressReady: { progress in
-            if let fileSize = file.fileSize {
-                let diff = progress.totalUnitCount - Int64(nextChunk.chunk.maxSize)
-                progress.totalUnitCount = fileSize
-                progress.completedUnitCount = Int64((chunkId - 1) * ApiVideoClient.getChunkSize()) + progress.completedUnitCount - diff
-            }
-            if let onProgressReady = onProgressReady {
-                onProgressReady(progress)
-            }
-        })
+        return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, onProgressReady: onProgressReady)
     }
 
     /**
@@ -284,15 +261,10 @@ The latter allows you to split a video source into X chunks and send those chunk
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func uploadWithUploadToken(token: String, file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-        let fileReader: FileChunksReader
-        do {
-            fileReader = try FileChunksReader(fileURL: file.encodeToJSON() as! URL)
-        } catch {
-            completion(nil, error)
-            return nil
-        }
-        if (fileReader.getTotalNumberOfChunks() == 1) {
+    open class func uploadWithUploadToken(token: String, file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask {
+        if (try file.isMultiChunk) {
+            return try UploadChunkRequestTaskQueue(token: token, file: file, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        } else {
             return uploadWithUploadTokenWithRequestBuilder(token: token, file: file, onProgressReady: onProgressReady).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -301,33 +273,6 @@ The latter allows you to split a video source into X chunks and send those chunk
                     completion(nil, error)
                 }
             }
-        } else {
-            return uploadWithUploadToken(token: token, file: fileReader, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
-        }
-    }
-
-    /**
-     Upload with an upload token
-     
-     - parameter token: (query) The unique identifier for the token you want to use to upload a video. 
-     - parameter file: (form) The reader that constains file chunks 
-     - parameter onProgressReady: progress handler to receive request progress.
-     - parameter apiResponseQueue: The queue on which api response is dispatched.
-     - parameter completion: completion handler to receive the data and the error objects.
-     */
-    @discardableResult
-    private class func uploadWithUploadToken(token: String, file: ChunksReader, videoId: String? = nil, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-        return uploadWithUploadTokenWithRequestBuilder(token: token, file: file, videoId: videoId, onProgressReady: onProgressReady).execute(apiResponseQueue) { result in
-            switch result {
-            case let .success(response):
-                if (file.remainingNumberOfChunks == 0) {
-                    completion(response.body, nil)
-                } else {
-                    uploadWithUploadToken(token: token, file: file, videoId: response.body.videoId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
-                }
-            case let .failure(error):
-                completion(nil, error)
-            }
         }
     }
 
@@ -336,42 +281,49 @@ The latter allows you to split a video source into X chunks and send those chunk
      *
      * - returns: a progressive uploadWithUploadToken session
      */
-    open class func buildProgressiveUploadWithUploadTokenSession(token: String) -> ProgressiveUploadWithUploadTokenSession {
-        return ProgressiveUploadWithUploadTokenSession(token: token)
+    public class func buildProgressiveUploadWithUploadTokenSession(token: String) -> ProgressiveUploadWithUploadTokenSession {
+        ProgressiveUploadWithUploadTokenSession(token: token)
     }
    
-    open class ProgressiveUploadWithUploadTokenSession: ProgressiveUploadSessioning {
+    public class ProgressiveUploadWithUploadTokenSession: RequestTaskQueue<Video>, ProgressiveUploadSessionProtocol {
         private var partId = 1
-        private var fileReader = FilePartsReader()
         private var videoId: String? = nil
         
-        private var token: String
+        private let token: String
 
         public init(token: String) {
             self.token = token
+            super.init(queueLabel: token)
         }
         
-        public func uploadPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-            return uploadPart(file: file, isLastPart: false, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        public func uploadPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            let chunkId = partId
+            partId += 1
+            return uploadPart(file: file, partId: chunkId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
         }
         
-        public func uploadLastPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-            return uploadPart(file: file, isLastPart: true, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        public func uploadLastPart(file: URL, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            let chunkId = partId
+            partId += 1
+            return uploadLastPart(file: file, partId: chunkId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
         }
-        
-        private func uploadPart(file: URL, isLastPart: Bool, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
-            do {
-                try fileReader.append(fileURL: file, isLastPart: isLastPart)
-            } catch {
-                completion(nil, error)
-                return nil
+
+        public func uploadPart(file: URL, partId: Int, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            uploadPart(file: file, partId: partId, isLastPart: false, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        }
+
+        public func uploadLastPart(file: URL, partId: Int, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            uploadPart(file: file, partId: partId, isLastPart: true, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        }
+
+        public func uploadPart(file: URL, partId: Int, isLastPart: Bool, onProgressReady: ((Progress) -> Void)? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
+            var numOfChunks: Int? = nil
+            if (isLastPart) {
+                numOfChunks = partId
             }
-            return uploadWithUploadToken(token: self.token, file: fileReader, videoId: self.videoId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: { video, error in
-                if let video = video {
-                    self.videoId = video.videoId
-                }
-                completion(video, error)
-            })
+            let requestBuilder = uploadWithUploadTokenWithRequestBuilder(token: token, file: file, videoId: videoId, chunkId: partId, numOfChunks: numOfChunks, onProgressReady: onProgressReady)
+            execute(requestBuilder, apiResponseQueue: apiResponseQueue, completion: completion)
+            return requestBuilder.requestTask
         }
     }
 
@@ -383,10 +335,12 @@ The latter allows you to split a video source into X chunks and send those chunk
      - This method allows you to send a video using an upload token. Upload tokens are especially useful when the upload is done from the client side. If you want to upload a video from your server-side application, you'd better use the [standard upload method](#upload).
      - parameter token: (query) The unique identifier for the token you want to use to upload a video. 
      - parameter file: (form) The path to the video you want to upload. 
+     - parameter chunkId: chunk or part id. If nil, it is not add to the request.
+     - parameter numOfChunks: total number of chunks or parts. If nil, it is not add to the request. In case, it is not nil, chunkId must not be nil.
      - parameter onProgressReady: progress handler to receive request progress.
      - returns: RequestBuilder<Video> 
      */
-    open class func uploadWithUploadTokenWithRequestBuilder(token: String, file: URL, videoId: String? = nil, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
+    open class func uploadWithUploadTokenWithRequestBuilder(token: String, file: URL, videoId: String? = nil, chunkId: Int? = nil, numOfChunks: Int? = nil, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
         let localVariablePath = "/upload"
         let localVariableURLString = ApiVideoClient.basePath + localVariablePath
         var localVariableFormParams: [String: Any?] = [
@@ -403,10 +357,14 @@ The latter allows you to split a video source into X chunks and send those chunk
             "token": token.encodeToJSON(),
         ])
 
-        let localVariableNillableHeaders: [String: Any?] = [
+        var localVariableNillableHeaders: [String: Any?] = [
             "Content-Type": "multipart/form-data",
         ]
 
+        if let chunkId = chunkId {
+            localVariableNillableHeaders["Content-Range"] = "part \(chunkId)/" + (numOfChunks != nil ? "\(numOfChunks!)" : "*")
+        }
+
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
         let localVariableRequestBuilder: RequestBuilder<Video>.Type = ApiVideoClient.requestBuilderFactory.getBuilder()
@@ -420,23 +378,21 @@ The latter allows you to split a video source into X chunks and send those chunk
      - This method allows you to send a video using an upload token. Upload tokens are especially useful when the upload is done from the client side. If you want to upload a video from your server-side application, you'd better use the [standard upload method](#upload).
      - parameter token: (query) The unique identifier for the token you want to use to upload a video. 
      - parameter file: (form) The path to the video you want to upload. 
+     - parameter chunkId: chunk or part id. If nil, it is not add to the request.
+     - parameter numOfChunks: total number of chunks or parts. If nil, it is not add to the request. In case, it is not nil, chunkId must not be nil.
      - parameter onProgressReady: progress handler to receive request progress.
      - returns: RequestBuilder<Video> 
      */
-    private class func uploadWithUploadTokenWithRequestBuilder(token: String, file: ChunksReader, videoId: String? = nil, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
+    open class func uploadWithUploadTokenWithRequestBuilder(token: String, file: FileChunkInputStream, videoId: String? = nil, chunkId: Int? = nil, numOfChunks: Int? = nil, onProgressReady: ((Progress) -> Void)? = nil) -> RequestBuilder<Video> {
         let localVariablePath = "/upload"
         let localVariableURLString = ApiVideoClient.basePath + localVariablePath
-        let nextChunk = file.getNextChunk()
         var localVariableFormParams: [String: Any?] = [
-            "file": nextChunk.chunk
+            "file": file
         ]
         if (videoId != nil) {
             localVariableFormParams["videoId"] = videoId
         }
 
-        let chunkId = nextChunk.index
-        let totalNumberOfChunks: Int? = file.getTotalNumberOfChunks()
-
         let localVariableNonNullParameters = APIHelper.rejectNil(localVariableFormParams)
         let localVariableParameters = APIHelper.convertBoolToString(localVariableNonNullParameters)
 
@@ -448,22 +404,15 @@ The latter allows you to split a video source into X chunks and send those chunk
         var localVariableNillableHeaders: [String: Any?] = [
             "Content-Type": "multipart/form-data",
         ]
-        localVariableNillableHeaders["Content-Range"] = "part \(chunkId)/" +  (totalNumberOfChunks != nil ? "\(totalNumberOfChunks!)" : "*")
+        if let chunkId = chunkId {
+            localVariableNillableHeaders["Content-Range"] = "part \(chunkId)/" + (numOfChunks != nil ? "\(numOfChunks!)" : "*")
+        }
 
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
         let localVariableRequestBuilder: RequestBuilder<Video>.Type = ApiVideoClient.requestBuilderFactory.getBuilder()
 
-        return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, onProgressReady: { progress in
-            if let fileSize = file.fileSize {
-                let diff = progress.totalUnitCount - Int64(nextChunk.chunk.maxSize)
-                progress.totalUnitCount = fileSize
-                progress.completedUnitCount = Int64((chunkId - 1) * ApiVideoClient.getChunkSize()) + progress.completedUnitCount - diff
-            }
-            if let onProgressReady = onProgressReady {
-                onProgressReady(progress)
-            }
-        })
+        return localVariableRequestBuilder.init(method: "POST", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, onProgressReady: onProgressReady)
     }
 
     /**
@@ -474,7 +423,7 @@ The latter allows you to split a video source into X chunks and send those chunk
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func get(videoId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func get(videoId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
             return getWithRequestBuilder(videoId: videoId).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -524,7 +473,7 @@ The latter allows you to split a video source into X chunks and send those chunk
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func update(videoId: String, videoUpdatePayload: VideoUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func update(videoId: String, videoUpdatePayload: VideoUpdatePayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
             return updateWithRequestBuilder(videoId: videoId, videoUpdatePayload: videoUpdatePayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -580,7 +529,7 @@ NOTE: If you are updating an array, you must provide the entire array as what yo
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(videoId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(videoId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(videoId: videoId).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -637,7 +586,7 @@ NOTE: If you are updating an array, you must provide the entire array as what yo
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(title: String? = nil, tags: [String]? = nil, metadata: [String: String]? = nil, description: String? = nil, liveStreamId: String? = nil, sortBy: String? = nil, sortOrder: String? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: VideosListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(title: String? = nil, tags: [String]? = nil, metadata: [String: String]? = nil, description: String? = nil, liveStreamId: String? = nil, sortBy: String? = nil, sortOrder: String? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: VideosListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(title: title, tags: tags, metadata: metadata, description: description, liveStreamId: liveStreamId, sortBy: sortBy, sortOrder: sortOrder, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -703,7 +652,7 @@ NOTE: If you are updating an array, you must provide the entire array as what yo
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func uploadThumbnail(videoId: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func uploadThumbnail(videoId: String, file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
             return uploadThumbnailWithRequestBuilder(videoId: videoId, file: file).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -770,7 +719,7 @@ Note: There may be a short delay before the new thumbnail is delivered to our CD
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func pickThumbnail(videoId: String, videoThumbnailPickPayload: VideoThumbnailPickPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func pickThumbnail(videoId: String, videoThumbnailPickPayload: VideoThumbnailPickPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> RequestTask {
             return pickThumbnailWithRequestBuilder(videoId: videoId, videoThumbnailPickPayload: videoThumbnailPickPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -830,7 +779,7 @@ There may be a short delay for the thumbnail to update.
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func getStatus(videoId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: VideoStatus?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func getStatus(videoId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: VideoStatus?, _ error: Error?) -> Void)) -> RequestTask {
             return getStatusWithRequestBuilder(videoId: videoId).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/WatermarksAPI.swift b/Sources/APIs/WatermarksAPI.swift
index a2dd40b..205b5d8 100644
--- a/Sources/APIs/WatermarksAPI.swift
+++ b/Sources/APIs/WatermarksAPI.swift
@@ -20,7 +20,7 @@ open class WatermarksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func upload(file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Watermark?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func upload(file: URL, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Watermark?, _ error: Error?) -> Void)) -> RequestTask {
             return uploadWithRequestBuilder(file: file).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -70,7 +70,7 @@ open class WatermarksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(watermarkId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(watermarkId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(watermarkId: watermarkId).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -122,7 +122,7 @@ open class WatermarksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(sortBy: String? = nil, sortOrder: String? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: WatermarksListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(sortBy: String? = nil, sortOrder: String? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: WatermarksListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(sortBy: sortBy, sortOrder: sortOrder, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/APIs/WebhooksAPI.swift b/Sources/APIs/WebhooksAPI.swift
index 53ac47c..39006db 100644
--- a/Sources/APIs/WebhooksAPI.swift
+++ b/Sources/APIs/WebhooksAPI.swift
@@ -20,7 +20,7 @@ open class WebhooksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func create(webhooksCreationPayload: WebhooksCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Webhook?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func create(webhooksCreationPayload: WebhooksCreationPayload, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Webhook?, _ error: Error?) -> Void)) -> RequestTask {
             return createWithRequestBuilder(webhooksCreationPayload: webhooksCreationPayload).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -66,7 +66,7 @@ open class WebhooksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func get(webhookId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Webhook?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func get(webhookId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Webhook?, _ error: Error?) -> Void)) -> RequestTask {
             return getWithRequestBuilder(webhookId: webhookId).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
@@ -115,7 +115,7 @@ open class WebhooksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func delete(webhookId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func delete(webhookId: String, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) -> RequestTask {
             return deleteWithRequestBuilder(webhookId: webhookId).execute(apiResponseQueue) { result in
                 switch result {
                 case .success:
@@ -166,7 +166,7 @@ open class WebhooksAPI {
      - parameter completion: completion handler to receive the data and the error objects.
      */
     @discardableResult
-    open class func list(events: String? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: WebhooksListResponse?, _ error: Error?) -> Void)) -> URLSessionTask? {
+    open class func list(events: String? = nil, currentPage: Int? = nil, pageSize: Int? = nil, apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, completion: @escaping ((_ data: WebhooksListResponse?, _ error: Error?) -> Void)) -> RequestTask {
             return listWithRequestBuilder(events: events, currentPage: currentPage, pageSize: pageSize).execute(apiResponseQueue) { result in
                 switch result {
                 case let .success(response):
diff --git a/Sources/AlamofireImplementations.swift b/Sources/AlamofireImplementations.swift
index 712f655..a064c91 100644
--- a/Sources/AlamofireImplementations.swift
+++ b/Sources/AlamofireImplementations.swift
@@ -31,6 +31,8 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      */
     open func createAlamofireSession(interceptor: RequestInterceptor? = nil) -> Alamofire.Session {
         let configuration = URLSessionConfiguration.default
+        configuration.timeoutIntervalForRequest = ApiVideoClient.timeout
+        configuration.timeoutIntervalForResource = ApiVideoClient.timeout
         configuration.httpAdditionalHeaders = buildHeaders()
         return Alamofire.Session(configuration: configuration,
                                  interceptor: interceptor)
@@ -89,7 +91,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
     }
 
     @discardableResult
-    override open func execute(_ apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) -> URLSessionTask? {
+    override open func execute(_ apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) -> RequestTask {
         let managerId = UUID().uuidString
         // Create a new manager for each request to customize its request header
         var manager: Alamofire.Session
@@ -126,10 +128,10 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                 let upload = manager.upload(multipartFormData: { mpForm in
                     for (k, v) in self.parameters! {
                         switch v {
-                        case let chunkInputStream as ChunkInputStream:
-                            let fileURL = chunkInputStream.fileURL
+                        case let chunkInputStream as FileChunkInputStream:
+                            let fileURL = chunkInputStream.file
                             let headers = self.contentHeaders(withName: k, fileName: fileURL.lastPathComponent, mimeType: "video/quicktime")
-                            mpForm.append(chunkInputStream, withLength: UInt64(chunkInputStream.maxSize), headers: headers)
+                            mpForm.append(chunkInputStream, withLength: UInt64(chunkInputStream.capacity), headers: headers)
                         case let fileURL as URL:
                             if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                                 mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
@@ -151,6 +153,8 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     }
                 }
 
+                requestTask.set(request: upload)
+
                 self.processRequest(request: upload, managerId, apiResponseQueue, completion)
             } else if contentType == "application/x-www-form-urlencoded" {
                 encoding = URLEncoding(destination: .httpBody)
@@ -168,10 +172,10 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                 onProgressReady(request.uploadProgress)
             }
             processRequest(request: request, managerId, apiResponseQueue, completion)
-            return request.task
+            requestTask.set(request: request)
         }
 
-        return nil
+        return requestTask
     }
 
     fileprivate func processRequest(request: DataRequest, _ managerId: String, _ apiResponseQueue: DispatchQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
diff --git a/Sources/Extensions.swift b/Sources/Extensions.swift
index 5831422..6e91c87 100644
--- a/Sources/Extensions.swift
+++ b/Sources/Extensions.swift
@@ -186,3 +186,19 @@ extension HTTPURLResponse {
         return (200 ..< 300).contains(statusCode)
     }
 }
+
+extension URL {
+    var fileSize: Int64 {
+        get throws {
+            guard let fileSize = try FileManager.default.attributesOfItem(atPath: path)[.size] as? NSNumber else {
+                throw ParameterError.fileSizeNotAvailable
+            }
+            return fileSize.int64Value
+        }
+    }
+    var isMultiChunk: Bool {
+        get throws {
+            try fileSize > ApiVideoClient.getChunkSize()
+        }
+    }
+}
\ No newline at end of file
diff --git a/Sources/Models.swift b/Sources/Models.swift
index 82cf614..d336adb 100644
--- a/Sources/Models.swift
+++ b/Sources/Models.swift
@@ -5,6 +5,7 @@
 //
 
 import Foundation
+import Alamofire
 
 protocol JSONEncodable {
     func encodeToJSON() -> Any
@@ -17,6 +18,10 @@ public enum ErrorResponse: Error {
 public enum ParameterError: Error {
     case outOfRange
     case IO
+    case emptyRequest
+    case fileSizeNotAvailable
+    case invalidName
+    case invalidVersion
 }
 
 public enum DownloadException: Error {
@@ -57,3 +62,33 @@ open class Response<T> {
         self.init(statusCode: response.statusCode, header: header, body: body)
     }
 }
+
+public class RequestTask {
+    private var lock = NSRecursiveLock()
+    private var request: Request?
+
+    internal func set(request: Request) {
+        lock.lock()
+        defer { lock.unlock() }
+        self.request = request
+    }
+
+    public func cancel() {
+        lock.lock()
+        defer { lock.unlock() }
+        request?.cancel()
+        request = nil
+    }
+
+    public var state: Request.State {
+        request?.state ?? .initialized
+    }
+
+    public var uploadProgress: Progress? {
+        request?.uploadProgress
+    }
+
+    public var downloadProgress: Progress? {
+        request?.downloadProgress
+    }
+}
\ No newline at end of file
diff --git a/Sources/Upload/ChunkInputStream.swift b/Sources/Upload/ChunkInputStream.swift
deleted file mode 100644
index 29caf47..0000000
--- a/Sources/Upload/ChunkInputStream.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-//  ChunkInputStream.swift
-// 
-
-import Foundation
-
-class ChunkInputStream: InputStream {
-    private let inputStream: InputStream
-    private let offset: UInt64
-    let maxSize: Int
-    private var remainingBytes: Int = 0
-    let fileURL: URL
-    
-    public init(fileURL: URL, offset: UInt64 = 0, maxSize: Int) {
-        self.inputStream = InputStream(url: fileURL)!
-        self.offset = offset
-        self.maxSize = maxSize
-        self.remainingBytes = maxSize;
-        self.fileURL = fileURL
-        
-        super.init()
-    }
-    
-    override public func open() {
-        inputStream.open()
-        inputStream.setProperty(offset, forKey: Stream.PropertyKey.fileCurrentOffsetKey)
-    }
-    
-    override public func close() {
-        inputStream.close()
-    }
-    
-    override public func read(_ buffer: UnsafeMutablePointer<UInt8>, maxLength len: Int) -> Int {
-        let bytesRead = inputStream.read(buffer, maxLength: min(len, remainingBytes))
-        remainingBytes -= bytesRead
-        return bytesRead
-    }
-        
-    override var hasBytesAvailable: Bool {
-        if (remainingBytes <= 0) {
-            return false
-        }
-        
-        return inputStream.hasBytesAvailable
-    }
-    
-    override var streamError: Error? {
-        return inputStream.streamError
-    }
-}
diff --git a/Sources/Upload/FileChunkInputStream.swift b/Sources/Upload/FileChunkInputStream.swift
new file mode 100644
index 0000000..f2a1cde
--- /dev/null
+++ b/Sources/Upload/FileChunkInputStream.swift
@@ -0,0 +1,69 @@
+//  FileChunkInputStream.swift
+//
+
+import Foundation
+
+public class FileChunkInputStream: InputStream {
+    private let inputStream: InputStream
+    private let offset: Int64
+    let capacity: Int
+    private var remainingBytes: Int = 0
+    let file: URL
+
+    public init(file: URL, offset: Int64 = 0, capacity: Int) {
+        self.inputStream = InputStream(url: file)!
+        self.offset = offset
+        self.capacity = capacity
+        self.remainingBytes = capacity;
+        self.file = file
+
+        super.init()
+    }
+
+    override public func open() {
+        inputStream.open()
+        inputStream.setProperty(offset, forKey: Stream.PropertyKey.fileCurrentOffsetKey)
+    }
+
+    override public func close() {
+        inputStream.close()
+    }
+
+    override public func read(_ buffer: UnsafeMutablePointer<UInt8>, maxLength len: Int) -> Int {
+        let bytesRead = inputStream.read(buffer, maxLength: min(len, remainingBytes))
+        remainingBytes -= bytesRead
+        return bytesRead
+    }
+
+    override public var hasBytesAvailable: Bool {
+        if (remainingBytes <= 0) {
+            return false
+        }
+
+        return inputStream.hasBytesAvailable
+    }
+
+    override public var streamError: Error? {
+        return inputStream.streamError
+    }
+}
+
+class FileChunkInputStreamsBuilder {
+    private let file: URL
+    private let fileSize: Int64
+
+    public init(file: URL) throws {
+        self.file = file
+        fileSize = try file.fileSize
+    }
+
+    public func build() -> [FileChunkInputStream] {
+        let chunkSize = ApiVideoClient.getChunkSize()
+        var chunkInputStreams: [FileChunkInputStream] = []
+        for offset in stride(from: 0, through: fileSize, by: chunkSize) {
+            chunkInputStreams.append(FileChunkInputStream(file: file, offset: offset, capacity: min(chunkSize, Int(fileSize - offset))))
+        }
+
+        return chunkInputStreams
+    }
+}
\ No newline at end of file
diff --git a/Sources/Upload/FileChunksBuilder.swift b/Sources/Upload/FileChunksBuilder.swift
deleted file mode 100644
index 708f82b..0000000
--- a/Sources/Upload/FileChunksBuilder.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-//  FileChunksBuilder.swift
-//
-
-import Foundation
-
-class FileChunksBuilder {
-    private let fileURL: URL
-    let fileSize: Int64
-
-    public init(fileURL: URL) throws {
-        self.fileURL = fileURL
-        self.fileSize = try Int64(fileURL.resourceValues(forKeys: [URLResourceKey.fileSizeKey]).fileSize!)
-    }
-
-    public func build() -> [ChunkInputStream] {
-        var chunks: [ChunkInputStream] = []
-        for offset in stride(from: UInt64(0), through: UInt64(fileSize), by: ApiVideoClient.getChunkSize()) {
-            chunks.append(ChunkInputStream(fileURL: fileURL, offset: offset, maxSize: min(ApiVideoClient.getChunkSize(), Int(UInt64(fileSize) - offset))))
-        }
-
-        return chunks
-    }
-}
diff --git a/Sources/Upload/FileReaders.swift b/Sources/Upload/FileReaders.swift
deleted file mode 100644
index d5c0bf2..0000000
--- a/Sources/Upload/FileReaders.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-//  FileReader.swift
-//
-
-import Foundation
-
-
-protocol ChunksReader {
-    var remainingNumberOfChunks: Int { get }
-    var fileSize: Int64? { get }
-    func getTotalNumberOfChunks() -> Int?
-    func getNextChunk() -> (index: Int, chunk: ChunkInputStream)
-}
-
-/**
- * Represents one file split in multiple chunks
- */
-class FileChunksReader: ChunksReader {
-    private let totalNumberOfChunks: Int
-    let fileSize: Int64?
-    private var chunks: [ChunkInputStream]
-    private var index = 1
-
-    public init(fileURL: URL) throws {
-        let fileChunksBuilder = try FileChunksBuilder(fileURL: fileURL)
-        self.fileSize = fileChunksBuilder.fileSize
-        self.chunks = fileChunksBuilder.build()
-        self.totalNumberOfChunks = self.chunks.count
-    }
-
-    var remainingNumberOfChunks: Int {
-        return chunks.count
-    }
-
-    func getTotalNumberOfChunks() -> Int? {
-        return totalNumberOfChunks
-    }
-    
-    func getNextChunk() -> (index: Int, chunk: ChunkInputStream) {
-        let tuple = (index, chunks.removeFirst())
-        index += 1
-        return tuple
-    }
-}
-
-/**
- * Represents multiple chunked files.
- */
-class FilePartsReader: ChunksReader {
-    let fileSize: Int64? = nil
-    private let totalNumberOfChunks: Int = 0
-    private var chunks: [ChunkInputStream] = []
-    private var index = 1
-    private var isLastPart = false
- 
-    var remainingNumberOfChunks: Int {
-        return 0
-    }
-    
-    func getTotalNumberOfChunks() -> Int? {
-        if (isLastPart) {
-            return index - 1
-        } else {
-            return nil
-        }
-    }
-    
-    func getNextChunk() -> (index: Int, chunk: ChunkInputStream) {
-        let tuple = (index, chunks.removeFirst())
-        index += 1
-        return tuple
-    }
-    
-    func append(fileURL: URL, isLastPart: Bool) throws {
-        if (self.isLastPart) {
-            throw ParameterError.IO
-        }
-        
-        self.isLastPart = isLastPart
-        let fileSize = try Int64(fileURL.resourceValues(forKeys: [URLResourceKey.fileSizeKey]).fileSize!)
-        chunks.append(ChunkInputStream(fileURL: fileURL, maxSize: Int(fileSize)))
-    }
-}
diff --git a/Sources/Upload/ProgressiveUploadSessionProtocol.swift b/Sources/Upload/ProgressiveUploadSessionProtocol.swift
new file mode 100644
index 0000000..ed1d141
--- /dev/null
+++ b/Sources/Upload/ProgressiveUploadSessionProtocol.swift
@@ -0,0 +1,12 @@
+//  ProgressiveUploadSessioning.swift
+//
+
+import Foundation
+
+public protocol ProgressiveUploadSessionProtocol {
+    func uploadPart(file: URL, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask
+    func uploadLastPart(file: URL, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask
+    func uploadPart(file: URL, partId: Int, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask
+    func uploadLastPart(file: URL, partId: Int, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask
+    func uploadPart(file: URL, partId: Int, isLastPart: Bool, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) throws -> RequestTask
+}
\ No newline at end of file
diff --git a/Sources/Upload/ProgressiveUploadSessioning.swift b/Sources/Upload/ProgressiveUploadSessioning.swift
deleted file mode 100644
index 4562d9f..0000000
--- a/Sources/Upload/ProgressiveUploadSessioning.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-//  ProgressiveUploadSessioning.swift
-//
-
-import Foundation
-
-public protocol ProgressiveUploadSessioning {
-    func uploadPart(file: URL, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask?
-    func uploadLastPart(file: URL, onProgressReady: ((Progress) -> Void)?, apiResponseQueue: DispatchQueue, completion: @escaping ((_ data: Video?, _ error: Error?) -> Void)) -> URLSessionTask?
-}
\ No newline at end of file
diff --git a/Sources/Upload/RequestTaskQueue.swift b/Sources/Upload/RequestTaskQueue.swift
new file mode 100644
index 0000000..6fc041e
--- /dev/null
+++ b/Sources/Upload/RequestTaskQueue.swift
@@ -0,0 +1,102 @@
+import Foundation
+import Alamofire
+
+public class RequestTaskQueue<T>: RequestTask {
+    private let operationQueue: OperationQueue
+    private let operationLock = NSLock()
+    private var requestBuilders: [RequestBuilder<T>] = []
+
+    private let _downloadProgress = Progress(totalUnitCount: 0)
+    private let _uploadProgress = Progress(totalUnitCount: 0)
+
+    internal init(queueLabel: String) {
+        operationQueue = OperationQueue()
+        operationQueue.name = "video.api.RequestQueue.\(queueLabel)"
+        operationQueue.maxConcurrentOperationCount = 1
+        super.init()
+    }
+
+    override public var uploadProgress: Progress {
+        var completedUnitCount: Int64 = 0
+        var totalUnitCount: Int64 = 0
+        requestBuilders.forEach {
+            if let progress = $0.requestTask.uploadProgress {
+                completedUnitCount += progress.completedUnitCount
+                totalUnitCount += progress.totalUnitCount
+            }
+        }
+
+        _uploadProgress.totalUnitCount = totalUnitCount
+        _uploadProgress.completedUnitCount = completedUnitCount
+        return _uploadProgress
+    }
+
+    override public var downloadProgress: Progress {
+        var completedUnitCount: Int64 = 0
+        var totalUnitCount: Int64 = 0
+        requestBuilders.forEach {
+            if let progress = $0.requestTask.downloadProgress {
+                completedUnitCount += progress.completedUnitCount
+                totalUnitCount += progress.totalUnitCount
+            }
+        }
+
+        _downloadProgress.totalUnitCount = totalUnitCount
+        _downloadProgress.completedUnitCount = completedUnitCount
+        return _downloadProgress
+    }
+
+    internal func willExecuteRequestBuilder(requestBuilder: RequestBuilder<T>) -> Void {
+    }
+
+    internal func execute(_ requestBuilder: RequestBuilder<T>,
+                          apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue,
+                          completion: @escaping (_ data: T?, _ error: Error?) -> Void) -> Void {
+        requestBuilders.append(requestBuilder)
+        return operationQueue.addOperation(RequestOperation(lock: operationLock, requestBuilder: requestBuilder, apiResponseQueue: apiResponseQueue, willExecuteRequestBuilder: willExecuteRequestBuilder, completion: completion))
+    }
+    
+
+    override public func cancel() {
+        requestBuilders.forEach {
+            $0.requestTask.cancel()
+        }
+        operationQueue.cancelAllOperations()
+    }
+}
+
+final class RequestOperation<T>: Operation {
+    private let lock: NSLock
+    private let requestBuilder: RequestBuilder<T>
+    private let apiResponseQueue: DispatchQueue
+    private let completion: (_ data: T?, _ error: Error?) -> Void
+    private let willExecuteRequestBuilder: (_: RequestBuilder<T>) -> Void
+    
+    init(lock: NSLock, requestBuilder: RequestBuilder<T>, apiResponseQueue: DispatchQueue, willExecuteRequestBuilder: @escaping (_: RequestBuilder<T>) -> Void, completion: @escaping (_ data: T?, _ error: Error?) -> Void) {
+        self.lock = lock
+        self.requestBuilder = requestBuilder
+        self.apiResponseQueue = apiResponseQueue
+        self.willExecuteRequestBuilder = willExecuteRequestBuilder
+        self.completion = completion
+        super.init()
+    }
+    
+    override func main() {
+        self.lock.lock()
+        guard !isCancelled else {
+            self.lock.unlock()
+            return
+        }
+        self.willExecuteRequestBuilder(requestBuilder)
+        requestBuilder.execute(apiResponseQueue) { result in
+            switch result {
+            case let .success(response):
+                self.completion(response.body, nil)
+            case let .failure(error):
+                self.completion(nil, error)
+            }
+            self.lock.unlock()
+        }
+
+    }
+}
diff --git a/Sources/Upload/UploadChunkRequestTaskQueue.swift b/Sources/Upload/UploadChunkRequestTaskQueue.swift
new file mode 100644
index 0000000..4e708c0
--- /dev/null
+++ b/Sources/Upload/UploadChunkRequestTaskQueue.swift
@@ -0,0 +1,118 @@
+import Foundation
+import Alamofire
+
+
+public class UploadChunkRequestTaskQueue: RequestTaskQueue<Video> {
+    private let requestBuilders: [RequestBuilder<Video>]
+
+    private let onProgressReady: ((Progress) -> Void)?
+    private let apiResponseQueue: DispatchQueue
+    private let completion: (_ data: Video?, _ error: Error?) -> Void
+
+    private var videoId: String?
+    private let _uploadProgress: Progress
+
+    private var hasSentError = false
+
+    internal init(requestBuilders: [RequestBuilder<Video>],
+                  fileSize: Int64,
+                  queueLabel: String,
+                  onProgressReady: ((Progress) -> Void)? = nil,
+                  apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue,
+                  completion: @escaping (_ data: Video?, _ error: Error?) -> Void) {
+        _uploadProgress = Progress(totalUnitCount: fileSize)
+        self.requestBuilders = requestBuilders
+        self.onProgressReady = onProgressReady
+        self.apiResponseQueue = apiResponseQueue
+        self.completion = completion
+        super.init(queueLabel: queueLabel)
+
+        requestBuilders.forEach { requestBuilder in
+            execute(requestBuilder,
+                    apiResponseQueue: apiResponseQueue,
+                    completion: completionHook)
+        }
+    }
+
+    internal convenience init(videoId: String,
+                              file: URL,
+                              onProgressReady: ((Progress) -> Void)? = nil,
+                              apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue,
+                              completion: @escaping (_ data: Video?, _ error: Error?) -> Void) throws {
+        let chunkInputStreams = try FileChunkInputStreamsBuilder(file: file).build()
+        let numOfChunks = chunkInputStreams.count
+
+        var requestBuilders: [RequestBuilder<Video>] = []
+        chunkInputStreams.enumerated().forEach { chunkId, chunkInputStream in
+            let requestBuilder = VideosAPI.uploadWithRequestBuilder(videoId: videoId, file: chunkInputStream, chunkId: chunkId + 1, numOfChunks: numOfChunks, onProgressReady: nil)
+            requestBuilders.append(requestBuilder)
+        }
+        try self.init(requestBuilders: requestBuilders, fileSize: file.fileSize, queueLabel: videoId, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+        self.videoId = videoId
+    }
+
+    internal convenience init(token: String,
+                              file: URL,
+                              onProgressReady: ((Progress) -> Void)? = nil,
+                              apiResponseQueue: DispatchQueue = ApiVideoClient.apiResponseQueue,
+                              completion: @escaping (_ data: Video?, _ error: Error?) -> Void) throws {
+        let chunkInputStreams = try FileChunkInputStreamsBuilder(file: file).build()
+        let numOfChunks = chunkInputStreams.count
+
+        var requestBuilders: [RequestBuilder<Video>] = []
+        chunkInputStreams.enumerated().forEach { chunkId, chunkInputStream in
+            let requestBuilder = VideosAPI.uploadWithUploadTokenWithRequestBuilder(token: token, file: chunkInputStream, chunkId: chunkId + 1, numOfChunks: numOfChunks, onProgressReady: nil)
+            requestBuilders.append(requestBuilder)
+        }
+        try self.init(requestBuilders: requestBuilders, fileSize: file.fileSize, queueLabel: token, onProgressReady: onProgressReady, apiResponseQueue: apiResponseQueue, completion: completion)
+    }
+
+    override func willExecuteRequestBuilder(requestBuilder: RequestBuilder<Video>) -> Void {
+        if let videoId = videoId {
+            uploadAddVideoIdParameterWithRequestBuilder(requestBuilder: requestBuilder, videoId: videoId)
+        }
+        requestBuilder.onProgressReady = progressReadyHook
+    }
+
+    override public var uploadProgress: Progress {
+        _uploadProgress.completedUnitCount = min(super.uploadProgress.completedUnitCount, _uploadProgress.totalUnitCount)
+        return _uploadProgress
+    }
+
+    private func progressReadyHook(progress: Progress) -> Void {
+        if let onProgressReady = onProgressReady {
+            onProgressReady(uploadProgress)
+        }
+    }
+
+    private func completionHook(_ data: Video?, _ error: Error?) -> Void {
+        if let error = error {
+            if !hasSentError {
+                hasSentError = true
+                cancel()
+                completion(nil, error)
+            }
+        } else {
+            videoId = data?.videoId
+            if (requestBuilders.allSatisfy {
+                $0.requestTask.state == .finished
+            }) {
+                completion(data, nil)
+            }
+        }
+    }
+
+    /**
+    * Add a videoId to the request builder if it does not exist already.
+    - parameter requestBuilder: the request builder
+    - parameter videoId: the videoId to add to the request
+    */
+    private func uploadAddVideoIdParameterWithRequestBuilder(requestBuilder: RequestBuilder<Video>, videoId: String) {
+        guard let parameters = requestBuilder.parameters else {
+            return
+        }
+        if (!parameters.keys.contains("videoId")) {
+            requestBuilder.parameters!["videoId"] = videoId
+        }
+    }
+}
diff --git a/Tests/ApiVideoClient/Integration/VideosApiTests.swift b/Tests/ApiVideoClient/Integration/VideosApiTests.swift
index 4ccb3f4..9493a27 100644
--- a/Tests/ApiVideoClient/Integration/VideosApiTests.swift
+++ b/Tests/ApiVideoClient/Integration/VideosApiTests.swift
@@ -45,12 +45,16 @@ internal class UploadTestCase: XCTestCase {
         let expectation = XCTestExpectation(description: "Upload a video")
         var observedProgress: Progress? = nil
 
-        VideosAPI.upload(videoId: self.videoId!, file: file, onProgressReady: { progress in
-            observedProgress = progress
-        }) { video, error in
-            XCTAssertNotNil(video, "Failed to upload a video")
-            XCTAssertNil(error, "Failed to upload a video due to \(String(describing: error))")
-            expectation.fulfill()
+        do {
+            try VideosAPI.upload(videoId: self.videoId!, file: file, onProgressReady: { progress in
+                observedProgress = progress
+            }) { video, error in
+                XCTAssertNotNil(video, "Failed to upload a video")
+                XCTAssertNil(error, "Failed to upload a video due to \(String(describing: error))")
+                expectation.fulfill()
+            }
+        } catch {
+            XCTFail("Failed to upload a video due to \(error)")
         }
 
         wait(for: [expectation], timeout: timeout)
@@ -83,7 +87,7 @@ class ProgressiveUploadTests: UploadTestCase {
     internal func uploadPart(file: URL, timeout: TimeInterval = 60, isLastPart: Bool = false) {
         let expectation = XCTestExpectation(description: "Upload a video")
         var observedProgress: Progress? = nil
-        
+
         if (isLastPart) {
             progressiveUploadSession!.uploadLastPart(file: file, onProgressReady: { progress in
                 observedProgress = progress
@@ -159,12 +163,16 @@ internal class UploadWithTokenTestCase: XCTestCase {
         let expectation = XCTestExpectation(description: "Upload a video")
         var observedProgress: Progress? = nil
 
-        VideosAPI.uploadWithUploadToken(token: self.token!, file: file, onProgressReady: { progress in
-            observedProgress = progress
-        }) { video, error in
-            XCTAssertNotNil(video, "Failed to upload a video")
-            XCTAssertNil(error, "Failed to upload a video due to \(String(describing: error))")
-            expectation.fulfill()
+        do {
+            try VideosAPI.uploadWithUploadToken(token: self.token!, file: file, onProgressReady: { progress in
+                observedProgress = progress
+            }) { video, error in
+                XCTAssertNotNil(video, "Failed to upload a video")
+                XCTAssertNil(error, "Failed to upload a video due to \(String(describing: error))")
+                expectation.fulfill()
+            }
+        } catch {
+            XCTFail("Failed to upload a video with upload token due to \(error)")
         }
 
         wait(for: [expectation], timeout: timeout)
@@ -197,7 +205,7 @@ class ProgressiveUploadWithTokenTests: UploadWithTokenTestCase {
     internal func uploadPart(file: URL, timeout: TimeInterval = 60, isLastPart: Bool = false) {
         let expectation = XCTestExpectation(description: "Upload a video")
         var observedProgress: Progress? = nil
-        
+
         if (isLastPart) {
             progressiveUploadSession!.uploadLastPart(file: file, onProgressReady: { progress in
                 observedProgress = progress