diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
index 24019a7..150af19 100644
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@@ -84,8 +84,8 @@
 		8E81AF729A30F5ECA98E4957ABF89F01 /* XCTAttachment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XCTAttachment.swift; path = Sources/SnapshotTesting/Common/XCTAttachment.swift; sourceTree = "<group>"; };
 		8EA768DC1D42E4FD47E36426C72E28CC /* Codable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Codable.swift; path = Sources/SnapshotTesting/Snapshotting/Codable.swift; sourceTree = "<group>"; };
 		9D69B7D69A3CE0D808D21C5359F7A458 /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Tests.release.xcconfig"; sourceTree = "<group>"; };
-		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		A037DBBCCACBFACB5C39A80B1C273043 /* libSnapshotTesting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libSnapshotTesting.a; path = libSnapshotTesting.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		A037DBBCCACBFACB5C39A80B1C273043 /* libSnapshotTesting.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSnapshotTesting.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A14291C54A2CF6FA5040ED2D8A3C45E4 /* String+SpecialCharacters.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+SpecialCharacters.swift"; path = "Sources/SnapshotTesting/Common/String+SpecialCharacters.swift"; sourceTree = "<group>"; };
 		A3AA62780C76EE340280B907E6EE9ABB /* Pods-Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Tests-acknowledgements.plist"; sourceTree = "<group>"; };
 		A9A2A86525F67A1B80B361B6A82BC083 /* NSViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NSViewController.swift; path = Sources/SnapshotTesting/Snapshotting/NSViewController.swift; sourceTree = "<group>"; };
@@ -105,7 +105,7 @@
 		EAE5F801C018365FF185FDF1A12E1DFD /* Description.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Description.swift; path = Sources/SnapshotTesting/Snapshotting/Description.swift; sourceTree = "<group>"; };
 		EE627EFAACDCCE4BFB3288376B9A5E48 /* Async.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Sources/SnapshotTesting/Async.swift; sourceTree = "<group>"; };
 		F91FAA7EE4A3A96553B09BE4A9E4BA9E /* NSView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NSView.swift; path = Sources/SnapshotTesting/Snapshotting/NSView.swift; sourceTree = "<group>"; };
-		FC95D668E217CFBB25845AA15162348B /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-Tests.a"; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FC95D668E217CFBB25845AA15162348B /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -218,7 +218,6 @@
 				8E81AF729A30F5ECA98E4957ABF89F01 /* XCTAttachment.swift */,
 				9C84AC09C964BFBFE49D9AE4DA269586 /* Support Files */,
 			);
-			name = SnapshotTesting;
 			path = SnapshotTesting;
 			sourceTree = "<group>";
 		};
