From 9dd46f0173524913f6b1f5bae69f641d62c367ae Mon Sep 17 00:00:00 2001
From: Julian Locke <jlocke@dropbox.com>
Date: Tue, 1 Oct 2024 10:01:02 -0400
Subject: [PATCH] Add analytics block

---
 .../Shared/Handwritten/Request.swift          |  30 +++
 .../Shared/Generated/DBXAccountRoutes.swift   |   4 +-
 .../Shared/Generated/DBXAuthRoutes.swift      |   4 +-
 .../Shared/Generated/DBXCheckRoutes.swift     |   4 +-
 .../Shared/Generated/DBXContactsRoutes.swift  |   8 +-
 .../Generated/DBXFilePropertiesRoutes.swift   |  44 +++-
 .../Generated/DBXFileRequestsRoutes.swift     |  36 ++-
 .../Shared/Generated/DBXFilesRoutes.swift     | 152 +++++++++---
 .../Shared/Generated/DBXOpenidRoutes.swift    |   4 +-
 .../Shared/Generated/DBXSharingRoutes.swift   | 152 +++++++++---
 .../Shared/Generated/DBXUsersRoutes.swift     |  20 +-
 .../Generated/ShimSwiftObjcHelpers.swift      | 222 +++++++++---------
 stone                                         |   2 +-
 13 files changed, 466 insertions(+), 216 deletions(-)

diff --git a/Source/SwiftyDropbox/Shared/Handwritten/Request.swift b/Source/SwiftyDropbox/Shared/Handwritten/Request.swift
index 3ca67c42..ab925eda 100644
--- a/Source/SwiftyDropbox/Shared/Handwritten/Request.swift
+++ b/Source/SwiftyDropbox/Shared/Handwritten/Request.swift
@@ -86,12 +86,23 @@ public class Request<RSerial: JSONSerializer, ESerial: JSONSerializer> {
     }
 }
 
+public typealias AnalyticsBlock = (_ success: Bool, _ resultData: Data?, _ response: HTTPURLResponse?, _ error: Error?) -> Void
+
 /// An "rpc-style" request
 public class RpcRequest<RSerial: JSONSerializer, ESerial: JSONSerializer>: Request<RSerial, ESerial> {
     @discardableResult
     public func response(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (RSerial.ValueType?, CallError<ESerial.ValueType>?) -> Void
+    ) -> Self {
+        response(queue: queue, analyticsBlock: nil, completionHandler: completionHandler)
+    }
+
+    @discardableResult
+    public func response(
+        queue: DispatchQueue? = nil,
+        analyticsBlock: AnalyticsBlock? = nil,
+        completionHandler: @escaping (RSerial.ValueType?, CallError<ESerial.ValueType>?) -> Void
     ) -> Self {
         request.setCompletionHandlerProvider(queue: queue, completionHandlerProvider: .dataCompletionHandlerProvider({ [weak self] response in
             guard let strongSelf = self else {
@@ -114,11 +125,30 @@ public class RpcRequest<RSerial: JSONSerializer, ESerial: JSONSerializer>: Reque
             }
 
             return {
+                strongSelf.callAnalyticsBlockIfNeeded(response: response, analyticsBlock)
                 completionHandler(result, error)
             }
         }))
         return self
     }
+
+    private func callAnalyticsBlockIfNeeded(response: NetworkDataTaskResult, _ analyticsBlock: AnalyticsBlock?) {
+        guard let analyticsBlock = analyticsBlock else {
+            return
+        }
+
+        switch response {
+        case .success((let data, let response)):
+            analyticsBlock(true, data, response, nil)
+        case .failure(let failure):
+            switch failure {
+            case .badStatusCode(let data, _, let response):
+                analyticsBlock(false, data, response, nil)
+            case .failedWithError(let error):
+                analyticsBlock(false, nil, nil, error)
+            }
+        }
+    }
 }
 
 /// An "upload-style" request
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXAccountRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXAccountRoutes.swift
index 271ecdfb..2fc243f8 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXAccountRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXAccountRoutes.swift
@@ -44,6 +44,7 @@ public class DBXAccountSetProfilePhotoRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAccountSetProfilePhotoResult?, DBXAccountSetProfilePhotoError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -52,9 +53,10 @@ public class DBXAccountSetProfilePhotoRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAccountSetProfilePhotoResult?, DBXAccountSetProfilePhotoError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAccountSetProfilePhotoError?
             var callError: DBXCallError?
             switch error {
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXAuthRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXAuthRoutes.swift
index a6002ba3..1418ae80 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXAuthRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXAuthRoutes.swift
@@ -42,6 +42,7 @@ public class DBXAuthTokenRevokeRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -50,9 +51,10 @@ public class DBXAuthTokenRevokeRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             completionHandler(error?.objc)
         }
         return self
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXCheckRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXCheckRoutes.swift
index 4f7a16f1..67095faf 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXCheckRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXCheckRoutes.swift
@@ -62,6 +62,7 @@ public class DBXCheckUserRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXCheckEchoResult?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -70,9 +71,10 @@ public class DBXCheckUserRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXCheckEchoResult?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXCheckEchoResult?
             if let swift = result {
                 objc = DBXCheckEchoResult(swift: swift)
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXContactsRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXContactsRoutes.swift
index 63317cf7..fc3ccf26 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXContactsRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXContactsRoutes.swift
@@ -58,6 +58,7 @@ public class DBXContactsDeleteManualContactsRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -66,9 +67,10 @@ public class DBXContactsDeleteManualContactsRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             completionHandler(error?.objc)
         }
         return self
