diff --git a/config/swift5-uploader.yaml b/config/swift5-uploader.yaml
index bd03a328..04950a58 100644
--- a/config/swift5-uploader.yaml
+++ b/config/swift5-uploader.yaml
@@ -31,7 +31,7 @@ changelog:
     - Fix large upload request time out
     - Fix callback on wrong token
 
-library: alamofire
+library: urlsession
 generateAliasAsModel: true
 removeMigrationProjectNameClass: true
 swiftPackagePath: "Sources"
@@ -46,17 +46,12 @@ additionalProperties:
   podHomepage: https://docs.api.video
   podSocialMediaUrl: https://twitter.com/api_video
   podLicense: "{ :type => 'MIT' }"
+backgroundSupport: true
 defaultChunkSize: 50 * 1024 * 1024
 minChunkSize: 5 * 1024 * 1024
 maxChunkSize: 128 * 1024 * 1024
 
 files:
-  Auth/ApiVideoCredential.mustache:
-    folder: Sources/Auth
-    destinationFilename: ApiVideoCredential.swift
-  Auth/ApiVideoAuthenticator.mustache:
-    folder: Sources/Auth
-    destinationFilename: ApiVideoAuthenticator.swift
   Environment.mustache:
     folder: Sources/Models
     destinationFilename: Environment.swift
diff --git a/config/swift5.yaml b/config/swift5.yaml
index 9a96a35a..b9424a77 100644
--- a/config/swift5.yaml
+++ b/config/swift5.yaml
@@ -36,7 +36,7 @@ changelog:
   - 0.1.0 (2021-12-06):
     - Initial release
 
-library: alamofire
+library: urlsession
 generateAliasAsModel: true
 removeMigrationProjectNameClass: true
 swiftPackagePath: "Sources"
@@ -51,17 +51,12 @@ additionalProperties:
   podHomepage: https://docs.api.video
   podSocialMediaUrl: https://twitter.com/api_video
   podLicense: "{ :type => 'MIT' }"
+backgroundSupport: true
 defaultChunkSize: 50 * 1024 * 1024
 minChunkSize: 5 * 1024 * 1024
 maxChunkSize: 128 * 1024 * 1024
 
 files:
-  Auth/ApiVideoCredential.mustache:
-    folder: Sources/Auth
-    destinationFilename: ApiVideoCredential.swift
-  Auth/ApiVideoAuthenticator.mustache:
-    folder: Sources/Auth
-    destinationFilename: ApiVideoAuthenticator.swift
   Environment.mustache:
     folder: Sources/Models
     destinationFilename: Environment.swift