@@ -305,7 +304,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1300;
 			};
 			buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 12.0";
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-Tests.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-Tests.xcscheme
index bf2bc13..09abe33 100644
--- a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-Tests.xcscheme
+++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting 1.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting 1.xcscheme
index f9ccc9f..0c71401 100644
--- a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting 1.xcscheme	
+++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting 1.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting.xcscheme
index f9ccc9f..0c71401 100644
--- a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting.xcscheme
+++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SnapshotTesting.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Tests/CrashControllerTests.swift b/Tests/CrashControllerTests.swift
index 518fa5a..23da6f9 100644
--- a/Tests/CrashControllerTests.swift
+++ b/Tests/CrashControllerTests.swift
@@ -16,7 +16,7 @@ final class CrashControllerTests: XCTestCase {
     
     var newCrash: CrashController {
         let resource = Resource(from: [:])
-        let network = Network()
+        let network = HTTPNetwork()
         let scheduler = Scheduler(with: network)
         
         let crash = CrashController(with: scheduler, resource: resource)
diff --git a/Tests/Library/JSON/EncodableTests.swift b/Tests/Library/JSON/EncodableTests.swift
index 15bdb4c..01f4c9d 100644
--- a/Tests/Library/JSON/EncodableTests.swift
+++ b/Tests/Library/JSON/EncodableTests.swift
@@ -20,7 +20,7 @@ struct FailMock: Encodable {
     let surname: String
     
     func encode(to encoder: Encoder) throws {
-        throw Network.Error.invalidData
+        throw HTTPNetwork.Error.invalidData
     }
 }
 
diff --git a/Tests/Library/Network/NetworkTests.swift b/Tests/Library/Network/HTTPNetworkTests.swift
similarity index 92%
rename from Tests/Library/Network/NetworkTests.swift
rename to Tests/Library/Network/HTTPNetworkTests.swift
index e3ac2b4..150c473 100644
--- a/Tests/Library/Network/NetworkTests.swift
+++ b/Tests/Library/Network/HTTPNetworkTests.swift
@@ -21,7 +21,7 @@ enum MockRouter: Routable {
     case badURL
     case ok
     
-    var method: Network.Method { return .get }
+    var method: HTTPNetwork.Method { return .get }
     
     var path: String {
         let status = "status/"
@@ -48,7 +48,7 @@ enum MockRouter: Routable {
             
             return request
         case .badURL:
-            throw Network.Error.invalidURL
+            throw HTTPNetwork.Error.invalidURL
         }
     }
 }
@@ -68,14 +68,14 @@ final class NetworkTests: XCTestCase {
     // MARK: - Tests
     
     func testConfiguration() {
-        let configuration = Network.Configuration.default
+        let configuration = HTTPNetwork.Configuration.default
         
         XCTAssertEqual(configuration.timeoutIntervalForRequest, 15.0)
         XCTAssertEqual(configuration.timeoutIntervalForResource, 15.0)
     }
     
     func testReset() {
-        let network = Network()
+        let network = HTTPNetwork()
         network.reset()
         
         // nothing here, if anything it would crash the whole test suite
@@ -84,7 +84,7 @@ final class NetworkTests: XCTestCase {
     func testMakingRequest_success() {
         let async = expectation(description: "network request success")
        
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = "test"
         
         let task = network.request(MockRouter.ok) {
@@ -103,7 +103,7 @@ final class NetworkTests: XCTestCase {
         var task: URLSessionTask?
         let async = expectation(description: "network request clientError")
         
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = "test"
         task = network.request(MockRouter.clientError) {
             switch $0 {
@@ -122,7 +122,7 @@ final class NetworkTests: XCTestCase {
     func testMakingRequest_serverError() {
         let async = expectation(description: "network request serverError")
         
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = "test"
         
         var task: URLSessionTask?
@@ -143,7 +143,7 @@ final class NetworkTests: XCTestCase {
     func testMakingRequest_failsWithAuth() {
         let async = expectation(description: "network request failsWithAuth")
         
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = nil
         
         var task: URLSessionTask?
@@ -164,7 +164,7 @@ final class NetworkTests: XCTestCase {
     func testMakingRequest_successWithConfiguration() {
         let async = expectation(description: "network request successWithConfiguration")
         
-        let network = Network()
+        let network = HTTPNetwork()
         network.configuration.additionalHeaders = [
             .authorization: "xxx"
         ]
@@ -189,7 +189,7 @@ final class NetworkTests: XCTestCase {
         let async = expectation(description: "network request failureWithBadURL")
         var error: Error?
         
-        let network = Network()
+        let network = HTTPNetwork()
         let task = network.request(MockRouter.badURL) {
             switch $0 {
             case .success:
@@ -214,7 +214,7 @@ final class NetworkTests: XCTestCase {
 
         let async = expectation(description: "network request clientError")
 
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = "test"
         
         task = network.upload(MockRouter.clientError, name: "test", file: Data()) {
@@ -236,7 +236,7 @@ final class NetworkTests: XCTestCase {
 
         let async = expectation(description: "network request clientError")
 
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = "test"
         
         task = network.upload(MockRouter.clientError, name: "test", file: Data(), parameters: ["1": "1", "2": "2"]) {
@@ -256,7 +256,7 @@ final class NetworkTests: XCTestCase {
     func testMakingUpload_serverError() {
         let async = expectation(description: "network request serverError")
 
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = "test"
 
         var task: URLSessionTask?
@@ -277,7 +277,7 @@ final class NetworkTests: XCTestCase {
     func testMakingUpload_failsWithAuth() {
         let async = expectation(description: "network request failsWithAuth")
 
-        let network = Network()
+        let network = HTTPNetwork()
         network.authorization = nil
 
         var task: URLSessionTask?
@@ -299,7 +299,7 @@ final class NetworkTests: XCTestCase {
         let async = expectation(description: "network request failureWithBadURL")
         var error: Error?
 
-        let network = Network()
+        let network = HTTPNetwork()
         let task = network.upload(MockRouter.badURL, name: "test", file: Data()) {
             switch $0 {
             case .success:
diff --git a/Tests/SchedulerTests.swift b/Tests/SchedulerTests.swift
index 6d4b8c1..c2aa8c7 100644
--- a/Tests/SchedulerTests.swift
+++ b/Tests/SchedulerTests.swift
@@ -25,7 +25,7 @@ final class SchedulerTests: XCTestCase {
     // MARK: - Tests
     
     func testMetricRequest() {
-        let network = Network()
+        let network = HTTPNetwork()
         let scheduler = Scheduler(with: network)
         let metric = Metric(descriptor: Metric.Descriptor(name: .appCrashTotal, description: "", unit: .bytes, type: .cumulativeDistribution, keys: []), timeseries: [])
         let resource = Resource(from: ["test":"test"])
@@ -41,7 +41,7 @@ final class SchedulerTests: XCTestCase {
     }
     
     func testTraceRequest() {
-        let network = Network()
+        let network = HTTPNetwork()
         let scheduler = Scheduler(with: network)
         let trace = TraceModel(id: "12345678", spans: [], resource: nil, type: .view)
         let test2 = expectation(description: "test2")
@@ -54,7 +54,7 @@ final class SchedulerTests: XCTestCase {
     }
     
     func testCrashRequest() {
-        let network = Network()
+        let network = HTTPNetwork()
         let scheduler = Scheduler(with: network)
         let crash = Crash(id: "id", timestamp: "1", title: "title", appVersion: "1", buildVersion: "1", osVersion: "1", deviceType: "ios", sessionId: "s1", network: "network", carrier: "c1", deviceId: "d1", eventIdentifier: "e1", crashedWithoutSession: false, report: Data())
         let test3 = expectation(description: "test3")
diff --git a/Tests/SwiftOnlyLoadTests.swift b/Tests/SwiftOnlyLoadTests.swift
index b17989d..014c508 100644
--- a/Tests/SwiftOnlyLoadTests.swift
+++ b/Tests/SwiftOnlyLoadTests.swift
@@ -25,8 +25,6 @@ final class SwiftOnlyLoadTests: XCTestCase {
     // MARK: - Tests
     
     func testSwiftStart() {
-        SwiftOnlyLoad.awake()
-        
         XCTAssertGreaterThan(Trace.currentSession, 0)
     }
     
diff --git a/Tests/TraceConfigurationInteractorTests.swift b/Tests/TraceConfigurationInteractorTests.swift
index d8e0f62..68a3df5 100644
--- a/Tests/TraceConfigurationInteractorTests.swift
+++ b/Tests/TraceConfigurationInteractorTests.swift
@@ -26,7 +26,7 @@ final class TraceConfigurationInteractorTests: XCTestCase {
     
     /// Use integration test target for .plist checks
     func testConfiguration_fails() {
-        let network = Network()
+        let network = HTTPNetwork()
         let configuration = TraceConfigurationInteractor(network: network)
         
         XCTAssertFalse(configuration.setup())
diff --git a/Tests/TracerTest.swift b/Tests/TracerTest.swift
index ac3504f..7a8f7ab 100644
--- a/Tests/TracerTest.swift
+++ b/Tests/TracerTest.swift
@@ -17,7 +17,7 @@ final class TracerTests: XCTestCase {
     
     let tracer: Tracer = {
         let resource = Resource(from: [:]) 
-        let network = Network()
+        let network = HTTPNetwork()
         let database = Database()
         let session = Session()
         let scheduler = Scheduler(with: network)
diff --git a/Tests/UIApplicationTests.swift b/Tests/UIApplicationTests.swift
index 121e2b6..6f514fc 100644
--- a/Tests/UIApplicationTests.swift
+++ b/Tests/UIApplicationTests.swift
@@ -27,14 +27,14 @@ final class UIApplicationTests: XCTestCase {
     func testCurrentViewController() {
         let application = UIApplication.shared
         
-        XCTAssertNil(application.currentViewController())
+        XCTAssertNil(application.currentViewController(from: nil))
     }
     
     func testCurrentViewController_viewController() {
         let application = UIApplication.shared
         let viewController = UIViewController()
         
-        XCTAssertNotNil(application.currentViewController(viewController))
+        XCTAssertNotNil(application.currentViewController(from: viewController))
     }
     
     func testCurrentViewController_navigationController() {
@@ -42,7 +42,7 @@ final class UIApplicationTests: XCTestCase {
         let viewController = UIViewController()
         let navigation = UINavigationController(rootViewController: viewController)
         
-        XCTAssertNotNil(application.currentViewController(navigation))
+        XCTAssertNotNil(application.currentViewController(from: navigation))
     }
     
     func testCurrentViewController_tabController() {
@@ -52,7 +52,7 @@ final class UIApplicationTests: XCTestCase {
         
         tab.viewControllers = [viewController]
         
-        XCTAssertNotNil(application.currentViewController(tab))
+        XCTAssertNotNil(application.currentViewController(from: tab))
     }
     
     func testCurrentViewController_tabController_3_viewcontroller() {
@@ -62,7 +62,7 @@ final class UIApplicationTests: XCTestCase {
         
         tab.viewControllers = viewControllers
         
-        XCTAssertNotNil(application.currentViewController(tab))
+        XCTAssertNotNil(application.currentViewController(from: tab))
     }
     
     func testCurrentViewController_tabController_7_viewcontroller() {
@@ -73,6 +73,6 @@ final class UIApplicationTests: XCTestCase {
         tab.viewControllers = viewControllers
         tab.selectedIndex = 5
         
-        XCTAssertNotNil(application.currentViewController(tab))
+        XCTAssertNotNil(application.currentViewController(from: tab))
     }
 }
diff --git a/Trace.xcodeproj/project.pbxproj b/Trace.xcodeproj/project.pbxproj
index 5e22ac4..1e48f3f 100644
--- a/Trace.xcodeproj/project.pbxproj
+++ b/Trace.xcodeproj/project.pbxproj
@@ -34,10 +34,10 @@
 /* Begin PBXBuildFile section */
 		1005759E229D87B2000343EE /* JSONDecoder+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1005759C229D87B2000343EE /* JSONDecoder+Helper.swift */; };
 		1005759F229D87B2000343EE /* Encodable+JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1005759D229D87B2000343EE /* Encodable+JSON.swift */; };
-		100575A5229D8994000343EE /* Network+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A0229D8994000343EE /* Network+Configuration.swift */; };
-		100575A6229D8994000343EE /* Network+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A1229D8994000343EE /* Network+Request.swift */; };
-		100575A7229D8994000343EE /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A2229D8994000343EE /* Network.swift */; };
-		100575A8229D8994000343EE /* Network+HTTP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A3229D8994000343EE /* Network+HTTP.swift */; };
+		100575A5229D8994000343EE /* HTTPNetwork+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A0229D8994000343EE /* HTTPNetwork+Configuration.swift */; };
+		100575A6229D8994000343EE /* HTTPNetwork+Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A1229D8994000343EE /* HTTPNetwork+Request.swift */; };
+		100575A7229D8994000343EE /* HTTPNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A2229D8994000343EE /* HTTPNetwork.swift */; };
+		100575A8229D8994000343EE /* HTTPNetwork+HTTP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A3229D8994000343EE /* HTTPNetwork+HTTP.swift */; };
 		100575A9229D8994000343EE /* Routable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100575A4229D8994000343EE /* Routable.swift */; };
 		1006100D23576729004EFC2C /* String+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1006100C23576729004EFC2C /* String+Hex.swift */; };
 		1008F5782350DFEF00689B2B /* OrderedDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1008F5772350DFEF00689B2B /* OrderedDictionary.swift */; };
@@ -180,8 +180,8 @@
 		101055CD2417AEE70088BD24 /* CrashesService+Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055CC2417AEE70088BD24 /* CrashesService+Router.swift */; };
 		101055D12417B4610088BD24 /* CrashesServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055D02417B4610088BD24 /* CrashesServiceTests.swift */; };
 		101055D52417F6EA0088BD24 /* CrashControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055D42417F6EA0088BD24 /* CrashControllerTests.swift */; };
-		101055D7241961410088BD24 /* Network+Upload.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055D6241961410088BD24 /* Network+Upload.swift */; };
-		101055D9241A70510088BD24 /* Network+Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055D8241A70510088BD24 /* Network+Validation.swift */; };
+		101055D7241961410088BD24 /* HTTPNetwork+Upload.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055D6241961410088BD24 /* HTTPNetwork+Upload.swift */; };
+		101055D9241A70510088BD24 /* HTTPNetwork+Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055D8241A70510088BD24 /* HTTPNetwork+Validation.swift */; };
 		101055DB241BACAB0088BD24 /* Data+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055DA241BACAB0088BD24 /* Data+Helper.swift */; };
 		101055E1241BED990088BD24 /* CrashesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055E0241BED990088BD24 /* CrashesTest.swift */; };
 		101055E3241BEE1D0088BD24 /* DataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 101055E2241BEE1D0088BD24 /* DataTests.swift */; };
@@ -260,7 +260,6 @@
 		104A69AA229403370065F218 /* libTrace.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 104A694C2293FB060065F218 /* libTrace.a */; };
 		104A69B22294039C0065F218 /* AppDelegate+Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 104A69B12294039C0065F218 /* AppDelegate+Application.swift */; };
 		104A69C42294076C0065F218 /* libTrace.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 104A694C2293FB060065F218 /* libTrace.a */; };
-		104EA0BB237EAE67004C07CE /* UIApplication+Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 104EA0BA237EAE67004C07CE /* UIApplication+Screenshot.swift */; };
 		104EA0BD23826CA1004C07CE /* Control+Swizzled.swift in Sources */ = {isa = PBXBuildFile; fileRef = 104EA0BC23826CA1004C07CE /* Control+Swizzled.swift */; };
 		104EA0C023829461004C07CE /* ControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 104EA0BF23829461004C07CE /* ControlViewController.swift */; };
 		104EA0C2238294FA004C07CE /* Control.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 104EA0C1238294FA004C07CE /* Control.storyboard */; };
@@ -333,6 +332,7 @@
 		1087A00D22DF82C5005F8F83 /* JSValue+Swizzled.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1087A00C22DF82C5005F8F83 /* JSValue+Swizzled.swift */; };
 		1087A01022E07700005F8F83 /* BitriseConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1087A00F22E07700005F8F83 /* BitriseConfiguration.swift */; };
 		1087A01222E07FF1005F8F83 /* BitriseConfigurationInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1087A01122E07FF1005F8F83 /* BitriseConfigurationInteractor.swift */; };
+		108981D626C2BA2600B2CF57 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 108981D526C2BA2600B2CF57 /* Network.framework */; };
 		108CDED723FC544800153BEB /* CrashReportingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 108CDED623FC544800153BEB /* CrashReportingTests.m */; platformFilter = ios; };
 		108CDEE023FC553B00153BEB /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1064993E23F6E9A300989C14 /* libz.tbd */; };
 		108CDEE323FC554B00153BEB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1064994323F6E9C300989C14 /* SystemConfiguration.framework */; };
@@ -564,7 +564,7 @@
 		10C98014231E5BF4008188CF /* ErrorFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10C98013231E5BF4008188CF /* ErrorFormatterTests.swift */; };
 		10C98016231E62D3008188CF /* CrashFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10C98015231E62D3008188CF /* CrashFormatterTests.swift */; };
 		10CA8760229D8D97003702B1 /* EncodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10CA875F229D8D97003702B1 /* EncodableTests.swift */; };
-		10CA8763229D8E38003702B1 /* NetworkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10CA8762229D8E38003702B1 /* NetworkTests.swift */; };
+		10CA8763229D8E38003702B1 /* HTTPNetworkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10CA8762229D8E38003702B1 /* HTTPNetworkTests.swift */; };
 		10CA8766229F1AE5003702B1 /* TraceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10CA8765229F1AE5003702B1 /* TraceService.swift */; };
 		10CA8768229F1B01003702B1 /* TraceService+Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10CA8767229F1B01003702B1 /* TraceService+Router.swift */; };
 		10CA876B229F1ED3003702B1 /* MetricsServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10CA876A229F1ED3003702B1 /* MetricsServiceTests.swift */; };