@@ -110,6 +112,7 @@ public class DBXContactsDeleteManualContactsBatchRpcRequest: NSObject, DBXReques
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXContactsDeleteManualContactsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -118,9 +121,10 @@ public class DBXContactsDeleteManualContactsBatchRpcRequest: NSObject, DBXReques
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXContactsDeleteManualContactsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXContactsDeleteManualContactsError?
             var callError: DBXCallError?
             switch error {
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilePropertiesRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilePropertiesRoutes.swift
index d3f8702b..2840b126 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilePropertiesRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilePropertiesRoutes.swift
@@ -348,6 +348,7 @@ public class DBXFilePropertiesPropertiesAddRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesAddPropertiesError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -356,9 +357,10 @@ public class DBXFilePropertiesPropertiesAddRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesAddPropertiesError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilePropertiesAddPropertiesError?
             var callError: DBXCallError?
             switch error {
@@ -411,6 +413,7 @@ public class DBXFilePropertiesPropertiesOverwriteRpcRequest: NSObject, DBXReques
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesInvalidPropertyGroupError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -419,9 +422,10 @@ public class DBXFilePropertiesPropertiesOverwriteRpcRequest: NSObject, DBXReques
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesInvalidPropertyGroupError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilePropertiesInvalidPropertyGroupError?
             var callError: DBXCallError?
             switch error {
@@ -474,6 +478,7 @@ public class DBXFilePropertiesPropertiesRemoveRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesRemovePropertiesError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -482,9 +487,10 @@ public class DBXFilePropertiesPropertiesRemoveRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesRemovePropertiesError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilePropertiesRemovePropertiesError?
             var callError: DBXCallError?
             switch error {
@@ -537,6 +543,7 @@ public class DBXFilePropertiesPropertiesSearchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesPropertiesSearchResult?, DBXFilePropertiesPropertiesSearchError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -545,9 +552,10 @@ public class DBXFilePropertiesPropertiesSearchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesPropertiesSearchResult?, DBXFilePropertiesPropertiesSearchError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilePropertiesPropertiesSearchError?
             var callError: DBXCallError?
             switch error {
@@ -604,6 +612,7 @@ public class DBXFilePropertiesPropertiesSearchContinueRpcRequest: NSObject, DBXR
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesPropertiesSearchResult?, DBXFilePropertiesPropertiesSearchContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -612,9 +621,10 @@ public class DBXFilePropertiesPropertiesSearchContinueRpcRequest: NSObject, DBXR
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesPropertiesSearchResult?, DBXFilePropertiesPropertiesSearchContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilePropertiesPropertiesSearchContinueError?
             var callError: DBXCallError?
             switch error {
@@ -671,6 +681,7 @@ public class DBXFilePropertiesPropertiesUpdateRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesUpdatePropertiesError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -679,9 +690,10 @@ public class DBXFilePropertiesPropertiesUpdateRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesUpdatePropertiesError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilePropertiesUpdatePropertiesError?
             var callError: DBXCallError?
             switch error {
@@ -801,6 +813,7 @@ public class DBXFilePropertiesTemplatesAddForUserRpcRequest: NSObject, DBXReques
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesAddTemplateResult?, DBXFilePropertiesModifyTemplateError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -809,9 +822,10 @@ public class DBXFilePropertiesTemplatesAddForUserRpcRequest: NSObject, DBXReques
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesAddTemplateResult?, DBXFilePropertiesModifyTemplateError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilePropertiesModifyTemplateError?
             var callError: DBXCallError?
             switch error {
@@ -935,6 +949,7 @@ public class DBXFilePropertiesTemplatesGetForUserRpcRequest: NSObject, DBXReques
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesGetTemplateResult?, DBXFilePropertiesTemplateError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -943,9 +958,10 @@ public class DBXFilePropertiesTemplatesGetForUserRpcRequest: NSObject, DBXReques
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesGetTemplateResult?, DBXFilePropertiesTemplateError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilePropertiesTemplateError?
             var callError: DBXCallError?
             switch error {
@@ -1069,6 +1085,7 @@ public class DBXFilePropertiesTemplatesListForUserRpcRequest: NSObject, DBXReque
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesListTemplateResult?, DBXFilePropertiesTemplateError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1077,9 +1094,10 @@ public class DBXFilePropertiesTemplatesListForUserRpcRequest: NSObject, DBXReque
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesListTemplateResult?, DBXFilePropertiesTemplateError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilePropertiesTemplateError?
             var callError: DBXCallError?
             switch error {
@@ -1199,6 +1217,7 @@ public class DBXFilePropertiesTemplatesRemoveForUserRpcRequest: NSObject, DBXReq
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesTemplateError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1207,9 +1226,10 @@ public class DBXFilePropertiesTemplatesRemoveForUserRpcRequest: NSObject, DBXReq
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesTemplateError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilePropertiesTemplateError?
             var callError: DBXCallError?
             switch error {
@@ -1329,6 +1349,7 @@ public class DBXFilePropertiesTemplatesUpdateForUserRpcRequest: NSObject, DBXReq
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesUpdateTemplateResult?, DBXFilePropertiesModifyTemplateError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1337,9 +1358,10 @@ public class DBXFilePropertiesTemplatesUpdateForUserRpcRequest: NSObject, DBXReq
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilePropertiesUpdateTemplateResult?, DBXFilePropertiesModifyTemplateError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilePropertiesModifyTemplateError?
             var callError: DBXCallError?
             switch error {
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXFileRequestsRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXFileRequestsRoutes.swift
index 29f88454..a4fbf53f 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXFileRequestsRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXFileRequestsRoutes.swift
@@ -221,6 +221,7 @@ public class DBXFileRequestsCountRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsCountFileRequestsResult?, DBXFileRequestsCountFileRequestsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -229,9 +230,10 @@ public class DBXFileRequestsCountRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsCountFileRequestsResult?, DBXFileRequestsCountFileRequestsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsCountFileRequestsError?
             var callError: DBXCallError?
             switch error {
@@ -288,6 +290,7 @@ public class DBXFileRequestsCreateRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsFileRequest?, DBXFileRequestsCreateFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -296,9 +299,10 @@ public class DBXFileRequestsCreateRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsFileRequest?, DBXFileRequestsCreateFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsCreateFileRequestError?
             var callError: DBXCallError?
             switch error {
@@ -355,6 +359,7 @@ public class DBXFileRequestsDeleteRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsDeleteFileRequestsResult?, DBXFileRequestsDeleteFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -363,9 +368,10 @@ public class DBXFileRequestsDeleteRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsDeleteFileRequestsResult?, DBXFileRequestsDeleteFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsDeleteFileRequestError?
             var callError: DBXCallError?
             switch error {
@@ -422,6 +428,7 @@ public class DBXFileRequestsDeleteAllClosedRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsDeleteAllClosedFileRequestsResult?, DBXFileRequestsDeleteAllClosedFileRequestsError?, DBXCallError?)
             -> Void
     ) -> Self {
@@ -431,10 +438,11 @@ public class DBXFileRequestsDeleteAllClosedRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsDeleteAllClosedFileRequestsResult?, DBXFileRequestsDeleteAllClosedFileRequestsError?, DBXCallError?)
             -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsDeleteAllClosedFileRequestsError?
             var callError: DBXCallError?
             switch error {
@@ -491,6 +499,7 @@ public class DBXFileRequestsGetRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsFileRequest?, DBXFileRequestsGetFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -499,9 +508,10 @@ public class DBXFileRequestsGetRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsFileRequest?, DBXFileRequestsGetFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsGetFileRequestError?
             var callError: DBXCallError?
             switch error {
@@ -558,6 +568,7 @@ public class DBXFileRequestsList_RpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsListFileRequestsResult?, DBXFileRequestsListFileRequestsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -566,9 +577,10 @@ public class DBXFileRequestsList_RpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsListFileRequestsResult?, DBXFileRequestsListFileRequestsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsListFileRequestsError?
             var callError: DBXCallError?
             switch error {
@@ -625,6 +637,7 @@ public class DBXFileRequestsList_RpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsListFileRequestsV2Result?, DBXFileRequestsListFileRequestsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -633,9 +646,10 @@ public class DBXFileRequestsList_RpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsListFileRequestsV2Result?, DBXFileRequestsListFileRequestsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsListFileRequestsError?
             var callError: DBXCallError?
             switch error {
@@ -692,6 +706,7 @@ public class DBXFileRequestsListContinueRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsListFileRequestsV2Result?, DBXFileRequestsListFileRequestsContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -700,9 +715,10 @@ public class DBXFileRequestsListContinueRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsListFileRequestsV2Result?, DBXFileRequestsListFileRequestsContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsListFileRequestsContinueError?
             var callError: DBXCallError?
             switch error {
@@ -759,6 +775,7 @@ public class DBXFileRequestsUpdateRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsFileRequest?, DBXFileRequestsUpdateFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -767,9 +784,10 @@ public class DBXFileRequestsUpdateRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFileRequestsFileRequest?, DBXFileRequestsUpdateFileRequestError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFileRequestsUpdateFileRequestError?
             var callError: DBXCallError?
             switch error {
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilesRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilesRoutes.swift
index aa6e6991..77e90563 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilesRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXFilesRoutes.swift
@@ -2595,6 +2595,7 @@ public class DBXFilesCopyRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationResult?, DBXFilesRelocationError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2603,9 +2604,10 @@ public class DBXFilesCopyRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationResult?, DBXFilesRelocationError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesRelocationError?
             var callError: DBXCallError?
             switch error {
@@ -2718,6 +2720,7 @@ public class DBXFilesCopyBatchRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2Launch?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2726,9 +2729,10 @@ public class DBXFilesCopyBatchRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2Launch?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesRelocationBatchV2Launch?
             if let swift = result {
                 objc = DBXFilesRelocationBatchV2Launch.factory(swift: swift)
@@ -2841,6 +2845,7 @@ public class DBXFilesCopyBatchCheckRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2JobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2849,9 +2854,10 @@ public class DBXFilesCopyBatchCheckRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2JobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -2908,6 +2914,7 @@ public class DBXFilesCopyReferenceGetRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetCopyReferenceResult?, DBXFilesGetCopyReferenceError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2916,9 +2923,10 @@ public class DBXFilesCopyReferenceGetRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetCopyReferenceResult?, DBXFilesGetCopyReferenceError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesGetCopyReferenceError?
             var callError: DBXCallError?
             switch error {
@@ -2975,6 +2983,7 @@ public class DBXFilesCopyReferenceSaveRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSaveCopyReferenceResult?, DBXFilesSaveCopyReferenceError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2983,9 +2992,10 @@ public class DBXFilesCopyReferenceSaveRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSaveCopyReferenceResult?, DBXFilesSaveCopyReferenceError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesSaveCopyReferenceError?
             var callError: DBXCallError?
             switch error {
@@ -3109,6 +3119,7 @@ public class DBXFilesCreateFolderRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesCreateFolderResult?, DBXFilesCreateFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3117,9 +3128,10 @@ public class DBXFilesCreateFolderRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesCreateFolderResult?, DBXFilesCreateFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesCreateFolderError?
             var callError: DBXCallError?
             switch error {
@@ -3176,6 +3188,7 @@ public class DBXFilesCreateFolderBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesCreateFolderBatchLaunch?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3184,9 +3197,10 @@ public class DBXFilesCreateFolderBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesCreateFolderBatchLaunch?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesCreateFolderBatchLaunch?
             if let swift = result {
                 objc = DBXFilesCreateFolderBatchLaunch.factory(swift: swift)
@@ -3232,6 +3246,7 @@ public class DBXFilesCreateFolderBatchCheckRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesCreateFolderBatchJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3240,9 +3255,10 @@ public class DBXFilesCreateFolderBatchCheckRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesCreateFolderBatchJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -3366,6 +3382,7 @@ public class DBXFilesDeleteRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteResult?, DBXFilesDeleteError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3374,9 +3391,10 @@ public class DBXFilesDeleteRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteResult?, DBXFilesDeleteError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesDeleteError?
             var callError: DBXCallError?
             switch error {
@@ -3433,6 +3451,7 @@ public class DBXFilesDeleteBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteBatchLaunch?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3441,9 +3460,10 @@ public class DBXFilesDeleteBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteBatchLaunch?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesDeleteBatchLaunch?
             if let swift = result {
                 objc = DBXFilesDeleteBatchLaunch.factory(swift: swift)
@@ -3489,6 +3509,7 @@ public class DBXFilesDeleteBatchCheckRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteBatchJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3497,9 +3518,10 @@ public class DBXFilesDeleteBatchCheckRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteBatchJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -4006,6 +4028,7 @@ public class DBXFilesGetFileLockBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesLockFileBatchResult?, DBXFilesLockFileError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4014,9 +4037,10 @@ public class DBXFilesGetFileLockBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesLockFileBatchResult?, DBXFilesLockFileError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesLockFileError?
             var callError: DBXCallError?
             switch error {
@@ -4073,6 +4097,7 @@ public class DBXFilesGetMetadataRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesMetadata?, DBXFilesGetMetadataError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4081,9 +4106,10 @@ public class DBXFilesGetMetadataRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesMetadata?, DBXFilesGetMetadataError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesGetMetadataError?
             var callError: DBXCallError?
             switch error {
@@ -4290,6 +4316,7 @@ public class DBXFilesGetTemporaryLinkRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetTemporaryLinkResult?, DBXFilesGetTemporaryLinkError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4298,9 +4325,10 @@ public class DBXFilesGetTemporaryLinkRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetTemporaryLinkResult?, DBXFilesGetTemporaryLinkError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesGetTemporaryLinkError?
             var callError: DBXCallError?
             switch error {
@@ -4357,6 +4385,7 @@ public class DBXFilesGetTemporaryUploadLinkRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetTemporaryUploadLinkResult?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4365,9 +4394,10 @@ public class DBXFilesGetTemporaryUploadLinkRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetTemporaryUploadLinkResult?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesGetTemporaryUploadLinkResult?
             if let swift = result {
                 objc = DBXFilesGetTemporaryUploadLinkResult(swift: swift)
@@ -4713,6 +4743,7 @@ public class DBXFilesGetThumbnailBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetThumbnailBatchResult?, DBXFilesGetThumbnailBatchError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4721,9 +4752,10 @@ public class DBXFilesGetThumbnailBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetThumbnailBatchResult?, DBXFilesGetThumbnailBatchError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesGetThumbnailBatchError?
             var callError: DBXCallError?
             switch error {
@@ -4780,6 +4812,7 @@ public class DBXFilesListFolderRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderResult?, DBXFilesListFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4788,9 +4821,10 @@ public class DBXFilesListFolderRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderResult?, DBXFilesListFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesListFolderError?
             var callError: DBXCallError?
             switch error {
@@ -4847,6 +4881,7 @@ public class DBXFilesListFolderContinueRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderResult?, DBXFilesListFolderContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4855,9 +4890,10 @@ public class DBXFilesListFolderContinueRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderResult?, DBXFilesListFolderContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesListFolderContinueError?
             var callError: DBXCallError?
             switch error {
@@ -4914,6 +4950,7 @@ public class DBXFilesListFolderGetLatestCursorRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderGetLatestCursorResult?, DBXFilesListFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4922,9 +4959,10 @@ public class DBXFilesListFolderGetLatestCursorRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderGetLatestCursorResult?, DBXFilesListFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesListFolderError?
             var callError: DBXCallError?
             switch error {
@@ -4981,6 +5019,7 @@ public class DBXFilesListFolderLongpollRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderLongpollResult?, DBXFilesListFolderLongpollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -4989,9 +5028,10 @@ public class DBXFilesListFolderLongpollRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListFolderLongpollResult?, DBXFilesListFolderLongpollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesListFolderLongpollError?
             var callError: DBXCallError?
             switch error {
@@ -5048,6 +5088,7 @@ public class DBXFilesListRevisionsRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListRevisionsResult?, DBXFilesListRevisionsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -5056,9 +5097,10 @@ public class DBXFilesListRevisionsRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesListRevisionsResult?, DBXFilesListRevisionsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesListRevisionsError?
             var callError: DBXCallError?
             switch error {
@@ -5115,6 +5157,7 @@ public class DBXFilesLockFileBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesLockFileBatchResult?, DBXFilesLockFileError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -5123,9 +5166,10 @@ public class DBXFilesLockFileBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesLockFileBatchResult?, DBXFilesLockFileError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesLockFileError?
             var callError: DBXCallError?
             switch error {
@@ -5249,6 +5293,7 @@ public class DBXFilesMoveRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationResult?, DBXFilesRelocationError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -5257,9 +5302,10 @@ public class DBXFilesMoveRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationResult?, DBXFilesRelocationError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesRelocationError?
             var callError: DBXCallError?
             switch error {
@@ -5372,6 +5418,7 @@ public class DBXFilesMoveBatchRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2Launch?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -5380,9 +5427,10 @@ public class DBXFilesMoveBatchRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2Launch?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesRelocationBatchV2Launch?
             if let swift = result {
                 objc = DBXFilesRelocationBatchV2Launch.factory(swift: swift)
@@ -5495,6 +5543,7 @@ public class DBXFilesMoveBatchCheckRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2JobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -5503,9 +5552,10 @@ public class DBXFilesMoveBatchCheckRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRelocationBatchV2JobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -5708,6 +5758,7 @@ public class DBXFilesPermanentlyDeleteRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -5716,9 +5767,10 @@ public class DBXFilesPermanentlyDeleteRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesDeleteError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilesDeleteError?
             var callError: DBXCallError?
             switch error {
@@ -6157,6 +6209,7 @@ public class DBXFilesRestoreRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesFileMetadata?, DBXFilesRestoreError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6165,9 +6218,10 @@ public class DBXFilesRestoreRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesFileMetadata?, DBXFilesRestoreError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesRestoreError?
             var callError: DBXCallError?
             switch error {
@@ -6224,6 +6278,7 @@ public class DBXFilesSaveUrlRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSaveUrlResult?, DBXFilesSaveUrlError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6232,9 +6287,10 @@ public class DBXFilesSaveUrlRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSaveUrlResult?, DBXFilesSaveUrlError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesSaveUrlError?
             var callError: DBXCallError?
             switch error {
@@ -6291,6 +6347,7 @@ public class DBXFilesSaveUrlCheckJobStatusRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSaveUrlJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6299,9 +6356,10 @@ public class DBXFilesSaveUrlCheckJobStatusRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSaveUrlJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -6425,6 +6483,7 @@ public class DBXFilesSearchRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSearchV2Result?, DBXFilesSearchError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6433,9 +6492,10 @@ public class DBXFilesSearchRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSearchV2Result?, DBXFilesSearchError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesSearchError?
             var callError: DBXCallError?
             switch error {
@@ -6492,6 +6552,7 @@ public class DBXFilesSearchContinueRpcRequestV2: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSearchV2Result?, DBXFilesSearchError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6500,9 +6561,10 @@ public class DBXFilesSearchContinueRpcRequestV2: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesSearchV2Result?, DBXFilesSearchError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesSearchError?
             var callError: DBXCallError?
             switch error {
@@ -6559,6 +6621,7 @@ public class DBXFilesTagsAddRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesAddTagError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6567,9 +6630,10 @@ public class DBXFilesTagsAddRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesAddTagError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilesAddTagError?
             var callError: DBXCallError?
             switch error {
@@ -6622,6 +6686,7 @@ public class DBXFilesTagsGetRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetTagsResult?, DBXFilesBaseTagError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6630,9 +6695,10 @@ public class DBXFilesTagsGetRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesGetTagsResult?, DBXFilesBaseTagError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesBaseTagError?
             var callError: DBXCallError?
             switch error {
@@ -6689,6 +6755,7 @@ public class DBXFilesTagsRemoveRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRemoveTagError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6697,9 +6764,10 @@ public class DBXFilesTagsRemoveRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesRemoveTagError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXFilesRemoveTagError?
             var callError: DBXCallError?
             switch error {
@@ -6752,6 +6820,7 @@ public class DBXFilesUnlockFileBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesLockFileBatchResult?, DBXFilesLockFileError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -6760,9 +6829,10 @@ public class DBXFilesUnlockFileBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesLockFileBatchResult?, DBXFilesLockFileError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXFilesLockFileError?
             var callError: DBXCallError?
             switch error {
@@ -7159,6 +7229,7 @@ public class DBXFilesUploadSessionFinishBatchRpcRequestV2: NSObject, DBXRequest
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesUploadSessionFinishBatchResult?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -7167,9 +7238,10 @@ public class DBXFilesUploadSessionFinishBatchRpcRequestV2: NSObject, DBXRequest
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesUploadSessionFinishBatchResult?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesUploadSessionFinishBatchResult?
             if let swift = result {
                 objc = DBXFilesUploadSessionFinishBatchResult(swift: swift)
@@ -7215,6 +7287,7 @@ public class DBXFilesUploadSessionFinishBatchCheckRpcRequest: NSObject, DBXReque
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesUploadSessionFinishBatchJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -7223,9 +7296,10 @@ public class DBXFilesUploadSessionFinishBatchCheckRpcRequest: NSObject, DBXReque
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesUploadSessionFinishBatchJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -7355,6 +7429,7 @@ public class DBXFilesUploadSessionStartBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesUploadSessionStartBatchResult?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -7363,9 +7438,10 @@ public class DBXFilesUploadSessionStartBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXFilesUploadSessionStartBatchResult?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXFilesUploadSessionStartBatchResult?
             if let swift = result {
                 objc = DBXFilesUploadSessionStartBatchResult(swift: swift)
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXOpenidRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXOpenidRoutes.swift
index be44389e..ad5b4717 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXOpenidRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXOpenidRoutes.swift
@@ -44,6 +44,7 @@ public class DBXOpenidUserinfoRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXOpenidUserInfoResult?, DBXOpenidUserInfoError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -52,9 +53,10 @@ public class DBXOpenidUserinfoRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXOpenidUserInfoResult?, DBXOpenidUserInfoError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXOpenidUserInfoError?
             var callError: DBXCallError?
             switch error {
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXSharingRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXSharingRoutes.swift
index 44404ad7..e80ce892 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXSharingRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXSharingRoutes.swift
@@ -1095,6 +1095,7 @@ public class DBXSharingAddFileMemberRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXSharingFileMemberActionResult]?, DBXSharingAddFileMemberError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1103,9 +1104,10 @@ public class DBXSharingAddFileMemberRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXSharingFileMemberActionResult]?, DBXSharingAddFileMemberError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingAddFileMemberError?
             var callError: DBXCallError?
             switch error {
@@ -1162,6 +1164,7 @@ public class DBXSharingAddFolderMemberRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingAddFolderMemberError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1170,9 +1173,10 @@ public class DBXSharingAddFolderMemberRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingAddFolderMemberError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXSharingAddFolderMemberError?
             var callError: DBXCallError?
             switch error {
@@ -1225,6 +1229,7 @@ public class DBXSharingCheckJobStatusRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1233,9 +1238,10 @@ public class DBXSharingCheckJobStatusRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -1292,6 +1298,7 @@ public class DBXSharingCheckRemoveMemberJobStatusRpcRequest: NSObject, DBXReques
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingRemoveMemberJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1300,9 +1307,10 @@ public class DBXSharingCheckRemoveMemberJobStatusRpcRequest: NSObject, DBXReques
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingRemoveMemberJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -1359,6 +1367,7 @@ public class DBXSharingCheckShareJobStatusRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingShareFolderJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1367,9 +1376,10 @@ public class DBXSharingCheckShareJobStatusRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingShareFolderJobStatus?, DBXAsyncPollError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXAsyncPollError?
             var callError: DBXCallError?
             switch error {
@@ -1493,6 +1503,7 @@ public class DBXSharingCreateSharedLinkWithSettingsRpcRequest: NSObject, DBXRequ
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedLinkMetadata?, DBXSharingCreateSharedLinkWithSettingsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1501,9 +1512,10 @@ public class DBXSharingCreateSharedLinkWithSettingsRpcRequest: NSObject, DBXRequ
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedLinkMetadata?, DBXSharingCreateSharedLinkWithSettingsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingCreateSharedLinkWithSettingsError?
             var callError: DBXCallError?
             switch error {
@@ -1560,6 +1572,7 @@ public class DBXSharingGetFileMetadataRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFileMetadata?, DBXSharingGetFileMetadataError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1568,9 +1581,10 @@ public class DBXSharingGetFileMetadataRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFileMetadata?, DBXSharingGetFileMetadataError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingGetFileMetadataError?
             var callError: DBXCallError?
             switch error {
@@ -1627,6 +1641,7 @@ public class DBXSharingGetFileMetadataBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXSharingGetFileMetadataBatchResult]?, DBXSharingSharingUserError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1635,9 +1650,10 @@ public class DBXSharingGetFileMetadataBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXSharingGetFileMetadataBatchResult]?, DBXSharingSharingUserError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSharingUserError?
             var callError: DBXCallError?
             switch error {
@@ -1694,6 +1710,7 @@ public class DBXSharingGetFolderMetadataRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMetadata?, DBXSharingSharedFolderAccessError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1702,9 +1719,10 @@ public class DBXSharingGetFolderMetadataRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMetadata?, DBXSharingSharedFolderAccessError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSharedFolderAccessError?
             var callError: DBXCallError?
             switch error {
@@ -1911,6 +1929,7 @@ public class DBXSharingGetSharedLinkMetadataRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedLinkMetadata?, DBXSharingSharedLinkError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -1919,9 +1938,10 @@ public class DBXSharingGetSharedLinkMetadataRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedLinkMetadata?, DBXSharingSharedLinkError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSharedLinkError?
             var callError: DBXCallError?
             switch error {
@@ -2045,6 +2065,7 @@ public class DBXSharingListFileMembersRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFileMembers?, DBXSharingListFileMembersError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2053,9 +2074,10 @@ public class DBXSharingListFileMembersRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFileMembers?, DBXSharingListFileMembersError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListFileMembersError?
             var callError: DBXCallError?
             switch error {
@@ -2112,6 +2134,7 @@ public class DBXSharingListFileMembersBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXSharingListFileMembersBatchResult]?, DBXSharingSharingUserError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2120,9 +2143,10 @@ public class DBXSharingListFileMembersBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXSharingListFileMembersBatchResult]?, DBXSharingSharingUserError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSharingUserError?
             var callError: DBXCallError?
             switch error {
@@ -2179,6 +2203,7 @@ public class DBXSharingListFileMembersContinueRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFileMembers?, DBXSharingListFileMembersContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2187,9 +2212,10 @@ public class DBXSharingListFileMembersContinueRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFileMembers?, DBXSharingListFileMembersContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListFileMembersContinueError?
             var callError: DBXCallError?
             switch error {
@@ -2246,6 +2272,7 @@ public class DBXSharingListFolderMembersRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMembers?, DBXSharingSharedFolderAccessError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2254,9 +2281,10 @@ public class DBXSharingListFolderMembersRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMembers?, DBXSharingSharedFolderAccessError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSharedFolderAccessError?
             var callError: DBXCallError?
             switch error {
@@ -2313,6 +2341,7 @@ public class DBXSharingListFolderMembersContinueRpcRequest: NSObject, DBXRequest
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMembers?, DBXSharingListFolderMembersContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2321,9 +2350,10 @@ public class DBXSharingListFolderMembersContinueRpcRequest: NSObject, DBXRequest
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMembers?, DBXSharingListFolderMembersContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListFolderMembersContinueError?
             var callError: DBXCallError?
             switch error {
@@ -2380,6 +2410,7 @@ public class DBXSharingListFoldersRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2388,9 +2419,10 @@ public class DBXSharingListFoldersRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXSharingListFoldersResult?
             if let swift = result {
                 objc = DBXSharingListFoldersResult(swift: swift)
@@ -2436,6 +2468,7 @@ public class DBXSharingListFoldersContinueRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXSharingListFoldersContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2444,9 +2477,10 @@ public class DBXSharingListFoldersContinueRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXSharingListFoldersContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListFoldersContinueError?
             var callError: DBXCallError?
             switch error {
@@ -2503,6 +2537,7 @@ public class DBXSharingListMountableFoldersRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2511,9 +2546,10 @@ public class DBXSharingListMountableFoldersRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXSharingListFoldersResult?
             if let swift = result {
                 objc = DBXSharingListFoldersResult(swift: swift)
@@ -2559,6 +2595,7 @@ public class DBXSharingListMountableFoldersContinueRpcRequest: NSObject, DBXRequ
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXSharingListFoldersContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2567,9 +2604,10 @@ public class DBXSharingListMountableFoldersContinueRpcRequest: NSObject, DBXRequ
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFoldersResult?, DBXSharingListFoldersContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListFoldersContinueError?
             var callError: DBXCallError?
             switch error {
@@ -2626,6 +2664,7 @@ public class DBXSharingListReceivedFilesRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFilesResult?, DBXSharingSharingUserError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2634,9 +2673,10 @@ public class DBXSharingListReceivedFilesRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFilesResult?, DBXSharingSharingUserError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSharingUserError?
             var callError: DBXCallError?
             switch error {
@@ -2693,6 +2733,7 @@ public class DBXSharingListReceivedFilesContinueRpcRequest: NSObject, DBXRequest
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFilesResult?, DBXSharingListFilesContinueError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2701,9 +2742,10 @@ public class DBXSharingListReceivedFilesContinueRpcRequest: NSObject, DBXRequest
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListFilesResult?, DBXSharingListFilesContinueError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListFilesContinueError?
             var callError: DBXCallError?
             switch error {
@@ -2760,6 +2802,7 @@ public class DBXSharingListSharedLinksRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListSharedLinksResult?, DBXSharingListSharedLinksError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2768,9 +2811,10 @@ public class DBXSharingListSharedLinksRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingListSharedLinksResult?, DBXSharingListSharedLinksError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingListSharedLinksError?
             var callError: DBXCallError?
             switch error {
@@ -2827,6 +2871,7 @@ public class DBXSharingModifySharedLinkSettingsRpcRequest: NSObject, DBXRequest
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedLinkMetadata?, DBXSharingModifySharedLinkSettingsError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2835,9 +2880,10 @@ public class DBXSharingModifySharedLinkSettingsRpcRequest: NSObject, DBXRequest
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedLinkMetadata?, DBXSharingModifySharedLinkSettingsError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingModifySharedLinkSettingsError?
             var callError: DBXCallError?
             switch error {
@@ -2894,6 +2940,7 @@ public class DBXSharingMountFolderRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMetadata?, DBXSharingMountFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2902,9 +2949,10 @@ public class DBXSharingMountFolderRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMetadata?, DBXSharingMountFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingMountFolderError?
             var callError: DBXCallError?
             switch error {
@@ -2961,6 +3009,7 @@ public class DBXSharingRelinquishFileMembershipRpcRequest: NSObject, DBXRequest
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingRelinquishFileMembershipError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -2969,9 +3018,10 @@ public class DBXSharingRelinquishFileMembershipRpcRequest: NSObject, DBXRequest
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingRelinquishFileMembershipError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXSharingRelinquishFileMembershipError?
             var callError: DBXCallError?
             switch error {
@@ -3024,6 +3074,7 @@ public class DBXSharingRelinquishFolderMembershipRpcRequest: NSObject, DBXReques
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAsyncLaunchEmptyResult?, DBXSharingRelinquishFolderMembershipError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3032,9 +3083,10 @@ public class DBXSharingRelinquishFolderMembershipRpcRequest: NSObject, DBXReques
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAsyncLaunchEmptyResult?, DBXSharingRelinquishFolderMembershipError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingRelinquishFolderMembershipError?
             var callError: DBXCallError?
             switch error {
@@ -3158,6 +3210,7 @@ public class DBXSharingRemoveFileMember2RpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingFileMemberRemoveActionResult?, DBXSharingRemoveFileMemberError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3166,9 +3219,10 @@ public class DBXSharingRemoveFileMember2RpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingFileMemberRemoveActionResult?, DBXSharingRemoveFileMemberError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingRemoveFileMemberError?
             var callError: DBXCallError?
             switch error {
@@ -3225,6 +3279,7 @@ public class DBXSharingRemoveFolderMemberRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAsyncLaunchResultBase?, DBXSharingRemoveFolderMemberError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3233,9 +3288,10 @@ public class DBXSharingRemoveFolderMemberRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAsyncLaunchResultBase?, DBXSharingRemoveFolderMemberError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingRemoveFolderMemberError?
             var callError: DBXCallError?
             switch error {
@@ -3292,6 +3348,7 @@ public class DBXSharingRevokeSharedLinkRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingRevokeSharedLinkError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3300,9 +3357,10 @@ public class DBXSharingRevokeSharedLinkRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingRevokeSharedLinkError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXSharingRevokeSharedLinkError?
             var callError: DBXCallError?
             switch error {
@@ -3355,6 +3413,7 @@ public class DBXSharingSetAccessInheritanceRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingShareFolderLaunch?, DBXSharingSetAccessInheritanceError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3363,9 +3422,10 @@ public class DBXSharingSetAccessInheritanceRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingShareFolderLaunch?, DBXSharingSetAccessInheritanceError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingSetAccessInheritanceError?
             var callError: DBXCallError?
             switch error {
@@ -3422,6 +3482,7 @@ public class DBXSharingShareFolderRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingShareFolderLaunch?, DBXSharingShareFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3430,9 +3491,10 @@ public class DBXSharingShareFolderRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingShareFolderLaunch?, DBXSharingShareFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingShareFolderError?
             var callError: DBXCallError?
             switch error {
@@ -3489,6 +3551,7 @@ public class DBXSharingTransferFolderRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingTransferFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3497,9 +3560,10 @@ public class DBXSharingTransferFolderRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingTransferFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXSharingTransferFolderError?
             var callError: DBXCallError?
             switch error {
@@ -3552,6 +3616,7 @@ public class DBXSharingUnmountFolderRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingUnmountFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3560,9 +3625,10 @@ public class DBXSharingUnmountFolderRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingUnmountFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXSharingUnmountFolderError?
             var callError: DBXCallError?
             switch error {
@@ -3615,6 +3681,7 @@ public class DBXSharingUnshareFileRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingUnshareFileError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3623,9 +3690,10 @@ public class DBXSharingUnshareFileRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingUnshareFileError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { _, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { _, error in
             var routeError: DBXSharingUnshareFileError?
             var callError: DBXCallError?
             switch error {
@@ -3678,6 +3746,7 @@ public class DBXSharingUnshareFolderRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAsyncLaunchEmptyResult?, DBXSharingUnshareFolderError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3686,9 +3755,10 @@ public class DBXSharingUnshareFolderRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXAsyncLaunchEmptyResult?, DBXSharingUnshareFolderError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingUnshareFolderError?
             var callError: DBXCallError?
             switch error {
@@ -3745,6 +3815,7 @@ public class DBXSharingUpdateFileMemberRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingMemberAccessLevelResult?, DBXSharingFileMemberActionError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3753,9 +3824,10 @@ public class DBXSharingUpdateFileMemberRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingMemberAccessLevelResult?, DBXSharingFileMemberActionError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingFileMemberActionError?
             var callError: DBXCallError?
             switch error {
@@ -3812,6 +3884,7 @@ public class DBXSharingUpdateFolderMemberRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingMemberAccessLevelResult?, DBXSharingUpdateFolderMemberError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3820,9 +3893,10 @@ public class DBXSharingUpdateFolderMemberRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingMemberAccessLevelResult?, DBXSharingUpdateFolderMemberError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingUpdateFolderMemberError?
             var callError: DBXCallError?
             switch error {
@@ -3879,6 +3953,7 @@ public class DBXSharingUpdateFolderPolicyRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMetadata?, DBXSharingUpdateFolderPolicyError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -3887,9 +3962,10 @@ public class DBXSharingUpdateFolderPolicyRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXSharingSharedFolderMetadata?, DBXSharingUpdateFolderPolicyError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXSharingUpdateFolderPolicyError?
             var callError: DBXCallError?
             switch error {
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/DBXUsersRoutes.swift b/Source/SwiftyDropboxObjC/Shared/Generated/DBXUsersRoutes.swift
index c0f8ea05..b1de1084 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/DBXUsersRoutes.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/DBXUsersRoutes.swift
@@ -99,6 +99,7 @@ public class DBXUsersFeaturesGetValuesRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersUserFeaturesGetValuesBatchResult?, DBXUsersUserFeaturesGetValuesBatchError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -107,9 +108,10 @@ public class DBXUsersFeaturesGetValuesRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersUserFeaturesGetValuesBatchResult?, DBXUsersUserFeaturesGetValuesBatchError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXUsersUserFeaturesGetValuesBatchError?
             var callError: DBXCallError?
             switch error {
@@ -166,6 +168,7 @@ public class DBXUsersGetAccountRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersBasicAccount?, DBXUsersGetAccountError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -174,9 +177,10 @@ public class DBXUsersGetAccountRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersBasicAccount?, DBXUsersGetAccountError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXUsersGetAccountError?
             var callError: DBXCallError?
             switch error {
@@ -233,6 +237,7 @@ public class DBXUsersGetAccountBatchRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXUsersBasicAccount]?, DBXUsersGetAccountBatchError?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -241,9 +246,10 @@ public class DBXUsersGetAccountBatchRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping ([DBXUsersBasicAccount]?, DBXUsersGetAccountBatchError?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var routeError: DBXUsersGetAccountBatchError?
             var callError: DBXCallError?
             switch error {
@@ -300,6 +306,7 @@ public class DBXUsersGetCurrentAccountRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersFullAccount?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -308,9 +315,10 @@ public class DBXUsersGetCurrentAccountRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersFullAccount?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXUsersFullAccount?
             if let swift = result {
                 objc = DBXUsersFullAccount(swift: swift)
@@ -356,6 +364,7 @@ public class DBXUsersGetSpaceUsageRpcRequest: NSObject, DBXRequest {
 
     @objc
     @discardableResult public func response(
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersSpaceUsage?, DBXCallError?) -> Void
     ) -> Self {
         response(queue: nil, completionHandler: completionHandler)
@@ -364,9 +373,10 @@ public class DBXUsersGetSpaceUsageRpcRequest: NSObject, DBXRequest {
     @objc
     @discardableResult public func response(
         queue: DispatchQueue?,
+        analyticsBlock: AnalyticsBlock? = nil,
         completionHandler: @escaping (DBXUsersSpaceUsage?, DBXCallError?) -> Void
     ) -> Self {
-        swift.response(queue: queue) { result, error in
+        swift.response(queue: queue, analyticsBlock: analyticsBlock) { result, error in
             var objc: DBXUsersSpaceUsage?
             if let swift = result {
                 objc = DBXUsersSpaceUsage(swift: swift)
diff --git a/Source/SwiftyDropboxObjC/Shared/Generated/ShimSwiftObjcHelpers.swift b/Source/SwiftyDropboxObjC/Shared/Generated/ShimSwiftObjcHelpers.swift
index ec7fdce3..82776ed9 100644
--- a/Source/SwiftyDropboxObjC/Shared/Generated/ShimSwiftObjcHelpers.swift
+++ b/Source/SwiftyDropboxObjC/Shared/Generated/ShimSwiftObjcHelpers.swift
@@ -13,9 +13,15 @@ import stone_sdk_swift_objc
 public class SDKShimHelpers: NSObject {
     // MARK: DBAPIRpcTask
 
-    @objc public static func setResponseBlockRPC(block: @escaping DBRpcResponseBlockImpl, on task: DBXRequest, with queue: OperationQueue?) -> Bool {
+    @objc
+    @discardableResult public static func setResponseBlockRPC(
+        block: @escaping DBRpcResponseBlockImpl,
+        on task: DBXRequest,
+        with queue: OperationQueue?,
+        analyticsBlock: AnalyticsBlock?
+    ) -> Bool {
         if let task = task as? DBXAccountSetProfilePhotoRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXAccountSetProfilePhotoResultToDBOptional(object: result)
                 let mappedError = mapDBXAccountSetProfilePhotoErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -25,7 +31,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXAuthTokenRevokeRpcRequest {
-            task.response { networkError in
+            task.response(analyticsBlock: analyticsBlock) { networkError in
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(networkError == nil ? DBNilObject() : nil, nil, mappedCallError) }
                 Self.processCompletion(wrappedBlock, queue: queue)
@@ -33,7 +39,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXCheckUserRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXCheckEchoResultToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -42,7 +48,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXContactsDeleteManualContactsRpcRequest {
-            task.response { networkError in
+            task.response(analyticsBlock: analyticsBlock) { networkError in
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(networkError == nil ? DBNilObject() : nil, nil, mappedCallError) }
                 Self.processCompletion(wrappedBlock, queue: queue)
@@ -50,7 +56,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXContactsDeleteManualContactsBatchRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXContactsDeleteManualContactsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -59,7 +65,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesPropertiesAddRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilePropertiesAddPropertiesErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -68,7 +74,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesPropertiesOverwriteRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilePropertiesInvalidPropertyGroupErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -77,7 +83,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesPropertiesRemoveRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilePropertiesRemovePropertiesErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -86,7 +92,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesPropertiesSearchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilePropertiesPropertiesSearchResultToDBOptional(object: result)
                 let mappedError = mapDBXFilePropertiesPropertiesSearchErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -96,7 +102,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesPropertiesSearchContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilePropertiesPropertiesSearchResultToDBOptional(object: result)
                 let mappedError = mapDBXFilePropertiesPropertiesSearchContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -106,7 +112,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesPropertiesUpdateRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilePropertiesUpdatePropertiesErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -115,7 +121,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesTemplatesAddForUserRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilePropertiesAddTemplateResultToDBOptional(object: result)
                 let mappedError = mapDBXFilePropertiesModifyTemplateErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -125,7 +131,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesTemplatesGetForUserRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilePropertiesGetTemplateResultToDBOptional(object: result)
                 let mappedError = mapDBXFilePropertiesTemplateErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -135,7 +141,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesTemplatesListForUserRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilePropertiesListTemplateResultToDBOptional(object: result)
                 let mappedError = mapDBXFilePropertiesTemplateErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -145,7 +151,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesTemplatesRemoveForUserRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilePropertiesTemplateErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -154,7 +160,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilePropertiesTemplatesUpdateForUserRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilePropertiesUpdateTemplateResultToDBOptional(object: result)
                 let mappedError = mapDBXFilePropertiesModifyTemplateErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -164,7 +170,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsCountRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsCountFileRequestsResultToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsCountFileRequestsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -174,7 +180,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsCreateRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsFileRequestToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsCreateFileRequestErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -184,7 +190,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsDeleteRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsDeleteFileRequestsResultToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsDeleteFileRequestErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -194,7 +200,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsDeleteAllClosedRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsDeleteAllClosedFileRequestsResultToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsDeleteAllClosedFileRequestsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -204,7 +210,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsGetRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsFileRequestToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsGetFileRequestErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -214,7 +220,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsList_RpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsListFileRequestsResultToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsListFileRequestsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -224,7 +230,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsList_RpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsListFileRequestsV2ResultToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsListFileRequestsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -234,7 +240,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsListContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsListFileRequestsV2ResultToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsListFileRequestsContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -244,7 +250,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFileRequestsUpdateRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFileRequestsFileRequestToDBOptional(object: result)
                 let mappedError = mapDBXFileRequestsUpdateFileRequestErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -254,7 +260,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCopyRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesRelocationResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesRelocationErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -264,7 +270,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCopyBatchRpcRequestV2 {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesRelocationBatchV2LaunchToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -273,7 +279,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCopyBatchCheckRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesRelocationBatchV2JobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -283,7 +289,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCopyReferenceGetRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesGetCopyReferenceResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesGetCopyReferenceErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -293,7 +299,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCopyReferenceSaveRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesSaveCopyReferenceResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesSaveCopyReferenceErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -303,7 +309,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCreateFolderRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesCreateFolderResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesCreateFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -313,7 +319,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCreateFolderBatchRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesCreateFolderBatchLaunchToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -322,7 +328,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesCreateFolderBatchCheckRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesCreateFolderBatchJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -332,7 +338,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesDeleteRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesDeleteResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesDeleteErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -342,7 +348,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesDeleteBatchRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesDeleteBatchLaunchToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -351,7 +357,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesDeleteBatchCheckRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesDeleteBatchJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -361,7 +367,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesGetFileLockBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesLockFileBatchResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesLockFileErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -371,7 +377,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesGetMetadataRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesMetadataToDBOptional(object: result)
                 let mappedError = mapDBXFilesGetMetadataErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -381,7 +387,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesGetTemporaryLinkRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesGetTemporaryLinkResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesGetTemporaryLinkErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -391,7 +397,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesGetTemporaryUploadLinkRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesGetTemporaryUploadLinkResultToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -400,7 +406,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesGetThumbnailBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesGetThumbnailBatchResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesGetThumbnailBatchErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -410,7 +416,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesListFolderRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesListFolderResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesListFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -420,7 +426,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesListFolderContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesListFolderResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesListFolderContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -430,7 +436,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesListFolderGetLatestCursorRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesListFolderGetLatestCursorResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesListFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -440,7 +446,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesListFolderLongpollRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesListFolderLongpollResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesListFolderLongpollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -450,7 +456,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesListRevisionsRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesListRevisionsResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesListRevisionsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -460,7 +466,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesLockFileBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesLockFileBatchResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesLockFileErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -470,7 +476,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesMoveRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesRelocationResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesRelocationErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -480,7 +486,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesMoveBatchRpcRequestV2 {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesRelocationBatchV2LaunchToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -489,7 +495,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesMoveBatchCheckRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesRelocationBatchV2JobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -499,7 +505,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesPermanentlyDeleteRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilesDeleteErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -508,7 +514,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesRestoreRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesFileMetadataToDBOptional(object: result)
                 let mappedError = mapDBXFilesRestoreErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -518,7 +524,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesSaveUrlRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesSaveUrlResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesSaveUrlErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -528,7 +534,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesSaveUrlCheckJobStatusRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesSaveUrlJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -538,7 +544,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesSearchRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesSearchV2ResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesSearchErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -548,7 +554,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesSearchContinueRpcRequestV2 {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesSearchV2ResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesSearchErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -558,7 +564,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesTagsAddRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilesAddTagErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -567,7 +573,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesTagsGetRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesGetTagsResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesBaseTagErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -577,7 +583,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesTagsRemoveRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXFilesRemoveTagErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -586,7 +592,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesUnlockFileBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesLockFileBatchResultToDBOptional(object: result)
                 let mappedError = mapDBXFilesLockFileErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -596,7 +602,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesUploadSessionFinishBatchRpcRequestV2 {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesUploadSessionFinishBatchResultToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -605,7 +611,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesUploadSessionFinishBatchCheckRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXFilesUploadSessionFinishBatchJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -615,7 +621,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXFilesUploadSessionStartBatchRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXFilesUploadSessionStartBatchResultToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -624,7 +630,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXOpenidUserinfoRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXOpenidUserInfoResultToDBOptional(object: result)
                 let mappedError = mapDBXOpenidUserInfoErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -634,7 +640,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingAddFileMemberRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = result?.map { mapDBXSharingFileMemberActionResultToDBOptional(object: $0) }
                 let mappedError = mapDBXSharingAddFileMemberErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -644,7 +650,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingAddFolderMemberRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXSharingAddFolderMemberErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -653,7 +659,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingCheckJobStatusRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -663,7 +669,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingCheckRemoveMemberJobStatusRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingRemoveMemberJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -673,7 +679,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingCheckShareJobStatusRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingShareFolderJobStatusToDBOptional(object: result)
                 let mappedError = mapDBXAsyncPollErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -683,7 +689,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingCreateSharedLinkWithSettingsRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedLinkMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingCreateSharedLinkWithSettingsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -693,7 +699,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingGetFileMetadataRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFileMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingGetFileMetadataErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -703,7 +709,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingGetFileMetadataBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = result?.map { mapDBXSharingGetFileMetadataBatchResultToDBOptional(object: $0) }
                 let mappedError = mapDBXSharingSharingUserErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -713,7 +719,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingGetFolderMetadataRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFolderMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingSharedFolderAccessErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -723,7 +729,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingGetSharedLinkMetadataRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedLinkMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingSharedLinkErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -733,7 +739,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFileMembersRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFileMembersToDBOptional(object: result)
                 let mappedError = mapDBXSharingListFileMembersErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -743,7 +749,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFileMembersBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = result?.map { mapDBXSharingListFileMembersBatchResultToDBOptional(object: $0) }
                 let mappedError = mapDBXSharingSharingUserErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -753,7 +759,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFileMembersContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFileMembersToDBOptional(object: result)
                 let mappedError = mapDBXSharingListFileMembersContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -763,7 +769,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFolderMembersRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFolderMembersToDBOptional(object: result)
                 let mappedError = mapDBXSharingSharedFolderAccessErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -773,7 +779,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFolderMembersContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFolderMembersToDBOptional(object: result)
                 let mappedError = mapDBXSharingListFolderMembersContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -783,7 +789,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFoldersRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXSharingListFoldersResultToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -792,7 +798,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListFoldersContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingListFoldersResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingListFoldersContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -802,7 +808,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListMountableFoldersRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXSharingListFoldersResultToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -811,7 +817,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListMountableFoldersContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingListFoldersResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingListFoldersContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -821,7 +827,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListReceivedFilesRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingListFilesResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingSharingUserErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -831,7 +837,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListReceivedFilesContinueRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingListFilesResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingListFilesContinueErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -841,7 +847,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingListSharedLinksRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingListSharedLinksResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingListSharedLinksErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -851,7 +857,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingModifySharedLinkSettingsRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedLinkMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingModifySharedLinkSettingsErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -861,7 +867,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingMountFolderRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFolderMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingMountFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -871,7 +877,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingRelinquishFileMembershipRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXSharingRelinquishFileMembershipErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -880,7 +886,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingRelinquishFolderMembershipRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXAsyncLaunchEmptyResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingRelinquishFolderMembershipErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -890,7 +896,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingRemoveFileMember2RpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingFileMemberRemoveActionResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingRemoveFileMemberErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -900,7 +906,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingRemoveFolderMemberRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXAsyncLaunchResultBaseToDBOptional(object: result)
                 let mappedError = mapDBXSharingRemoveFolderMemberErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -910,7 +916,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingRevokeSharedLinkRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXSharingRevokeSharedLinkErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -919,7 +925,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingSetAccessInheritanceRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingShareFolderLaunchToDBOptional(object: result)
                 let mappedError = mapDBXSharingSetAccessInheritanceErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -929,7 +935,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingShareFolderRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingShareFolderLaunchToDBOptional(object: result)
                 let mappedError = mapDBXSharingShareFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -939,7 +945,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingTransferFolderRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXSharingTransferFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -948,7 +954,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingUnmountFolderRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXSharingUnmountFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -957,7 +963,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingUnshareFileRpcRequest {
-            task.response { routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { routeError, networkError in
                 let mappedError = mapDBXSharingUnshareFileErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block((networkError == nil && routeError == nil) ? DBNilObject() : nil, mappedError, mappedCallError) }
@@ -966,7 +972,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingUnshareFolderRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXAsyncLaunchEmptyResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingUnshareFolderErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -976,7 +982,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingUpdateFileMemberRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingMemberAccessLevelResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingFileMemberActionErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -986,7 +992,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingUpdateFolderMemberRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingMemberAccessLevelResultToDBOptional(object: result)
                 let mappedError = mapDBXSharingUpdateFolderMemberErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -996,7 +1002,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXSharingUpdateFolderPolicyRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXSharingSharedFolderMetadataToDBOptional(object: result)
                 let mappedError = mapDBXSharingUpdateFolderPolicyErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -1006,7 +1012,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXUsersFeaturesGetValuesRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXUsersUserFeaturesGetValuesBatchResultToDBOptional(object: result)
                 let mappedError = mapDBXUsersUserFeaturesGetValuesBatchErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -1016,7 +1022,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXUsersGetAccountRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = mapDBXUsersBasicAccountToDBOptional(object: result)
                 let mappedError = mapDBXUsersGetAccountErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -1026,7 +1032,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXUsersGetAccountBatchRpcRequest {
-            task.response { result, routeError, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, routeError, networkError in
                 let mappedResult = result?.map { mapDBXUsersBasicAccountToDBOptional(object: $0) }
                 let mappedError = mapDBXUsersGetAccountBatchErrorToDBOptional(object: routeError)
                 let mappedCallError = callErrorToDB(error: networkError)
@@ -1036,7 +1042,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXUsersGetCurrentAccountRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXUsersFullAccountToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
@@ -1045,7 +1051,7 @@ public class SDKShimHelpers: NSObject {
             return true
         }
         if let task = task as? DBXUsersGetSpaceUsageRpcRequest {
-            task.response { result, networkError in
+            task.response(analyticsBlock: analyticsBlock) { result, networkError in
                 let mappedResult = mapDBXUsersSpaceUsageToDBOptional(object: result)
                 let mappedCallError = callErrorToDB(error: networkError)
                 let wrappedBlock = { block(mappedResult, nil, mappedCallError) }
diff --git a/stone b/stone
index 0967c3e9..bd7e81e4 160000
--- a/stone
+++ b/stone
@@ -1 +1 @@
-Subproject commit 0967c3e959fb562c8bd802e6c8640d93984fa55a
+Subproject commit bd7e81e43d59fb7a64cc6d15c520d9cef12757c1