diff --git a/templates/swift5/APIs.mustache b/templates/swift5/APIs.mustache
index b341eee8..09029084 100644
--- a/templates/swift5/APIs.mustache
+++ b/templates/swift5/APIs.mustache
@@ -16,21 +16,38 @@ import Vapor
 {{/removeMigrationProjectNameClass}}
 
 public class {{projectName}} {
-    public static var apiKey: String? = nil
+    private static var apiKey: String? = nil
     public static var basePath = "{{basePath}}"
     {{#useVapor}}
-    internal static var customHeaders: [String: String] = [:]
+    internal static var defaultHeaders: HTTPHeaders = ["AV-Origin-Client": "{{ originClient }}:{{ podVersion }}"]
     {{/useVapor}}
     {{^useVapor}}
-    internal static var customHeaders:[String: String] = ["AV-Origin-Client": "{{ originClient }}:{{ podVersion }}"]
+    internal static var defaultHeaders:[String: String] = ["AV-Origin-Client": "{{ originClient }}:{{ podVersion }}"]
+    internal static var credential: URLCredential?
     private static var chunkSize: Int = {{defaultChunkSize}}{{#useAlamofire}}
     internal static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory(){{/useAlamofire}}{{#useURLSession}}
     internal static var requestBuilderFactory: RequestBuilderFactory = URLSessionRequestBuilderFactory(){{/useURLSession}}
-    internal static var credential = ApiVideoCredential()
     public static var apiResponseQueue: DispatchQueue = .main
-    public static var timeout: TimeInterval = 60
+    {{/useVapor}}{{#backgroundSupport}}
+    public static var backgroundIdentifier: String = "video.api.upload.background"
+    {{/backgroundSupport}}public static var timeout: TimeInterval = 60
+    internal static var customHeaders:[String: String] {
+        var headers = defaultHeaders
+        if let apiKey = apiKey {
+            headers["Authorization"] = apiKey
+        }
+        return headers
+    }
+
+    public static func setApiKey(_ apiKey: String?) {
+        if let apiKey = apiKey {
+            self.apiKey = "Basic " + "\(apiKey):".toBase64()
+        } else {
+            self.apiKey = nil
+        }
+    }
 
-    public static func setChunkSize(chunkSize: Int) throws {
+    public static func setChunkSize(_ chunkSize: Int) throws {
         if (chunkSize > {{maxChunkSize}}) {
             throw ParameterError.outOfRange
         } else if (chunkSize < {{minChunkSize}}) {
@@ -55,25 +72,25 @@ public class {{projectName}} {
         }
     }
 
-    static func isValidVersion(version: String) -> Bool {
+    static func isValidVersion(_ version: String) -> Bool {
         let pattern = #"^\d{1,3}(\.\d{1,3}(\.\d{1,3})?)?$"#
         return isValid(pattern: pattern, field: version)
     }
 
-    static func isValidName(name: String) -> Bool {
+    static func isValidName(_ name: String) -> Bool {
         let pattern = #"^[\w\-]{1,50}$"#
         return isValid(pattern: pattern, field: name)
     }
 
     static func setName(key: String, name: String, version: String) throws {
-        if(!isValidName(name: name)) {
+        if(!isValidName(name)) {
             throw ParameterError.invalidName
         }
  
-        if(!isValidVersion(version: version)) {
+        if(!isValidVersion(version)) {
             throw ParameterError.invalidVersion
         }
-        {{projectName}}.customHeaders[key] = name + ":" + version
+        {{projectName}}.defaultHeaders[key] = name + ":" + version
     }
 
     public static func setSdkName(name: String, version: String) throws {
@@ -83,11 +100,10 @@ public class {{projectName}} {
     public static func setApplicationName(name: String, version: String) throws {
         try setName(key: "AV-Origin-App", name: name, version: version)
     }
-
-    {{/useVapor}}
 }{{^useVapor}}
 
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class RequestBuilder<T> {
+    var credential: URLCredential?
     var headers: [String: String]
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var parameters: [String: Any]?
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} let method: String
@@ -126,9 +142,15 @@ public class {{projectName}} {
         }
         return self
     }
+
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() -> Self {
+        credential = {{projectName}}.credential
+        return self
+    }
 }
 
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
-}{{/useVapor}}
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type{{#backgroundSupport}}
+    func getBackgroundBuilder<T: Decodable>() -> RequestBuilder<T>.Type
+{{/backgroundSupport}}}{{/useVapor}}
diff --git a/templates/swift5/Auth/ApiVideoCredential.mustache b/templates/swift5/Auth/ApiVideoCredential.mustache
deleted file mode 100644
index 04add438..00000000
--- a/templates/swift5/Auth/ApiVideoCredential.mustache
+++ /dev/null
@@ -1,31 +0,0 @@
-//  ApiVideoCredential.swift
-//
-
-import Foundation
-import Alamofire
-
-struct ApiVideoCredential: AuthenticationCredential {
-    let accessToken: String
-    let refreshToken: String
-    let tokenType: String
-    
-    let expiration: Date
-
-    // Require refresh if within 5 minutes of expiration
-    var requiresRefresh: Bool { Date(timeIntervalSinceNow: 60 * 5) > expiration }
-    
-    
-    public init(accessToken: AccessToken) {
-        self.accessToken = accessToken.accessToken!
-        self.refreshToken = accessToken.refreshToken!
-        self.tokenType = accessToken.tokenType!
-        self.expiration = Date(timeIntervalSinceNow: Double(accessToken.expiresIn!))
-    }
-    
-    public init() {
-        self.accessToken = ""
-        self.refreshToken = ""
-        self.tokenType = ""
-        self.expiration = Date()
-    }
-}
diff --git a/templates/swift5/Extensions.mustache b/templates/swift5/Extensions.mustache
index 9ebfcae7..27a4567f 100644
--- a/templates/swift5/Extensions.mustache
+++ b/templates/swift5/Extensions.mustache
@@ -117,6 +117,12 @@ extension String: CodingKey {
 
 }
 
+extension String {
+    func toBase64() -> String {
+         return Data(self.utf8).base64EncodedString()
+    }
+}
+
 extension KeyedEncodingContainerProtocol {
 
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
diff --git a/templates/swift5/Models.mustache b/templates/swift5/Models.mustache
index 2b72c763..3165c72f 100644
--- a/templates/swift5/Models.mustache
+++ b/templates/swift5/Models.mustache
@@ -81,16 +81,15 @@ protocol JSONEncodable {
         request = nil
     }
 
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var state: Request.State {
-        request?.state ?? .initialized
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var isFinished: Bool {
+        request?.isFinished ?? false
     }
 
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var uploadProgress: Progress? {
-        request?.uploadProgress
-    }
-
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var downloadProgress: Progress? {
-        request?.downloadProgress
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var progress: Progress? {
+        // TODO: Add upload and download progress as subprogress
+        let progress = Progress(totalUnitCount: (request?.uploadProgress.totalUnitCount ?? 0) + (request?.downloadProgress.totalUnitCount ?? 0))
+        progress.completedUnitCount = (request?.uploadProgress.completedUnitCount ?? 0) + (request?.downloadProgress.completedUnitCount ?? 0)
+        return progress
     }
 {{/useAlamofire}}
 {{^useAlamofire}}
@@ -108,5 +107,18 @@ protocol JSONEncodable {
         task?.cancel()
         task = nil
     }
+
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var isFinished: Bool {
+        guard let state = task?.state else {
+            return false
+        }
+        
+        return state == URLSessionTask.State.completed
+    }
+
+    @available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *)
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var progress: Progress? {
+        return task?.progress
+    }
 {{/useAlamofire}}
 }
\ No newline at end of file
diff --git a/templates/swift5/Upload/FileChunkInputStream.mustache b/templates/swift5/Upload/FileChunkInputStream.mustache
index 61ed2948..6d3043ee 100644
--- a/templates/swift5/Upload/FileChunkInputStream.mustache
+++ b/templates/swift5/Upload/FileChunkInputStream.mustache
@@ -1,6 +1,3 @@
-//  FileChunkInputStream.swift
-//
-
 import Foundation
 
 public class FileChunkInputStream: InputStream {
diff --git a/templates/swift5/Upload/ProgressiveUploadSessionProtocol.mustache b/templates/swift5/Upload/ProgressiveUploadSessionProtocol.mustache
index c60261c0..88a093a3 100644
--- a/templates/swift5/Upload/ProgressiveUploadSessionProtocol.mustache
+++ b/templates/swift5/Upload/ProgressiveUploadSessionProtocol.mustache
@@ -1,6 +1,3 @@
-//  ProgressiveUploadSessionProtocol.swift
-//
-
 import Foundation
 
 public protocol ProgressiveUploadSessionProtocol {
diff --git a/templates/swift5/Upload/RequestTaskQueue.mustache b/templates/swift5/Upload/RequestTaskQueue.mustache
index 9f975924..93f92c37 100644
--- a/templates/swift5/Upload/RequestTaskQueue.mustache
+++ b/templates/swift5/Upload/RequestTaskQueue.mustache
@@ -1,12 +1,10 @@
 import Foundation
-import Alamofire
 
 public class RequestTaskQueue<T>: RequestTask {
     private let operationQueue: OperationQueue
     private var requestBuilders: [RequestBuilder<T>] = []
 
-    private let _downloadProgress = Progress(totalUnitCount: 0)
-    private let _uploadProgress = Progress(totalUnitCount: 0)
+    private let _progress = Progress(totalUnitCount: 0)
 
     internal init(queueLabel: String) {
         operationQueue = OperationQueue()
@@ -15,34 +13,20 @@ public class RequestTaskQueue<T>: RequestTask {
         super.init()
     }
 
-    override public var uploadProgress: Progress {
+    {{#useURLSession}}@available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *)
+    {{/useURLSession}}override public var progress: Progress {
         var completedUnitCount: Int64 = 0
         var totalUnitCount: Int64 = 0
         requestBuilders.forEach {
-            if let progress = $0.requestTask.uploadProgress {
+            if let progress = $0.requestTask.progress {
                 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
+        _progress.totalUnitCount = totalUnitCount
+        _progress.completedUnitCount = completedUnitCount
+        return _progress
     }
 
     internal func willExecuteRequestBuilder(requestBuilder: RequestBuilder<T>) -> Void {
@@ -62,6 +46,10 @@ public class RequestTaskQueue<T>: RequestTask {
         }
         operationQueue.cancelAllOperations()
     }
+
+    override public var isFinished: Bool {
+        requestBuilders.allSatisfy { $0.requestTask.isFinished }
+    }
 }
 
 final class RequestOperation<T>: Operation {
diff --git a/templates/swift5/Upload/UploadChunkRequestTaskQueue.mustache b/templates/swift5/Upload/UploadChunkRequestTaskQueue.mustache
index c7056bec..9bcbc138 100644
--- a/templates/swift5/Upload/UploadChunkRequestTaskQueue.mustache
+++ b/templates/swift5/Upload/UploadChunkRequestTaskQueue.mustache
@@ -1,6 +1,4 @@
 import Foundation
-import Alamofire
-
 
 public class UploadChunkRequestTaskQueue: RequestTaskQueue<Video> {
     private let requestBuilders: [RequestBuilder<Video>]
@@ -10,7 +8,7 @@ public class UploadChunkRequestTaskQueue: RequestTaskQueue<Video> {
     private let completion: (_ data: Video?, _ error: Error?) -> Void
 
     private var videoId: String?
-    private let _uploadProgress: Progress
+    private let _progress: Progress
 
     private var hasSentError = false
 
@@ -20,7 +18,7 @@ public class UploadChunkRequestTaskQueue: RequestTaskQueue<Video> {
                   onProgressReady: ((Progress) -> Void)? = nil,
                   apiResponseQueue: DispatchQueue = {{projectName}}.apiResponseQueue,
                   completion: @escaping (_ data: Video?, _ error: Error?) -> Void) {
-        _uploadProgress = Progress(totalUnitCount: fileSize)
+        _progress = Progress(totalUnitCount: fileSize)
         self.requestBuilders = requestBuilders
         self.onProgressReady = onProgressReady
         self.apiResponseQueue = apiResponseQueue
@@ -76,14 +74,15 @@ public class UploadChunkRequestTaskQueue: RequestTaskQueue<Video> {
         requestBuilder.onProgressReady = progressReadyHook
     }
 
-    override public var uploadProgress: Progress {
-        _uploadProgress.completedUnitCount = min(super.uploadProgress.completedUnitCount, _uploadProgress.totalUnitCount)
-        return _uploadProgress
+    {{#useURLSession}}@available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *)
+    {{/useURLSession}}override public var progress: Progress {
+        _progress.completedUnitCount = min(super.progress.completedUnitCount, _progress.totalUnitCount)
+        return _progress
     }
 
     private func progressReadyHook(progress: Progress) -> Void {
         if let onProgressReady = onProgressReady {
-            onProgressReady(uploadProgress)
+            onProgressReady(progress)
         }
     }
 
@@ -98,9 +97,7 @@ public class UploadChunkRequestTaskQueue: RequestTaskQueue<Video> {
             if (videoId == nil) {
                 videoId = data?.videoId
             }
-            if (requestBuilders.allSatisfy {
-                $0.requestTask.state == .finished
-            }) {
+            if (isFinished) {
                 completion(data, nil)
             }
         }
diff --git a/templates/swift5/api.mustache b/templates/swift5/api.mustache
index fa2e48a1..4942413a 100644
--- a/templates/swift5/api.mustache
+++ b/templates/swift5/api.mustache
@@ -543,7 +543,7 @@ extension {{projectName}}API {
 
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
-        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}.requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}
+        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}.requestBuilderFactory.{{#vendorExtensions.x-client-chunk-upload}}getBackgroundBuilder(){{/vendorExtensions.x-client-chunk-upload}}{{^vendorExtensions.x-client-chunk-upload}}{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}{{/vendorExtensions.x-client-chunk-upload}}
 
         return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters{{#vendorExtensions.x-client-chunk-upload}}, onProgressReady: onProgressReady{{/vendorExtensions.x-client-chunk-upload}})
     }
@@ -620,7 +620,7 @@ extension {{projectName}}API {
 
         let localVariableHeaderParameters = APIHelper.rejectNilHeaders(localVariableNillableHeaders)
 
-        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}.requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}
+        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}.requestBuilderFactory.{{#backgroundSupport}}{{#vendorExtensions.x-client-chunk-upload}}getBackgroundBuilder(){{/vendorExtensions.x-client-chunk-upload}}{{^vendorExtensions.x-client-chunk-upload}}{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}{{/vendorExtensions.x-client-chunk-upload}}{{/backgroundSupport}}{{^backgroundSupport}}{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}{{/backgroundSupport}}
 
         return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, onProgressReady: onProgressReady)
     }
diff --git a/templates/swift5/libraries/alamofire/AlamofireImplementations.mustache b/templates/swift5/libraries/alamofire/AlamofireImplementations.mustache
index 84eedea0..5eee8d91 100644
--- a/templates/swift5/libraries/alamofire/AlamofireImplementations.mustache
+++ b/templates/swift5/libraries/alamofire/AlamofireImplementations.mustache
@@ -94,19 +94,7 @@ private var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
     override {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute(_ apiResponseQueue: DispatchQueue = {{projectName}}.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
-
-        if URLString.hasSuffix("/auth/api-key") {
-            manager = createAlamofireSession()
-        } else if let apiKey = {{projectName}}.apiKey {
-            // Create the interceptor
-            let authenticator = ApiVideoAuthenticator(apiKey: apiKey)
-            let interceptor = AuthenticationInterceptor(authenticator: authenticator, credential: {{projectName}}.credential)
-
-            manager = createAlamofireSession(interceptor: interceptor)
-        } else {
-            manager = createAlamofireSession()
-        }
+        let manager = createAlamofireSession()
         managerStore[managerId] = manager
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
@@ -142,6 +130,8 @@ private var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
                             mpForm.append(string.data(using: String.Encoding.utf8)!, withName: k)
                         case let number as NSNumber:
                             mpForm.append(number.stringValue.data(using: String.Encoding.utf8)!, withName: k)
+                        case let data as Data:
+                            mpForm.append(data, withName: k)
                         default:
                             fatalError("Unprocessable value \(v) with key \(k)")
                         }
@@ -179,6 +169,10 @@ private var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
     }
 
     fileprivate func processRequest(request: DataRequest, _ managerId: String, _ apiResponseQueue: DispatchQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
+        if let credential = self.credential {
+            request.authenticate(with: credential)
+        }
+
         let cleanupRequest = {
             managerStore[managerId] = nil
         }
@@ -267,6 +261,10 @@ private var managerStore = SynchronizedDictionary<String, Alamofire.Session>()
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ apiResponseQueue: DispatchQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
+        if let credential = self.credential {
+            request.authenticate(with: credential)
+        }
+
         let cleanupRequest = {
             managerStore[managerId] = nil
         }
diff --git a/templates/swift5/libraries/urlsession/URLSessionImplementations.mustache b/templates/swift5/libraries/urlsession/URLSessionImplementations.mustache
index b7ba1a76..9f4ce736 100644
--- a/templates/swift5/libraries/urlsession/URLSessionImplementations.mustache
+++ b/templates/swift5/libraries/urlsession/URLSessionImplementations.mustache
@@ -9,6 +9,12 @@ import Foundation
 import MobileCoreServices
 #endif
 
+{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} protocol URLSessionProtocol {
+    func dataTask(with request: URLRequest, completionHandler: @escaping @Sendable (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask
+}
+
+extension URLSession: URLSessionProtocol {}
+
 class URLSessionRequestBuilderFactory: RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type {
         return URLSessionRequestBuilder<T>.self
@@ -16,7 +22,12 @@ class URLSessionRequestBuilderFactory: RequestBuilderFactory {
 
     func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return URLSessionDecodableRequestBuilder<T>.self
+    }{{#backgroundSupport}}
+
+    func getBackgroundBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
+        return URLSessionDecodableBackgroundUploadRequestBuilder<T>.self
     }
+    {{/backgroundSupport}}
 }
 
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} typealias {{projectName}}ChallengeHandler = ((URLSession, URLSessionTask, URLAuthenticationChallenge) -> (URLSession.AuthChallengeDisposition, URLCredential?))
@@ -40,6 +51,11 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
      */
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var taskDidReceiveChallenge: {{projectName}}ChallengeHandler?
 
+    /**
+     To observe upload or download progress
+     */
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var progressObservation: NSKeyValueObservation?
+
     /**
      May be assigned if you want to do any of those things:
      - control the task completion
@@ -49,15 +65,15 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
     @available(*, deprecated, message: "Please override execute() method to intercept and handle errors like authorization or retry the request. Check the Wiki for more info. https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-do-i-implement-bearer-token-authentication-with-urlsession-on-the-swift-api-client")
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var taskCompletionShouldRetry: ((Data?, URLResponse?, Error?, @escaping (Bool) -> Void) -> Void)?
 
-    required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:]) {
-        super.init(method: method, URLString: URLString, parameters: parameters, headers: headers)
+    required {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} init(method: String, URLString: String, parameters: [String: Any]?, headers: [String: String] = [:], onProgressReady: ((Progress) -> Void)? = nil) {
+        super.init(method: method, URLString: URLString, parameters: parameters, headers: headers, onProgressReady: onProgressReady)
     }
 
     /**
      May be overridden by a subclass if you want to control the URLSession
      configuration.
      */
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func createURLSession() -> URLSession {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func createURLSession() -> URLSessionProtocol {
         return defaultURLSession
     }
 
@@ -76,14 +92,14 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
      May be overridden by a subclass if you want to control the URLRequest
      configuration (e.g. to override the cache policy).
      */
-    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func createURLRequest(urlSession: URLSession, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
+    {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func createURLRequest(urlSession: URLSessionProtocol, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) throws -> URLRequest {
 
         guard let url = URL(string: URLString) else {
             throw DownloadException.requestMissingURL
         }
 
         var originalRequest = URLRequest(url: url)
-
+        originalRequest.timeoutInterval = {{projectName}}.timeout
         originalRequest.httpMethod = method.rawValue
 
         headers.forEach { key, value in
@@ -100,7 +116,7 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
     }
 
     @discardableResult
-    override {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute(_ apiResponseQueue: DispatchQueue = {{projectName}}.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) -> URLSessionTask? {
+    override {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute(_ apiResponseQueue: DispatchQueue = {{projectName}}.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) -> RequestTask {
         let urlSession = createURLSession()
 
         guard let xMethod = HTTPMethod(rawValue: method) else {
@@ -163,7 +179,11 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
             }
 
             if #available(iOS 11.0, macOS 10.13, macCatalyst 13.0, tvOS 11.0, watchOS 4.0, *) {
-                onProgressReady?(dataTask.progress)
+                if let onProgressReady = onProgressReady {
+                    progressObservation = dataTask.progress.observe(\.fractionCompleted) { progress, _ in
+                        onProgressReady(progress)
+                    }
+                }
             }
 
             taskIdentifier = dataTask.taskIdentifier
@@ -172,14 +192,14 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
 
             dataTask.resume()
 
-            return dataTask
+            requestTask.set(task: dataTask)
         } catch {
             apiResponseQueue.async {
                 completion(.failure(ErrorResponse.error(415, nil, nil, error)))
             }
-
-            return nil
         }
+
+        return requestTask
     }
 
     fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, response: URLResponse?, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
@@ -361,8 +381,61 @@ private var credentialStore = SynchronizedDictionary<Int, URLCredential>()
             }
         }
     }
+}{{#backgroundSupport}}
+
+private class BackgroundUploadTaskURLSession<T>: NSObject, URLSessionProtocol, URLSessionDelegate, URLSessionDataDelegate {
+    private let file: URL
+    private lazy var urlSession: URLSession = {
+        URLSession(configuration: .background(withIdentifier: ApiVideoClient.backgroundIdentifier), delegate: self, delegateQueue: nil)
+    }()
+    private var completion: ((Data?, URLResponse?, Error?) -> Void)? = nil
+    
+    init(_ file: URL) {
+        self.file = file
+    }
+    
+    func dataTask(with request: URLRequest, completionHandler: @escaping @Sendable (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask {
+        completion = completionHandler
+        return urlSession.uploadTask(with: request, fromFile: file)
+    }
+
+    func urlSession(_ session: URLSession, task: URLSessionTask, didBecomeInvalidWithError error: Error?) {
+        guard let error = error else {
+            return
+        }
+        completion?(nil, task.response, error)
+    }
+    
+    func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive data: Data) {
+        completion?(data, dataTask.response, nil)
+    }
+    
+    func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
+        sessionDelegate.urlSession(session, task: task, didReceive: challenge, completionHandler: completionHandler)
+    }
 }
 
+{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class URLSessionDecodableBackgroundUploadRequestBuilder<T: Decodable>: URLSessionDecodableRequestBuilder<T> {
+    private var completion: ((Result<Response<T>, ErrorResponse>) -> Void)? = nil
+    
+    override open func createURLSession() -> URLSessionProtocol {
+        guard let parameters = parameters else { fatalError("No parameters found") }
+        
+        // Find file URL
+        var file: URL? = nil
+        for (_, value) in parameters {
+            if let fileURL = value as? URL {
+                file = fileURL
+                break
+            }
+        }
+        guard let fileURL = file else {
+            fatalError("No file URL found")
+        }
+        return BackgroundUploadTaskURLSession<T>(fileURL)
+    }
+}{{/backgroundSupport}}
+
 private class SessionDelegate: NSObject, URLSessionTaskDelegate {
     func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
 
@@ -446,6 +519,17 @@ private class FormDataEncoding: ParameterEncoding {
 
         for (key, value) in parameters {
             switch value {
+            case let fileChunkInputStream as FileChunkInputStream:
+
+                urlRequest = configureInputStreamRequest(
+                    urlRequest: urlRequest,
+                    boundary: boundary,
+                    name: key,
+                    fileName: fileChunkInputStream.file.lastPathComponent,
+                    inputStream: fileChunkInputStream,
+                    length: UInt64(fileChunkInputStream.capacity)
+                )
+
             case let fileURL as URL:
 
                 urlRequest = try configureFileUploadRequest(
@@ -477,6 +561,15 @@ private class FormDataEncoding: ParameterEncoding {
                     )
                 }
 
+           case let data as Data:
+
+                urlRequest = configureDataUploadRequest(
+                    urlRequest: urlRequest,
+                    boundary: boundary,
+                    name: key,
+                    data: data
+                )
+
             default:
                 fatalError("Unprocessable value \(value) with key \(key)")
             }
@@ -491,6 +584,39 @@ private class FormDataEncoding: ParameterEncoding {
         return urlRequest
     }
 
+    private func configureInputStreamRequest(urlRequest: URLRequest, boundary: String, name: String, fileName: String, inputStream: InputStream, length: UInt64) -> URLRequest {
+
+        var urlRequest = urlRequest
+
+        var body = urlRequest.httpBody.orEmpty
+
+        let data = encodeInputStream(for: inputStream, withLength: length)
+
+        let mimetype = "video/quicktime"
+
+        // If we already added something then we need an additional newline.
+        if body.count > 0 {
+            body.append("\r\n")
+        }
+
+        // Value boundary.
+        body.append("--\(boundary)\r\n")
+
+        // Value headers.
+        body.append("Content-Disposition: form-data; name=\"\(name)\"; filename=\"\(fileName)\"\r\n")
+        body.append("Content-Type: \(mimetype)\r\n")
+
+        // Separate headers and body.
+        body.append("\r\n")
+
+        // The value data.
+        body.append(data)
+
+        urlRequest.httpBody = body
+
+        return urlRequest
+    }
+
     private func configureFileUploadRequest(urlRequest: URLRequest, boundary: String, name: String, fileURL: URL) throws -> URLRequest {
 
         var urlRequest = urlRequest
@@ -566,6 +692,35 @@ private class FormDataEncoding: ParameterEncoding {
         return "application/octet-stream"
     }
 
+    private func encodeInputStream(for inputStream: InputStream, withLength length: UInt64) -> Data {
+        inputStream.open()
+        defer { inputStream.close() }
+
+        let streamBufferSize = 1024
+        var encoded = Data()
+
+        while inputStream.hasBytesAvailable {
+            var buffer = [UInt8](repeating: 0, count: streamBufferSize)
+            let bytesRead = inputStream.read(&buffer, maxLength: streamBufferSize)
+
+            if let error = inputStream.streamError {
+                fatalError("Reading input stream failed with error \(error)")
+            }
+
+            if bytesRead > 0 {
+                encoded.append(buffer, count: bytesRead)
+            } else {
+                break
+            }
+        }
+
+        guard UInt64(encoded.count) == length else {
+            fatalError("Unexpected input stream length. Expected: \(length) Got: \(UInt64(encoded.count))")
+        }
+
+        return encoded
+    }
+
 }
 
 private class FormURLEncoding: ParameterEncoding {
diff --git a/templates/swift5/statics/client/Example/Example/Controller/VideosViewController.swift b/templates/swift5/statics/client/Example/Example/Controller/VideosViewController.swift
new file mode 100644
index 00000000..256e4abb
--- /dev/null
+++ b/templates/swift5/statics/client/Example/Example/Controller/VideosViewController.swift
@@ -0,0 +1,85 @@
+//
+//  ViewController.swift
+//  Example
+//
+
+import UIKit
+import ApiVideoClient
+
+struct VideosOption{
+    let title:String
+    let videoId: String
+    let thumbnail: String?
+    let handler: (()->Void)
+}
+
+class VideosViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
+    var models = [VideosOption]()
+    
+    private func configure(){
+        
+        ApiVideoClient.setApiKey(ClientManager.apiKey)
+        ApiVideoClient.basePath = ClientManager.environment.rawValue
+        
+        VideosAPI.list(title: nil, tags: nil, metadata: nil, description: nil, liveStreamId: nil, sortBy: nil, sortOrder: nil, currentPage: nil, pageSize: nil) { (response, error) in
+            guard error == nil else {
+                print(error ?? "error")
+                return
+            }
+            
+            if ((response) != nil) {
+                for item in response!.data {
+                    self.models.append(VideosOption(title: item.title ?? "error title", videoId: item.videoId, thumbnail: item.assets?.thumbnail){
+                        
+                    })
+                    self.tableView.reloadData()
+                }
+            }
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let headerView = UIView()
+        headerView.backgroundColor = UIColor.clear
+        return headerView
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return models.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let model = models[indexPath.row]
+
+        
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: VideoTableViewCell.identifier, for: indexPath) as? VideoTableViewCell else{
+            return UITableViewCell()
+        }
+        cell.layer.cornerRadius = 8
+        cell.configure(with: model)
+        return cell
+    }
+    
+    
+    private let tableView: UITableView = {
+        let table = UITableView(frame: .zero, style: .grouped)
+        table.register(VideoTableViewCell.self, forCellReuseIdentifier: VideoTableViewCell.identifier)
+        return table
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        configure()
+        title = "Videos"
+        view.addSubview(tableView)
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.frame = view.bounds
+        tableView.rowHeight = 310.0
+    }
+    
+    
+    
+    
+}
+
diff --git a/templates/swift5/statics/client/Example/Example/MainViewController.swift b/templates/swift5/statics/client/Example/Example/MainViewController.swift
index e1d3bd63..1fe2f9bf 100644
--- a/templates/swift5/statics/client/Example/Example/MainViewController.swift
+++ b/templates/swift5/statics/client/Example/Example/MainViewController.swift
@@ -157,7 +157,7 @@ extension MainViewController: UIImagePickerControllerDelegate, UINavigationContr
         progressView.isHidden = false
 
         // Set client configuration
-        ApiVideoClient.apiKey = SettingsManager.apiKey
+        ApiVideoClient.setApiKey(SettingsManager.apiKey)
         ApiVideoClient.basePath = SettingsManager.environment.rawValue
 
         // Upload
diff --git a/templates/swift5/statics/client/Tests/ApiVideoClient/Integration/VideosApiTests.swift b/templates/swift5/statics/client/Tests/ApiVideoClient/Integration/VideosApiTests.swift
index 04be8566..ad3e017c 100644
--- a/templates/swift5/statics/client/Tests/ApiVideoClient/Integration/VideosApiTests.swift
+++ b/templates/swift5/statics/client/Tests/ApiVideoClient/Integration/VideosApiTests.swift
@@ -11,7 +11,7 @@ internal class UploadTestCase: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         try XCTSkipIf(Parameters.apiKey == "INTEGRATION_TESTS_API_KEY", "Can't get API key")
-        ApiVideoClient.apiKey = Parameters.apiKey
+        ApiVideoClient.setApiKey(Parameters.apiKey)
         ApiVideoClient.basePath = Environment.sandbox.rawValue
         try? ApiVideoClient.setApplicationName(name: "client-integration-tests", version: "0")
 
@@ -77,7 +77,7 @@ class UploadChunkTests: UploadTestCase {
     func testUpload() throws {
         createVideo()
 
-        try ApiVideoClient.setChunkSize(chunkSize: 1024 * 1024 * 5)
+        try ApiVideoClient.setChunkSize(1024 * 1024 * 5)
         uploadVideo(file: SharedResources.v10m!, timeout: 120)
     }
 }
@@ -155,7 +155,7 @@ internal class UploadWithTokenTestCase: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         try XCTSkipIf(Parameters.apiKey == "INTEGRATION_TESTS_API_KEY", "Can't get API key")
-        ApiVideoClient.apiKey = Parameters.apiKey
+        ApiVideoClient.setApiKey(Parameters.apiKey)
         ApiVideoClient.basePath = Environment.sandbox.rawValue
 
         continueAfterFailure = false
@@ -220,7 +220,7 @@ class UploadWithTokenChunkTests: UploadWithTokenTestCase {
     func testUpload() throws {
         createUploadToken()
 
-        try ApiVideoClient.setChunkSize(chunkSize: 1024 * 1024 * 5)
+        try ApiVideoClient.setChunkSize(1024 * 1024 * 5)
         uploadVideo(file: SharedResources.v10m!, timeout: 120)
     }
 }
@@ -299,7 +299,7 @@ internal class UploadWithTokenAndVideoIdTestCase: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         try XCTSkipIf(Parameters.apiKey == "INTEGRATION_TESTS_API_KEY", "Can't get API key")
-        ApiVideoClient.apiKey = Parameters.apiKey
+        ApiVideoClient.setApiKey(Parameters.apiKey)
         ApiVideoClient.basePath = Environment.sandbox.rawValue
 
         continueAfterFailure = false