@@ -903,10 +903,10 @@
 /* Begin PBXFileReference section */
 		1005759C229D87B2000343EE /* JSONDecoder+Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JSONDecoder+Helper.swift"; sourceTree = "<group>"; };
 		1005759D229D87B2000343EE /* Encodable+JSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Encodable+JSON.swift"; sourceTree = "<group>"; };
-		100575A0229D8994000343EE /* Network+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Network+Configuration.swift"; sourceTree = "<group>"; };
-		100575A1229D8994000343EE /* Network+Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Network+Request.swift"; sourceTree = "<group>"; };
-		100575A2229D8994000343EE /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
-		100575A3229D8994000343EE /* Network+HTTP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Network+HTTP.swift"; sourceTree = "<group>"; };
+		100575A0229D8994000343EE /* HTTPNetwork+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HTTPNetwork+Configuration.swift"; sourceTree = "<group>"; };
+		100575A1229D8994000343EE /* HTTPNetwork+Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HTTPNetwork+Request.swift"; sourceTree = "<group>"; };
+		100575A2229D8994000343EE /* HTTPNetwork.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPNetwork.swift; sourceTree = "<group>"; };
+		100575A3229D8994000343EE /* HTTPNetwork+HTTP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HTTPNetwork+HTTP.swift"; sourceTree = "<group>"; };
 		100575A4229D8994000343EE /* Routable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Routable.swift; sourceTree = "<group>"; };
 		1006100C23576729004EFC2C /* String+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Hex.swift"; sourceTree = "<group>"; };
 		1008F5772350DFEF00689B2B /* OrderedDictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderedDictionary.swift; sourceTree = "<group>"; };
@@ -1050,8 +1050,8 @@
 		101055CC2417AEE70088BD24 /* CrashesService+Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrashesService+Router.swift"; sourceTree = "<group>"; };
 		101055D02417B4610088BD24 /* CrashesServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CrashesServiceTests.swift; path = Tests/CrashesServiceTests.swift; sourceTree = SOURCE_ROOT; };
 		101055D42417F6EA0088BD24 /* CrashControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CrashControllerTests.swift; path = Tests/CrashControllerTests.swift; sourceTree = SOURCE_ROOT; };
-		101055D6241961410088BD24 /* Network+Upload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Network+Upload.swift"; sourceTree = "<group>"; };
-		101055D8241A70510088BD24 /* Network+Validation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Network+Validation.swift"; sourceTree = "<group>"; };
+		101055D6241961410088BD24 /* HTTPNetwork+Upload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPNetwork+Upload.swift"; sourceTree = "<group>"; };
+		101055D8241A70510088BD24 /* HTTPNetwork+Validation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPNetwork+Validation.swift"; sourceTree = "<group>"; };
 		101055DA241BACAB0088BD24 /* Data+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Helper.swift"; sourceTree = "<group>"; };
 		101055E0241BED990088BD24 /* CrashesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CrashesTest.swift; path = Tests/CrashesTest.swift; sourceTree = SOURCE_ROOT; };
 		101055E2241BEE1D0088BD24 /* DataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DataTests.swift; path = Tests/DataTests.swift; sourceTree = SOURCE_ROOT; };
@@ -1145,7 +1145,6 @@
 		104A69A7229403370065F218 /* InteroperabilityTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InteroperabilityTests.m; sourceTree = "<group>"; };
 		104A69A9229403370065F218 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		104A69B12294039C0065F218 /* AppDelegate+Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Application.swift"; sourceTree = "<group>"; };
-		104EA0BA237EAE67004C07CE /* UIApplication+Screenshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Screenshot.swift"; sourceTree = "<group>"; };
 		104EA0BC23826CA1004C07CE /* Control+Swizzled.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Control+Swizzled.swift"; sourceTree = "<group>"; };
 		104EA0BF23829461004C07CE /* ControlViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlViewController.swift; sourceTree = "<group>"; };
 		104EA0C1238294FA004C07CE /* Control.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Control.storyboard; sourceTree = "<group>"; };
@@ -1217,6 +1216,7 @@
 		1087A00C22DF82C5005F8F83 /* JSValue+Swizzled.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSValue+Swizzled.swift"; sourceTree = "<group>"; };
 		1087A00F22E07700005F8F83 /* BitriseConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitriseConfiguration.swift; sourceTree = "<group>"; };
 		1087A01122E07FF1005F8F83 /* BitriseConfigurationInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitriseConfigurationInteractor.swift; sourceTree = "<group>"; };
+		108981D526C2BA2600B2CF57 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk/System/Library/Frameworks/Network.framework; sourceTree = DEVELOPER_DIR; };
 		108CDED423FC544800153BEB /* CrashReportingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CrashReportingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		108CDED623FC544800153BEB /* CrashReportingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CrashReportingTests.m; sourceTree = "<group>"; };
 		108CDED823FC544800153BEB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1378,7 +1378,7 @@
 		10C98013231E5BF4008188CF /* ErrorFormatterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ErrorFormatterTests.swift; path = Tests/ErrorFormatterTests.swift; sourceTree = SOURCE_ROOT; };
 		10C98015231E62D3008188CF /* CrashFormatterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CrashFormatterTests.swift; path = Tests/CrashFormatterTests.swift; sourceTree = SOURCE_ROOT; };
 		10CA875F229D8D97003702B1 /* EncodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = EncodableTests.swift; path = Tests/Library/JSON/EncodableTests.swift; sourceTree = SOURCE_ROOT; };
-		10CA8762229D8E38003702B1 /* NetworkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = NetworkTests.swift; path = Tests/Library/Network/NetworkTests.swift; sourceTree = SOURCE_ROOT; };
+		10CA8762229D8E38003702B1 /* HTTPNetworkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HTTPNetworkTests.swift; path = Tests/Library/Network/HTTPNetworkTests.swift; sourceTree = SOURCE_ROOT; };
 		10CA8765229F1AE5003702B1 /* TraceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TraceService.swift; sourceTree = "<group>"; };
 		10CA8767229F1B01003702B1 /* TraceService+Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TraceService+Router.swift"; sourceTree = "<group>"; };
 		10CA876A229F1ED3003702B1 /* MetricsServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MetricsServiceTests.swift; path = Tests/Library/API/MetricsServiceTests.swift; sourceTree = SOURCE_ROOT; };
@@ -1530,6 +1530,7 @@
 				1087A00622DE0E04005F8F83 /* WebKit.framework in Frameworks */,
 				10C0499223E0944200822835 /* SystemConfiguration.framework in Frameworks */,
 				104A69C42294076C0065F218 /* libTrace.a in Frameworks */,
+				108981D626C2BA2600B2CF57 /* Network.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2236,7 +2237,6 @@
 			isa = PBXGroup;
 			children = (
 				1047952522C504D600E6B8A2 /* UIApplication+ViewController.swift */,
-				104EA0BA237EAE67004C07CE /* UIApplication+Screenshot.swift */,
 				10F2874A23C36C3100F9D03A /* UIDevice+Jailbreak.swift */,
 			);
 			name = UIKit;
@@ -2342,12 +2342,12 @@
 			isa = PBXGroup;
 			children = (
 				10CA8761229D8E0E003702B1 /* Tests */,
-				100575A2229D8994000343EE /* Network.swift */,
-				100575A0229D8994000343EE /* Network+Configuration.swift */,
-				100575A3229D8994000343EE /* Network+HTTP.swift */,
-				100575A1229D8994000343EE /* Network+Request.swift */,
-				101055D6241961410088BD24 /* Network+Upload.swift */,
-				101055D8241A70510088BD24 /* Network+Validation.swift */,
+				100575A2229D8994000343EE /* HTTPNetwork.swift */,
+				100575A0229D8994000343EE /* HTTPNetwork+Configuration.swift */,
+				100575A3229D8994000343EE /* HTTPNetwork+HTTP.swift */,
+				100575A1229D8994000343EE /* HTTPNetwork+Request.swift */,
+				101055D6241961410088BD24 /* HTTPNetwork+Upload.swift */,
+				101055D8241A70510088BD24 /* HTTPNetwork+Validation.swift */,
 				100575A4229D8994000343EE /* Routable.swift */,
 			);
 			path = Network;
@@ -2941,7 +2941,7 @@
 		10CA8761229D8E0E003702B1 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				10CA8762229D8E38003702B1 /* NetworkTests.swift */,
+				10CA8762229D8E38003702B1 /* HTTPNetworkTests.swift */,
 			);
 			name = Tests;
 			sourceTree = "<group>";
@@ -3310,6 +3310,7 @@
 		82F58DA35A9B2D1C5A2E9C94 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				108981D526C2BA2600B2CF57 /* Network.framework */,
 				101864BB262DFF6D0053B626 /* SystemConfiguration.framework */,
 				10BB4E742507C4E80044AB9E /* UIKit.framework */,
 				10BB4E6E25078F070044AB9E /* libc++.tbd */,
@@ -3785,7 +3786,7 @@
 			attributes = {
 				CLASSPREFIX = BR;
 				LastSwiftUpdateCheck = 1240;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = Bitrise;
 				TargetAttributes = {
 					100993D925003BB1006C7FB4 = {
@@ -3857,7 +3858,7 @@
 				};
 			};
 			buildConfigurationList = 104A69472293FB060065F218 /* Build configuration list for PBXProject "Trace" */;
-			compatibilityVersion = "Xcode 11.0";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -4685,7 +4686,7 @@
 				1043FC9123144A7400F75D27 /* URLSessionTask+Helper.swift in Sources */,
 				10DCA0972306ADA500F0281E /* ViewControllerFilter.swift in Sources */,
 				104EA0BD23826CA1004C07CE /* Control+Swizzled.swift in Sources */,
-				101055D9241A70510088BD24 /* Network+Validation.swift in Sources */,
+				101055D9241A70510088BD24 /* HTTPNetwork+Validation.swift in Sources */,
 				1087A01222E07FF1005F8F83 /* BitriseConfigurationInteractor.swift in Sources */,
 				1046CC3922BA87CF00A8762F /* ViewController+Swizzled.swift in Sources */,
 				1047952F22C69DC900E6B8A2 /* StartupFormatter.swift in Sources */,
@@ -4696,7 +4697,7 @@
 				10B6084B2535BE8F00DC1DB1 /* DispatchQueue.swift in Sources */,
 				1047952A22C5118D00E6B8A2 /* FPSFormatter.swift in Sources */,
 				10F2BC8522AFAD590074EE5D /* DataTaskFormatter.swift in Sources */,
-				100575A8229D8994000343EE /* Network+HTTP.swift in Sources */,
+				100575A8229D8994000343EE /* HTTPNetwork+HTTP.swift in Sources */,
 				10866F4222946B4E00D77D56 /* CPU.swift in Sources */,
 				1008F5782350DFEF00689B2B /* OrderedDictionary.swift in Sources */,
 				10B1BB6D22F9AAB900DEA77B /* Lifecycle.swift in Sources */,
@@ -4709,7 +4710,7 @@
 				10FC45D0230EB2550077BF2C /* URLStructure.swift in Sources */,
 				1091771D232F8CF1007CE2F0 /* Tracer.swift in Sources */,
 				1087A00D22DF82C5005F8F83 /* JSValue+Swizzled.swift in Sources */,
-				100575A6229D8994000343EE /* Network+Request.swift in Sources */,
+				100575A6229D8994000343EE /* HTTPNetwork+Request.swift in Sources */,
 				101055DB241BACAB0088BD24 /* Data+Helper.swift in Sources */,
 				10F2BC8822AFB2BC0074EE5D /* JSONEncodable.swift in Sources */,
 				10879FFB22DCA3F7005F8F83 /* ErrorFormatter.swift in Sources */,
@@ -4725,17 +4726,16 @@
 				10F2BC9A22B296530074EE5D /* Metric.swift in Sources */,
 				10F2BC8322AEBBAD0074EE5D /* RequestFormatter.swift in Sources */,
 				10B6086F25360E2700DC1DB1 /* DispatchQueueSynchronized.swift in Sources */,
-				100575A7229D8994000343EE /* Network.swift in Sources */,
+				100575A7229D8994000343EE /* HTTPNetwork.swift in Sources */,
 				1006100D23576729004EFC2C /* String+Hex.swift in Sources */,
 				10B8DF1B242A6BC00055D41E /* ULID.swift in Sources */,
-				104EA0BB237EAE67004C07CE /* UIApplication+Screenshot.swift in Sources */,
 				101055CB2417AEDF0088BD24 /* CrashesService.swift in Sources */,
 				1059295023096CE10004D340 /* Metric+Descriptor+Keys.swift in Sources */,
 				10FC45DF23117AA70077BF2C /* Timeseriesble.swift in Sources */,
 				10DCA09523045D5B00F0281E /* Double+Helper.swift in Sources */,
 				1005759F229D87B2000343EE /* Encodable+JSON.swift in Sources */,
 				109177212331315D007CE2F0 /* DBTrace.swift in Sources */,
-				101055D7241961410088BD24 /* Network+Upload.swift in Sources */,
+				101055D7241961410088BD24 /* HTTPNetwork+Upload.swift in Sources */,
 				104EA0C62382AA61004C07CE /* Gesture+Swizzled.swift in Sources */,
 				10F2874B23C36C3100F9D03A /* UIDevice+Jailbreak.swift in Sources */,
 				10127B8D22E7643D004B1F4C /* DAO.swift in Sources */,
@@ -4758,7 +4758,7 @@
 				10CA877B22A453FF003702B1 /* DeviceFormatter.swift in Sources */,
 				10CA938B24E2E01800F6A95E /* TraceConfigurationInteractor.swift in Sources */,
 				100993FB2500EA9C006C7FB4 /* Crash.swift in Sources */,
-				100575A5229D8994000343EE /* Network+Configuration.swift in Sources */,
+				100575A5229D8994000343EE /* HTTPNetwork+Configuration.swift in Sources */,
 				1046CC3F22BB894800A8762F /* ViewFormatter.swift in Sources */,
 				10CA938D24E2E23200F6A95E /* TraceSwizzleInteractor.swift in Sources */,
 				10CA8766229F1AE5003702B1 /* TraceService.swift in Sources */,
@@ -4865,7 +4865,7 @@
 				10EFEC11234799B60037CBBD /* SwiftOnlyLoadTests.swift in Sources */,
 				108D309B23292A93002757CC /* UUIDTests.swift in Sources */,
 				109136E424ACE69400476EF6 /* CollaterTests+AppMemoryBytes.swift in Sources */,
-				10CA8763229D8E38003702B1 /* NetworkTests.swift in Sources */,
+				10CA8763229D8E38003702B1 /* HTTPNetworkTests.swift in Sources */,
 				109136D224ACE3AA00476EF6 /* CollaterTests+AppRequestSizeBytes.swift in Sources */,
 				10CA8760229D8D97003702B1 /* EncodableTests.swift in Sources */,
 				102070BC24604DF400A75C45 /* DecodableTests.swift in Sources */,
@@ -5204,13 +5204,15 @@
 		100993E125003BB1006C7FB4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.7.36;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 72SA8V3WYL;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				OTHER_CFLAGS = (
 					"-fembed-bitcode",
 					"-fno-optimize-sibling-calls",
@@ -5237,13 +5239,15 @@
 		100993E225003BB1006C7FB4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.7.36;
 				DEVELOPMENT_TEAM = 72SA8V3WYL;
 				GCC_OPTIMIZATION_LEVEL = z;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				OTHER_CFLAGS = (
 					"-fembed-bitcode",
 					"-fno-optimize-sibling-calls",
@@ -5272,6 +5276,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
@@ -5292,6 +5297,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
@@ -5499,6 +5505,7 @@
 		104A69542293FB060065F218 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ANALYZER_GCD_PERFORMANCE = YES;
@@ -5518,13 +5525,14 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/Trace/**";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Trace/**";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = (
 					"-fembed-bitcode",
@@ -5562,6 +5570,7 @@
 		104A69552293FB060065F218 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ANALYZER_GCD_PERFORMANCE = YES;
@@ -5582,13 +5591,14 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/Trace/**";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Trace/**";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = (
 					"-fembed-bitcode",
@@ -5687,6 +5697,7 @@
 		104A6999229401280065F218 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "iOSDemo/Supporting Files/iOSDemo.entitlements";
@@ -5701,11 +5712,12 @@
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/iOSDemo/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -5730,6 +5742,7 @@
 		104A699A229401280065F218 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "iOSDemo/Supporting Files/iOSDemo.entitlements";
@@ -5742,11 +5755,12 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/iOSDemo/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/CrashReportingTests.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/CrashReportingTests.xcscheme
index 18c92c8..11876eb 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/CrashReportingTests.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/CrashReportingTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/Interoperability.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/Interoperability.xcscheme
index e34afd0..be3f88e 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/Interoperability.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/Interoperability.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
index a3dec4f..5c9de24 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
index 4e286fc..20d0405 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/Trace.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/Trace.xcscheme
index 0c18d30..0a1d5d8 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/Trace.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/Trace.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/TraceInternal.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/TraceInternal.xcscheme
index 6216fde..b9a9909 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/TraceInternal.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/TraceInternal.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/UniversalLib.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/UniversalLib.xcscheme
index bcc5ecf..e092168 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/UniversalLib.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/UniversalLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/UploadDSYM.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/UploadDSYM.xcscheme
index 11f1d74..842a71c 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/UploadDSYM.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/UploadDSYM.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme b/Trace.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme
index a34b9e0..6812f70 100644
--- a/Trace.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme
+++ b/Trace.xcodeproj/xcshareddata/xcschemes/iOSDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Trace/Configuration/TraceConfigurationInteractor.swift b/Trace/Configuration/TraceConfigurationInteractor.swift
index 6bc88e1..3bf1875 100644
--- a/Trace/Configuration/TraceConfigurationInteractor.swift
+++ b/Trace/Configuration/TraceConfigurationInteractor.swift
@@ -12,7 +12,7 @@ internal struct TraceConfigurationInteractor {
     
     // MARK: - Property
     
-    let network: Network
+    let network: HTTPNetwork
     
     // MARK: - Setup
     
diff --git a/Trace/Hardware/Connectivity/Connectivity.swift b/Trace/Hardware/Connectivity/Connectivity.swift
index 109db55..da94709 100644
--- a/Trace/Hardware/Connectivity/Connectivity.swift
+++ b/Trace/Hardware/Connectivity/Connectivity.swift
@@ -7,7 +7,11 @@
 //
 
 import Foundation
-import Network
+
+// DISABLED - iOS 15 beta does not build Network library
+//#if canImport(Network)
+//import Network
+//#endif
 
 #if canImport(SystemConfiguration)
 import SystemConfiguration.CaptiveNetwork
@@ -20,49 +24,55 @@ internal protocol ConnectivitySupportProtocol {
     var interface: Connectivity.Interface? { get }
 }
 
-internal extension Connectivity {
-
-    // MARK: - PathMonitor iOS12+
+// DISABLED - iOS 15 beta does not build Network library
+//#if canImport(Network)
+//internal extension Connectivity {
+//
+//    // MARK: - PathMonitor iOS12+
+//
+//    @available(iOS 12.0, *)
+//    final class PathMonitor: ConnectivitySupportProtocol {
+//
+//        // MARK: - Property
+//
+//        private let network = NWPathMonitor()
+//
+//        internal var interface: Connectivity.Interface?
+//
+//        // MARK: - Init
+//
+//        internal init() {
+//            setup()
+//        }
+//
+//        // MARK: - Setup
+//
+//        private func setup() {
+//            network.pathUpdateHandler = { [weak self] path in
+//                self?.update(with: path)
+//            }
+//
+//            network.start(queue: .global(qos: .background))
+//
+//            update(with: network.currentPath)
+//        }
+//
+//        // MARK: - Interface
+//
+//        private func update(with path: NWPath) {
+//            if let availableInterface = path.availableInterfaces.first {
+//                switch availableInterface.type {
+//                case .cellular: interface = .cellular
+//                case .wifi: interface = .wifi
+//                default: break
+//                }
+//            }
+//        }
+//    }
+//}
+//#endif
 
-    @available(iOS 12.0, *)
-    final class PathMonitor: ConnectivitySupportProtocol {
-        
-        // MARK: - Property
-        
-        private let network = NWPathMonitor()
-        
-        internal var interface: Connectivity.Interface?
-        
-        // MARK: - Init
-        
-        internal init() {
-            setup()
-        }
-        
-        // MARK: - Setup
-        
-        private func setup() {
-            network.pathUpdateHandler = { [weak self] path in
-                self?.update(with: path)
-            }
-            
-            network.start(queue: .global(qos: .background))
-            
-            update(with: network.currentPath)
-        }
-        
-        // MARK: - Interface
-        
-        private func update(with path: NWPath) {
-            if let availableInterface = path.availableInterfaces.first {
-                switch availableInterface.type {
-                case .cellular: interface = .cellular
-                case .wifi: interface = .wifi
-                default: break
-                }
-            }
-        }
-    }
+internal extension Connectivity {
     
     // MARK: - Reachability Pre iOS12
     
@@ -135,7 +145,9 @@ internal struct Connectivity {
     private let network: ConnectivitySupportProtocol = {
         guard #available(iOS 12.0, *) else { return Reachability() }
         
-        return PathMonitor()
+        // DISABLED - iOS 15 beta does not build Network library
+        // return PathMonitor()
+        return Reachability()
     }()
     
     internal var interface: Result {
diff --git a/Trace/Helper/UIApplication+Screenshot.swift b/Trace/Helper/UIApplication+Screenshot.swift
deleted file mode 100644
index 753a607..0000000
--- a/Trace/Helper/UIApplication+Screenshot.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  UIApplication+Screenshot.swift
-//  Trace
-//
-//  Created by Shams Ahmed on 15/11/2019.
-//  Copyright © 2020 Bitrise. All rights reserved.
-//
-
-import Foundation
-import UIKit
-
-/// Helper to capture app screenshots
-extension UIApplication {
-
-    // MARK: - Screenshot
-    
-    /**
-     Take screenshot of current window, to test use:
-     ```
-        UIImageWriteToSavedPhotosAlbum(screenshot, nil, nil, nil)
-     ```
-    */
-    var screenshot: UIImage? {
-        let keyWindow = windows.first(where: { $0.isKeyWindow })
-
-        guard let layer = keyWindow?.layer else { return nil }
-        
-        var screenshot: UIImage?
-        let scale = UIScreen.main.scale
-        
-        UIGraphicsBeginImageContextWithOptions(layer.frame.size, false, scale)
-        
-        guard let context = UIGraphicsGetCurrentContext() else { return nil }
-        
-        layer.render(in: context)
-        screenshot = UIGraphicsGetImageFromCurrentImageContext()
-        
-        UIGraphicsEndImageContext()
-        
-        return screenshot
-    }
-}
diff --git a/Trace/Helper/UIApplication+ViewController.swift b/Trace/Helper/UIApplication+ViewController.swift
index e57b33e..db38592 100644
--- a/Trace/Helper/UIApplication+ViewController.swift
+++ b/Trace/Helper/UIApplication+ViewController.swift
@@ -12,25 +12,59 @@ import UIKit
 /// Helper to find out the current view controller reguardless of view hierarchy type
 internal extension UIApplication {
     
+    // MARK: - Shared
+    
+    static var sharedIfAvailable: UIApplication? {
+        let sharedSelector = NSSelectorFromString("sharedApplication")
+        
+        guard UIApplication.responds(to: sharedSelector) else { return nil }
+
+        let shared = UIApplication.perform(sharedSelector)
+        
+        // swiftlint:disable force_cast
+        return shared?.takeUnretainedValue() as! UIApplication?
+        // swiftlint:enable force_cast
+    }
+    
+    // MARK: - Window
+    
+    var currentWindow: UIWindow? {
+        let application = UIApplication.sharedIfAvailable
+
+        if #available(iOS 15.0, *) {
+            return application?.connectedScenes
+                .compactMap { $0 as? UIWindowScene }
+                .first(where: { $0.activationState == .foregroundActive })?.windows
+                .first(where: { $0.isKeyWindow })
+        }
+        
+        if #available(iOS 13.0, *) {
+            return (application?.value(forKey: "windows") as? [UIWindow])?
+                .first(where: { $0.isKeyWindow })
+        } else {
+            return application?.keyWindow
+        }
+    }
+    
     // MARK: - View Controller
     
-    func currentViewController(_ viewController: UIViewController? = shared.windows.first(where: { $0.isKeyWindow })?.rootViewController) -> UIViewController? {
+    func currentViewController(from viewController: UIViewController?) -> UIViewController? {
         guard let viewController = viewController else { return nil }
         
         if let viewController = viewController as? UINavigationController {
             if let viewController = viewController.visibleViewController {
-                return currentViewController(viewController)
+                return currentViewController(from: viewController)
             } else {
-                return currentViewController(viewController.topViewController)
+                return currentViewController(from: viewController.topViewController)
             }
         } else if let viewController = viewController as? UITabBarController {
             if let viewControllers = viewController.viewControllers, viewControllers.count > 5, viewController.selectedIndex >= 4 {
-                return currentViewController(viewController.moreNavigationController)
+                return currentViewController(from: viewController.moreNavigationController)
             } else {
-                return currentViewController(viewController.selectedViewController)
+                return currentViewController(from: viewController.selectedViewController)
             }
         } else if let viewController = viewController.presentedViewController {
-            return currentViewController(viewController)
+            return currentViewController(from: viewController)
         } else if let children = viewController.children.first {
             return children
         } else {
diff --git a/Trace/Library/API/Crashes/CrashesService+Router.swift b/Trace/Library/API/Crashes/CrashesService+Router.swift
index 0ad3cd6..709f510 100644
--- a/Trace/Library/API/Crashes/CrashesService+Router.swift
+++ b/Trace/Library/API/Crashes/CrashesService+Router.swift
@@ -19,7 +19,7 @@ internal extension CrashesService {
         
         static var baseURL: URL = Constants.API
         
-        var method: Network.Method {
+        var method: HTTPNetwork.Method {
             switch self {
             case .crash: return .post
             }
diff --git a/Trace/Library/API/Crashes/CrashesService.swift b/Trace/Library/API/Crashes/CrashesService.swift
index 71f8df3..9a21aab 100644
--- a/Trace/Library/API/Crashes/CrashesService.swift
+++ b/Trace/Library/API/Crashes/CrashesService.swift
@@ -31,7 +31,7 @@ internal struct CrashesService {
     // MARK: - Details
     
     @discardableResult
-    internal func crash(with model: Crash, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), Network.Error>) -> Void) -> URLSessionDataTask? {
+    internal func crash(with model: Crash, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>) -> Void) -> URLSessionDataTask? {
         let router = Router.crash
         let parameters = try? model.dictionary()
         let name = model.title
diff --git a/Trace/Library/API/Metrics/MetricsService+Router.swift b/Trace/Library/API/Metrics/MetricsService+Router.swift
index 4305f24..230245b 100644
--- a/Trace/Library/API/Metrics/MetricsService+Router.swift
+++ b/Trace/Library/API/Metrics/MetricsService+Router.swift
@@ -19,7 +19,7 @@ internal extension MetricsService {
         
         static var baseURL: URL = Constants.API
         
-        var method: Network.Method {
+        var method: HTTPNetwork.Method {
             switch self {
             case .metrics: return .post
             }
@@ -32,7 +32,7 @@ internal extension MetricsService {
         }
         
         func asURLRequest() throws -> URLRequest {
-            let headerValue = Network.MIMEType.jsonV1.rawValue
+            let headerValue = HTTPNetwork.MIMEType.jsonV1.rawValue
             
             // create request
             var url = Router.baseURL
@@ -40,8 +40,8 @@ internal extension MetricsService {
             
             var request = URLRequest(url: url)
             request.httpMethod = method.rawValue
-            request.setValue(headerValue, forHTTPHeaderField: Network.Header.accept.rawValue)
-            request.setValue(headerValue, forHTTPHeaderField: Network.Header.contentType.rawValue)
+            request.setValue(headerValue, forHTTPHeaderField: HTTPNetwork.Header.accept.rawValue)
+            request.setValue(headerValue, forHTTPHeaderField: HTTPNetwork.Header.contentType.rawValue)
             
             // add body and settings
             switch self {
diff --git a/Trace/Library/API/Metrics/MetricsService.swift b/Trace/Library/API/Metrics/MetricsService.swift
index d6e04df..0780c94 100644
--- a/Trace/Library/API/Metrics/MetricsService.swift
+++ b/Trace/Library/API/Metrics/MetricsService.swift
@@ -31,7 +31,7 @@ internal struct MetricsService {
     // MARK: - Details
     
     @discardableResult
-    internal func metrics(with model: Metrics, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), Network.Error>) -> Void) -> URLSessionDataTask? {
+    internal func metrics(with model: Metrics, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>) -> Void) -> URLSessionDataTask? {
         let metricsNames = model.metrics.map { $0.descriptor.name.rawValue }
         
         return network.request(Router.metrics(model)) {
@@ -49,9 +49,9 @@ internal struct MetricsService {
     @discardableResult
     private func validate(response: HTTPURLResponse?, for metrics: [String]) -> Bool {
         guard let headers = response?.allHeaderFields as? [String: String] else { return false }
-        guard let acceptedCount = headers[Network.MIMEType.acceptedMetricsCount.rawValue],
+        guard let acceptedCount = headers[HTTPNetwork.MIMEType.acceptedMetricsCount.rawValue],
               let count = Int(acceptedCount) else { return false }
-        guard let acceptedMetrics = headers[Network.MIMEType.acceptedMetricsLabels.rawValue]?.split(separator: ",") else { return false }
+        guard let acceptedMetrics = headers[HTTPNetwork.MIMEType.acceptedMetricsLabels.rawValue]?.split(separator: ",") else { return false }
         
         let sent = Set(metrics)
         let accepted = Set(acceptedMetrics.map { String($0) })
diff --git a/Trace/Library/API/Trace/TraceService+Router.swift b/Trace/Library/API/Trace/TraceService+Router.swift
index b276f8c..b98e85c 100644
--- a/Trace/Library/API/Trace/TraceService+Router.swift
+++ b/Trace/Library/API/Trace/TraceService+Router.swift
@@ -19,7 +19,7 @@ internal extension TraceService {
         
         static var baseURL: URL = Constants.API
         
-        var method: Network.Method {
+        var method: HTTPNetwork.Method {
             switch self {
             case .trace: return .post
             }
diff --git a/Trace/Library/API/Trace/TraceService.swift b/Trace/Library/API/Trace/TraceService.swift
index bf9a879..3cfe489 100644
--- a/Trace/Library/API/Trace/TraceService.swift
+++ b/Trace/Library/API/Trace/TraceService.swift
@@ -31,7 +31,7 @@ internal struct TraceService {
     // MARK: - Steps
     
     @discardableResult
-    internal func trace(with model: TraceModel, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), Network.Error>) -> Void) -> URLSessionDataTask? {
+    internal func trace(with model: TraceModel, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>) -> Void) -> URLSessionDataTask? {
         return network.request(Router.trace(model)) {
             completion($0)
             
diff --git a/Trace/Library/Database/Database.swift b/Trace/Library/Database/Database.swift
index 2bc5ce1..6375aa3 100644
--- a/Trace/Library/Database/Database.swift
+++ b/Trace/Library/Database/Database.swift
@@ -112,10 +112,16 @@ final internal class Database {
         // Disk only
         let context = persistent.privateContext
         context.perform {
-            let requests = [
-                NSBatchDeleteRequest(fetchRequest: DBMetric.fetchRequest()),
-                NSBatchDeleteRequest(fetchRequest: DBTrace.fetchRequest())
-            ]
+            var requests = [NSBatchDeleteRequest]()
+            
+            if let trace = DBTrace.fetchRequest() as? NSFetchRequest<NSFetchRequestResult> {
+                requests.append(NSBatchDeleteRequest(fetchRequest: trace))
+            }
+            
+            if let metric = DBMetric.fetchRequest() as? NSFetchRequest<NSFetchRequestResult> {
+                requests.append(NSBatchDeleteRequest(fetchRequest: metric))
+            }
+            
             requests.forEach { _ = try? context.execute($0) }
             
             // save
diff --git a/Trace/Library/Network/Network+Configuration.swift b/Trace/Library/Network/HTTPNetwork+Configuration.swift
similarity index 96%
rename from Trace/Library/Network/Network+Configuration.swift
rename to Trace/Library/Network/HTTPNetwork+Configuration.swift
index 21699ed..c55d29a 100755
--- a/Trace/Library/Network/Network+Configuration.swift
+++ b/Trace/Library/Network/HTTPNetwork+Configuration.swift
@@ -1,5 +1,5 @@
 //
-//  Network+Configuration.swift
+//  HTTPNetwork+Configuration.swift
 //  Trace
 //
 //  Created by Shams Ahmed on 28/05/2019.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension Network {
+extension HTTPNetwork {
     
     // MARK: - Configuration
     
diff --git a/Trace/Library/Network/Network+HTTP.swift b/Trace/Library/Network/HTTPNetwork+HTTP.swift
similarity index 98%
rename from Trace/Library/Network/Network+HTTP.swift
rename to Trace/Library/Network/HTTPNetwork+HTTP.swift
index 13419f3..9815fb1 100755
--- a/Trace/Library/Network/Network+HTTP.swift
+++ b/Trace/Library/Network/HTTPNetwork+HTTP.swift
@@ -1,5 +1,5 @@
 //
-//  Network+HTTP.swift
+//  HTTPNetwork+HTTP.swift
 //  Trace
 //
 //  Created by Shams Ahmed on 28/05/2019.
@@ -9,7 +9,7 @@
 import Foundation
 
 // MARK: - Enums
-internal extension Network {
+internal extension HTTPNetwork {
 
     // MARK: - Property
 
diff --git a/Trace/Library/Network/Network+Request.swift b/Trace/Library/Network/HTTPNetwork+Request.swift
similarity index 96%
rename from Trace/Library/Network/Network+Request.swift
rename to Trace/Library/Network/HTTPNetwork+Request.swift
index 803d410..8103522 100755
--- a/Trace/Library/Network/Network+Request.swift
+++ b/Trace/Library/Network/HTTPNetwork+Request.swift
@@ -1,5 +1,5 @@
 //
-//  Network+Request.swift
+//  HTTPNetwork+Request.swift
 //  Trace
 //
 //  Created by Shams Ahmed on 28/05/2019.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-internal extension Network {
+internal extension HTTPNetwork {
 
     // MARK: - Request
 
diff --git a/Trace/Library/Network/Network+Upload.swift b/Trace/Library/Network/HTTPNetwork+Upload.swift
similarity index 98%
rename from Trace/Library/Network/Network+Upload.swift
rename to Trace/Library/Network/HTTPNetwork+Upload.swift
index 4ca8fd6..d25f778 100644
--- a/Trace/Library/Network/Network+Upload.swift
+++ b/Trace/Library/Network/HTTPNetwork+Upload.swift
@@ -1,5 +1,5 @@
 //
-//  Network+Upload.swift
+//  HTTPNetwork+Upload.swift
 //  Trace
 //
 //  Created by Shams Ahmed on 11/03/2020.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-internal extension Network {
+internal extension HTTPNetwork {
 
     // MARK: - Upload
 
diff --git a/Trace/Library/Network/Network+Validation.swift b/Trace/Library/Network/HTTPNetwork+Validation.swift
similarity index 94%
rename from Trace/Library/Network/Network+Validation.swift
rename to Trace/Library/Network/HTTPNetwork+Validation.swift
index fcedab0..e6cb490 100644
--- a/Trace/Library/Network/Network+Validation.swift
+++ b/Trace/Library/Network/HTTPNetwork+Validation.swift
@@ -1,5 +1,5 @@
 //
-//  Network+Validation.swift
+//  HTTPNetwork+Validation.swift
 //  Trace
 //
 //  Created by Shams Ahmed on 12/03/2020.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-internal extension Network {
+internal extension HTTPNetwork {
 
     // MARK: - Response Validation
 
diff --git a/Trace/Library/Network/Network.swift b/Trace/Library/Network/HTTPNetwork.swift
similarity index 94%
rename from Trace/Library/Network/Network.swift
rename to Trace/Library/Network/HTTPNetwork.swift
index cabce11..3a487c6 100755
--- a/Trace/Library/Network/Network.swift
+++ b/Trace/Library/Network/HTTPNetwork.swift
@@ -1,5 +1,5 @@
 //
-//  Network.swift
+//  HTTPNetwork.swift
 //  Trace
 //
 //  Created by Shams Ahmed on 28/05/2019.
@@ -12,7 +12,7 @@ protocol Networkable {
     
     // MARK: - Typealias
     
-    typealias Completion = Result<(data: Data?, response: HTTPURLResponse?), Network.Error>
+    typealias Completion = Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>
     
     // MARK: - Network
     
@@ -23,7 +23,7 @@ protocol Networkable {
 }
 
 /// Common network manager
-final internal class Network: Networkable {
+final internal class HTTPNetwork: Networkable {
     
     /// Request completion
     internal typealias Completion = Result<(data: Data?, response: HTTPURLResponse?), Error>
diff --git a/Trace/Library/Network/Routable.swift b/Trace/Library/Network/Routable.swift
index b2c03f3..1b3bcad 100755
--- a/Trace/Library/Network/Routable.swift
+++ b/Trace/Library/Network/Routable.swift
@@ -17,7 +17,7 @@ internal protocol Routable {
     static var baseURL: URL { get }
     
     /// HTTP Method
-    var method: Network.Method { get }
+    var method: HTTPNetwork.Method { get }
     
     /// Endpoint
     var path: String { get }
diff --git a/Trace/Scheduler/Scheduler.swift b/Trace/Scheduler/Scheduler.swift
index 2ab52f8..2ac8219 100644
--- a/Trace/Scheduler/Scheduler.swift
+++ b/Trace/Scheduler/Scheduler.swift
@@ -35,15 +35,15 @@ internal final class Scheduler {
   
     // MARK: - Schedule
     
-    func schedule(_ metrics: Metrics, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), Network.Error>) -> Void) {
+    func schedule(_ metrics: Metrics, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>) -> Void) {
         metricsService.metrics(with: metrics, { completion($0) })
     }
     
-    func schedule(_ trace: TraceModel, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), Network.Error>) -> Void) {
+    func schedule(_ trace: TraceModel, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>) -> Void) {
         traceService.trace(with: trace, { completion($0) })
     }
     
-    func schedule(_ crash: Crash, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), Network.Error>) -> Void) {
+    func schedule(_ crash: Crash, _ completion: @escaping (Result<(data: Data?, response: HTTPURLResponse?), HTTPNetwork.Error>) -> Void) {
         crashesService.crash(with: crash, { completion($0) })
     }
 }
diff --git a/Trace/SwiftOnlyLoad.swift b/Trace/SwiftOnlyLoad.swift
index bc9bc91..25fedec 100644
--- a/Trace/SwiftOnlyLoad.swift
+++ b/Trace/SwiftOnlyLoad.swift
@@ -9,24 +9,29 @@
 @_exported import Foundation
 import UIKit
 import ObjectiveC
-
-/// Class to help with finding main SDK gateway
-private protocol SelfAware: AnyObject {
-    
-    // MARK: - Awake
     
-    static func awake()
-}
-
 /// Internal use only
-internal final class SwiftOnlyLoad: NSObject, SelfAware {
+/// This class may depend on having -ObjC in Other linker flags
+extension UIApplication {
     
-    // MARK: - SelfAware
+    // MARK: - Property
     
     /// Third and last attempt at starting SDK
     /// Uses the run loop to start th SDK.
     /// This stage is very late in the app's initialisation
-    static func awake() {
+    private static let bitrise_run: Void = {
+        func BITRISE_WILL_START_TRACE() {
+            
+        }
+        func BITRISE_DID_START_TRACE() {
+            
+        }
+        
+        // Fallback plan if the SDK doesn't start using -force_load approach
+        BITRISE_WILL_START_TRACE()
+        
+        guard Trace.configuration.enabled else { return }
+        
         // Update session timeout values only if the SDK hasn't been started yet
         if Trace.currentSession == 0 {
             Trace.reset()
@@ -40,59 +45,17 @@ internal final class SwiftOnlyLoad: NSObject, SelfAware {
         
         // Start SDK
         _ = Trace.shared
-    }
-}
-
-/// Internal use only
-/// This class may depend on having -ObjC in Other linker flags
-extension UIApplication {
-    
-    // MARK: - Property
-    
-    private static let bitrise_run: Void = {
-        guard Trace.configuration.enabled else { return }
         
-        // Get a list of classes thanks to Objective-c runtime
-        let typeCount = Int(objc_getClassList(nil, 0))
-        let types = UnsafeMutablePointer<AnyClass>.allocate(capacity: typeCount)
-        let autoreleasingTypes = AutoreleasingUnsafeMutablePointer<AnyClass>(types)
-        
-        objc_getClassList(autoreleasingTypes, Int32(typeCount))
-        
-        // Should this be Async???
-        for index in 0 ..< typeCount {
-            // Check if the class conforms to protocol and than calls the awake method
-            // Note: list is very long
-            // Is there a way to check who conforms to UIApplicationDelegate protocol?
-            (types[index] as? SelfAware.Type)?.awake()
-            
-              // list all the classes in app
-              // print(types[index].self)
-        }
-        
-        // clean up
-        types.deallocate()
+        BITRISE_DID_START_TRACE()
     }()
     
     // MARK: - Override
     
     /// Internal use only
     override open var next: UIResponder? {
-        func BITRISE_WILL_START_TRACE() {
-            
-        }
-        func BITRISE_DID_START_TRACE() {
-            
-        }
-        
-        // Fallback plan if the SDK doesn't start using -force_load approach
-        BITRISE_WILL_START_TRACE()
-        
         // Method is only called once.
         UIApplication.bitrise_run // Called before applicationDidFinishLaunching since the app delegate conforms to UIResponder class by default on all Xcode projects. For others that use a custom version this would fail
         
-        BITRISE_DID_START_TRACE()
-        
         return super.next
     }
 }
diff --git a/Trace/Trace.swift b/Trace/Trace.swift
index b752efc..bb7e427 100644
--- a/Trace/Trace.swift
+++ b/Trace/Trace.swift
@@ -22,6 +22,7 @@ import Foundation
 */
 @objcMembers
 @objc(BRTrace)
+@available(iOSApplicationExtension, unavailable)
 final public class Trace: NSObject {
     
     // MARK: - Static Property
@@ -45,7 +46,7 @@ final public class Trace: NSObject {
     
     // MARK: - Property - Internal
     
-    private let network: Network
+    private let network: HTTPNetwork
     internal let queue: Queue
     internal let database: Database
     internal let tracer: Tracer
@@ -73,7 +74,7 @@ final public class Trace: NSObject {
         Trace.preSetup()
         
         session = Session()
-        network = Network()
+        network = HTTPNetwork()
         database = Database()
         lifecycle = Lifecycle()
         scheduler = Scheduler(with: network)
diff --git a/Trace/TraceModel/Tracer.swift b/Trace/TraceModel/Tracer.swift
index fc39034..bf0ebc6 100644
--- a/Trace/TraceModel/Tracer.swift
+++ b/Trace/TraceModel/Tracer.swift
@@ -65,9 +65,15 @@ final class Tracer {
         if traces.count == 1 {
             trace = traces.first
         } else if Thread.isMainThread {
-            trace = UIApplication.shared.currentViewController()?.trace
+            let application = UIApplication.sharedIfAvailable
+            let viewController = application?.currentWindow?.rootViewController
+            
+            trace = application?.currentViewController(from: viewController)?.trace
         } else if DispatchQueue.isMainQueue {
-            trace = UIApplication.shared.currentViewController()?.trace
+            let application = UIApplication.sharedIfAvailable
+            let viewController = application?.currentWindow?.rootViewController
+            
+            trace = application?.currentViewController(from: viewController)?.trace
         } else {
              return nil // try using inside a async main thread instead!
         }
diff --git a/Trace/View/FPS.swift b/Trace/View/FPS.swift
index 3114942..94245e9 100644
--- a/Trace/View/FPS.swift
+++ b/Trace/View/FPS.swift
@@ -95,7 +95,12 @@ final class FPS: FPSProtocol {
             
             // get view name
             var viewController: String? {
-                guard let viewController = UIApplication.shared.currentViewController() else { return nil }
+                let application = UIApplication.sharedIfAvailable
+                let rootViewController = application?.currentWindow?.rootViewController
+                
+                guard let viewController = application?.currentViewController(from: rootViewController) else {
+                    return nil
+                }
                 
                 return "\(type(of: viewController))"
             }