diff --git a/SessionMessagingKit/Database/Storage+Shared.swift b/SessionMessagingKit/Database/Storage+Shared.swift
index 426ffd500..4ceec0b9a 100644
--- a/SessionMessagingKit/Database/Storage+Shared.swift
+++ b/SessionMessagingKit/Database/Storage+Shared.swift
@@ -1,17 +1,19 @@
-
-// TODO: Since we now have YapDatabase as a dependency in all modules we can work with YapDatabaseTransactions directly
-// rather than passing transactions around as Any everywhere.
+import PromiseKit
 
 extension Storage {
 
-    // TODO: This is essentially a duplicate of Storage.writeSync
-    public func with(_ work: @escaping (Any) -> Void) {
-        Storage.writeSync { work($0) }
+    @discardableResult
+    public func write(with block: @escaping (Any) -> Void) -> Promise<Void> {
+        Storage.write(with: { block($0) })
     }
-
-    // TODO: This is essentially a duplicate of Storage.write
-    public func withAsync(_ work: @escaping (Any) -> Void, completion: @escaping () -> Void) {
-        Storage.write(with: { work($0) }, completion: completion)
+    
+    @discardableResult
+    public func write(with block: @escaping (Any) -> Void, completion: @escaping () -> Void) -> Promise<Void> {
+        Storage.write(with: { block($0) }, completion: completion)
+    }
+    
+    public func writeSync(with block: @escaping (Any) -> Void) {
+        Storage.writeSync { block($0) }
     }
 
     @objc public func getUserPublicKey() -> String? {
diff --git a/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift b/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift
index 00e228b69..b8cadf59b 100644
--- a/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift
+++ b/SessionMessagingKit/Jobs/AttachmentDownloadJob.swift
@@ -53,21 +53,21 @@ public final class AttachmentDownloadJob : NSObject, Job, NSCoding { // NSObject
             return handleFailure(error: Error.noAttachment)
         }
         let storage = SNMessagingKitConfiguration.shared.storage
-        storage.withAsync({ transaction in
+        storage.write(with: { transaction in
             storage.setAttachmentState(to: .downloading, for: pointer, associatedWith: self.tsIncomingMessageID, using: transaction)
         }, completion: { })
         let temporaryFilePath = URL(fileURLWithPath: OWSTemporaryDirectoryAccessibleAfterFirstAuth() + UUID().uuidString)
         let handleFailure: (Swift.Error) -> Void = { error in // Intentionally capture self
             OWSFileSystem.deleteFile(temporaryFilePath.absoluteString)
             if let error = error as? Error, case .noAttachment = error {
-                storage.withAsync({ transaction in
+                storage.write(with: { transaction in
                     storage.setAttachmentState(to: .failed, for: pointer, associatedWith: self.tsIncomingMessageID, using: transaction)
                 }, completion: { })
                 self.handlePermanentFailure(error: error)
             } else if let error = error as? DotNetAPI.Error, case .parsingFailed = error {
                 // No need to retry if the response is invalid. Most likely this means we (incorrectly)
                 // got a "Cannot GET ..." error from the file server.
-                storage.withAsync({ transaction in
+                storage.write(with: { transaction in
                     storage.setAttachmentState(to: .failed, for: pointer, associatedWith: self.tsIncomingMessageID, using: transaction)
                 }, completion: { })
                 self.handlePermanentFailure(error: error)
@@ -98,7 +98,7 @@ public final class AttachmentDownloadJob : NSObject, Job, NSCoding { // NSObject
                 return handleFailure(error)
             }
             OWSFileSystem.deleteFile(temporaryFilePath.absoluteString)
-            storage.withAsync({ transaction in
+            storage.write(with: { transaction in
                 storage.persist(stream, associatedWith: self.tsIncomingMessageID, using: transaction)
             }, completion: { })
         }.catch(on: DispatchQueue.global()) { error in
diff --git a/SessionMessagingKit/Jobs/AttachmentUploadJob.swift b/SessionMessagingKit/Jobs/AttachmentUploadJob.swift
index eaaf357a7..0c47d1705 100644
--- a/SessionMessagingKit/Jobs/AttachmentUploadJob.swift
+++ b/SessionMessagingKit/Jobs/AttachmentUploadJob.swift
@@ -81,7 +81,7 @@ public final class AttachmentUploadJob : NSObject, Job, NSCoding { // NSObject/N
         SNLog("Attachment uploaded successfully.")
         delegate?.handleJobSucceeded(self)
         SNMessagingKitConfiguration.shared.storage.resumeMessageSendJobIfNeeded(messageSendJobID)
-        Storage.shared.withAsync({ transaction in
+        Storage.shared.write(with: { transaction in
             var interaction: TSInteraction?
             let transaction = transaction as! YapDatabaseReadWriteTransaction
             TSDatabaseSecondaryIndexes.enumerateMessages(withTimestamp: self.message.sentTimestamp!, with: { _, key, _ in
@@ -108,7 +108,7 @@ public final class AttachmentUploadJob : NSObject, Job, NSCoding { // NSObject/N
     private func failAssociatedMessageSendJob(with error: Swift.Error) {
         let storage = SNMessagingKitConfiguration.shared.storage
         let messageSendJob = storage.getMessageSendJob(for: messageSendJobID)
-        storage.withAsync({ transaction in // Intentionally capture self
+        storage.write(with: { transaction in // Intentionally capture self
             MessageSender.handleFailedMessageSend(self.message, with: error, using: transaction)
             if let messageSendJob = messageSendJob {
                 storage.markJobAsFailed(messageSendJob, using: transaction)
diff --git a/SessionMessagingKit/Jobs/JobQueue.swift b/SessionMessagingKit/Jobs/JobQueue.swift
index 6b4b8903b..0e1285245 100644
--- a/SessionMessagingKit/Jobs/JobQueue.swift
+++ b/SessionMessagingKit/Jobs/JobQueue.swift
@@ -39,7 +39,7 @@ public final class JobQueue : NSObject, JobDelegate {
     }
 
     public func handleJobSucceeded(_ job: Job) {
-        SNMessagingKitConfiguration.shared.storage.withAsync({ transaction in
+        SNMessagingKitConfiguration.shared.storage.write(with: { transaction in
             SNMessagingKitConfiguration.shared.storage.markJobAsSucceeded(job, using: transaction)
         }, completion: {
             // Do nothing
@@ -50,11 +50,11 @@ public final class JobQueue : NSObject, JobDelegate {
         job.failureCount += 1
         let storage = SNMessagingKitConfiguration.shared.storage
         guard !storage.isJobCanceled(job) else { return SNLog("\(type(of: job)) canceled.") }
-        storage.withAsync({ transaction in
+        storage.write(with: { transaction in
             storage.persist(job, using: transaction)
         }, completion: { // Intentionally capture self
             if job.failureCount == type(of: job).maxFailureCount {
-                storage.withAsync({ transaction in
+                storage.write(with: { transaction in
                     storage.markJobAsFailed(job, using: transaction)
                 }, completion: {
                     // Do nothing
@@ -70,10 +70,10 @@ public final class JobQueue : NSObject, JobDelegate {
     public func handleJobFailedPermanently(_ job: Job, with error: Error) {
         job.failureCount += 1
         let storage = SNMessagingKitConfiguration.shared.storage
-        storage.withAsync({ transaction in
+        storage.write(with: { transaction in
             storage.persist(job, using: transaction)
         }, completion: { // Intentionally capture self
-            storage.withAsync({ transaction in
+            storage.write(with: { transaction in
                 storage.markJobAsFailed(job, using: transaction)
             }, completion: {
                 // Do nothing
diff --git a/SessionMessagingKit/Jobs/MessageReceiveJob.swift b/SessionMessagingKit/Jobs/MessageReceiveJob.swift
index b8895d12f..8e3782a2b 100644
--- a/SessionMessagingKit/Jobs/MessageReceiveJob.swift
+++ b/SessionMessagingKit/Jobs/MessageReceiveJob.swift
@@ -55,7 +55,7 @@ public final class MessageReceiveJob : NSObject, Job, NSCoding { // NSObject/NSC
     
     public func execute() -> Promise<Void> {
         let (promise, seal) = Promise<Void>.pending()
-        SNMessagingKitConfiguration.shared.storage.withAsync({ transaction in // Intentionally capture self
+        SNMessagingKitConfiguration.shared.storage.write(with: { transaction in // Intentionally capture self
             do {
                 let (message, proto) = try MessageReceiver.parse(self.data, openGroupMessageServerID: self.openGroupMessageServerID, using: transaction)
                 try MessageReceiver.handle(message, associatedWithProto: proto, openGroupID: self.openGroupID, isBackgroundPoll: self.isBackgroundPoll, using: transaction)
diff --git a/SessionMessagingKit/Jobs/MessageSendJob.swift b/SessionMessagingKit/Jobs/MessageSendJob.swift
index 33beadd79..f04fde3d4 100644
--- a/SessionMessagingKit/Jobs/MessageSendJob.swift
+++ b/SessionMessagingKit/Jobs/MessageSendJob.swift
@@ -71,14 +71,14 @@ public final class MessageSendJob : NSObject, Job, NSCoding { // NSObject/NSCodi
                     // Wait for it to finish
                 } else {
                     let job = AttachmentUploadJob(attachmentID: attachment.uniqueId!, threadID: message.threadID!, message: message, messageSendJobID: id!)
-                    storage.withAsync({ transaction in
+                    storage.write(with: { transaction in
                         JobQueue.shared.add(job, using: transaction)
                     }, completion: { })
                 }
             }
             if !attachmentsToUpload.isEmpty { return } // Wait for all attachments to upload before continuing
         }
-        storage.withAsync({ transaction in // Intentionally capture self
+        storage.write(with: { transaction in // Intentionally capture self
             MessageSender.send(self.message, to: self.destination, using: transaction).done(on: DispatchQueue.global(qos: .userInitiated)) {
                 self.handleSuccess()
             }.catch(on: DispatchQueue.global(qos: .userInitiated)) { error in
diff --git a/SessionMessagingKit/Messages/Control Messages/Unused/SessionRequest.swift b/SessionMessagingKit/Messages/Control Messages/Unused/SessionRequest.swift
index e65fb237e..1d57a891d 100644
--- a/SessionMessagingKit/Messages/Control Messages/Unused/SessionRequest.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/Unused/SessionRequest.swift	
@@ -34,7 +34,7 @@ public final class SessionRequest : ControlMessage {
     public override class func fromProto(_ proto: SNProtoContent) -> SessionRequest? {
         guard proto.nullMessage != nil, let preKeyBundleProto = proto.prekeyBundleMessage else { return nil }
         var registrationID: UInt32 = 0
-        SNMessagingKitConfiguration.shared.storage.with { transaction in
+        SNMessagingKitConfiguration.shared.storage.writeSync { transaction in
             registrationID = SNMessagingKitConfiguration.shared.storage.getOrGenerateRegistrationID(using: transaction)
         }
         guard let preKeyBundle = PreKeyBundle(
diff --git a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift
index 3a509477a..714cbdddc 100644
--- a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift	
+++ b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift	
@@ -27,7 +27,7 @@ public final class OpenGroupAPI : DotNetAPI {
                 let url = URL(string: server)!
                 let request = TSRequest(url: url)
                 return OnionRequestAPI.sendOnionRequest(request, to: server, using: publicKey, isJSONRequired: false).map(on: DispatchQueue.global(qos: .default)) { _ -> String in
-                    SNMessagingKitConfiguration.shared.storage.with { transaction in
+                    SNMessagingKitConfiguration.shared.storage.writeSync { transaction in
                         SNMessagingKitConfiguration.shared.storage.setOpenGroupPublicKey(for: server, to: publicKey, using: transaction)
                     }
                     return publicKey
@@ -81,7 +81,7 @@ public final class OpenGroupAPI : DotNetAPI {
                         }
                         let lastMessageServerID = storage.getLastMessageServerID(for: channel, on: server)
                         if serverID > (lastMessageServerID ?? 0) {
-                            storage.with { transaction in
+                            storage.writeSync { transaction in
                                 storage.setLastMessageServerID(for: channel, on: server, to: serverID, using: transaction)
                             }
                         }
@@ -205,7 +205,7 @@ public final class OpenGroupAPI : DotNetAPI {
                         }
                         let lastDeletionServerID = storage.getLastDeletionServerID(for: channel, on: server)
                         if serverID > (lastDeletionServerID ?? 0) {
-                            storage.with { transaction in
+                            storage.writeSync { transaction in
                                 storage.setLastDeletionServerID(for: channel, on: server, to: serverID, using: transaction)
                             }
                         }
@@ -256,7 +256,7 @@ public final class OpenGroupAPI : DotNetAPI {
                         throw Error.parsingFailed
                     }
                     let storage = SNMessagingKitConfiguration.shared.storage
-                    storage.with { transaction in
+                    storage.writeSync { transaction in
                         data.forEach { data in
                             guard let user = data["user"] as? JSON, let hexEncodedPublicKey = user["username"] as? String, let rawDisplayName = user["name"] as? String else { return }
                             let endIndex = hexEncodedPublicKey.endIndex
@@ -346,7 +346,7 @@ public final class OpenGroupAPI : DotNetAPI {
                             throw Error.parsingFailed
                         }
                         let storage = SNMessagingKitConfiguration.shared.storage
-                        storage.with { transaction in
+                        storage.writeSync { transaction in
                             storage.setUserCount(to: memberCount, forOpenGroupWithID: "\(server).\(channel)", using: transaction)
                         }
                         let openGroupInfo = OpenGroupInfo(displayName: displayName, profilePictureURL: profilePictureURL, memberCount: memberCount)
@@ -360,7 +360,8 @@ public final class OpenGroupAPI : DotNetAPI {
 
     public static func updateProfileIfNeeded(for channel: UInt64, on server: String, from info: OpenGroupInfo) {
         let openGroupID = "\(server).\(channel)"
-        Storage.write { transaction in
+        SNMessagingKitConfiguration.shared.storage.write { transaction in
+            let transaction = transaction as! YapDatabaseReadWriteTransaction
             // Update user count
             Storage.shared.setUserCount(to: info.memberCount, forOpenGroupWithID: openGroupID, using: transaction)
             let thread = TSGroupThread.getOrCreateThread(withGroupId: openGroupID.data(using: .utf8)!, groupType: .openGroup, transaction: transaction)
@@ -474,7 +475,7 @@ internal extension Promise {
             if case OnionRequestAPI.Error.httpRequestFailedAtDestination(let statusCode, _) = error, statusCode == 401 || statusCode == 403 {
                 SNLog("Auth token for: \(server) expired; dropping it.")
                 let storage = SNMessagingKitConfiguration.shared.storage
-                storage.with { transaction in
+                storage.writeSync { transaction in
                     storage.removeAuthToken(for: server, using: transaction)
                 }
             }
diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift b/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift
index 4ef0698fb..ad4aca5da 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift	
@@ -89,7 +89,7 @@ extension MessageSender : SharedSenderKeysDelegate {
             }
             when(resolved: promises).done2 { _ in seal.fulfill(()) }.catch2 { seal.reject($0) }
             let _ = promise.done {
-                Storage.writeSync { transaction in
+                SNMessagingKitConfiguration.shared.storage.writeSync { transaction in
                     let allOldRatchets = Storage.shared.getAllClosedGroupRatchets(for: groupPublicKey)
                     for (senderPublicKey, oldRatchet) in allOldRatchets {
                         let collection = ClosedGroupRatchetCollectionType.old
@@ -106,6 +106,7 @@ extension MessageSender : SharedSenderKeysDelegate {
                     } else {
                         // Send closed group update messages to any new members using established channels
                         for member in newMembers {
+                            let transaction = transaction as! YapDatabaseReadWriteTransaction
                             let thread = TSContactThread.getOrCreateThread(withContactId: member, transaction: transaction)
                             thread.save(with: transaction)
                             let closedGroupUpdateKind = ClosedGroupUpdate.Kind.new(groupPublicKey: Data(hex: groupPublicKey), name: name,
@@ -118,6 +119,7 @@ extension MessageSender : SharedSenderKeysDelegate {
                         let userRatchet = SharedSenderKeys.generateRatchet(for: groupPublicKey, senderPublicKey: userPublicKey, using: transaction)
                         let userSenderKey = ClosedGroupSenderKey(chainKey: Data(hex: userRatchet.chainKey), keyIndex: userRatchet.keyIndex, publicKey: Data(hex: userPublicKey))
                         for member in members {
+                            let transaction = transaction as! YapDatabaseReadWriteTransaction
                             guard member != userPublicKey else { continue }
                             let thread = TSContactThread.getOrCreateThread(withContactId: member, transaction: transaction)
                             thread.save(with: transaction)
diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index 2e43bb6c8..612c06ff2 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -133,7 +133,7 @@ public final class MessageSender : NSObject {
         guard message.isValid else { handleFailure(with: Error.invalidMessage, using: transaction); return promise }
         // Stop here if this is a self-send
         guard !isSelfSend else {
-            storage.withAsync({ transaction in
+            storage.write(with: { transaction in
                 MessageSender.handleSuccessfulMessageSend(message, to: destination, using: transaction)
                 seal.fulfill(())
             }, completion: { })
@@ -237,7 +237,7 @@ public final class MessageSender : NSObject {
                             NotificationCenter.default.post(name: .messageSent, object: NSNumber(value: message.sentTimestamp!))
                         }
                     }
-                    storage.withAsync({ transaction in
+                    storage.write(with: { transaction in
                         MessageSender.handleSuccessfulMessageSend(message, to: destination, using: transaction)
                         var shouldNotify = (message is VisibleMessage)
                         if let closedGroupUpdate = message as? ClosedGroupUpdate, case .new = closedGroupUpdate.kind {
@@ -262,14 +262,14 @@ public final class MessageSender : NSObject {
                 $0.catch(on: DispatchQueue.global(qos: .userInitiated)) { error in
                     errorCount += 1
                     guard errorCount == promiseCount else { return } // Only error out if all promises failed
-                    storage.withAsync({ transaction in
+                    storage.write(with: { transaction in
                         handleFailure(with: error, using: transaction as! YapDatabaseReadWriteTransaction)
                     }, completion: { })
                 }
             }
         }.catch(on: DispatchQueue.global(qos: .userInitiated)) { error in
             SNLog("Couldn't send message due to error: \(error).")
-            storage.withAsync({ transaction in
+            storage.write(with: { transaction in
                 handleFailure(with: error, using: transaction as! YapDatabaseReadWriteTransaction)
             }, completion: { })
         }
@@ -322,12 +322,12 @@ public final class MessageSender : NSObject {
         // Send the result
         OpenGroupAPI.sendMessage(openGroupMessage, to: channel, on: server).done(on: DispatchQueue.global(qos: .userInitiated)) { openGroupMessage in
             message.openGroupServerMessageID = openGroupMessage.serverID
-            storage.withAsync({ transaction in
+            storage.write(with: { transaction in
                 MessageSender.handleSuccessfulMessageSend(message, to: destination, using: transaction)
                 seal.fulfill(())
             }, completion: { })
         }.catch(on: DispatchQueue.global(qos: .userInitiated)) { error in
-            storage.withAsync({ transaction in
+            storage.write(with: { transaction in
                 handleFailure(with: error, using: transaction as! YapDatabaseReadWriteTransaction)
             }, completion: { })
         }
diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
index 4b339dd7c..0b9ee4a0f 100644
--- a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift	
@@ -68,7 +68,7 @@ public final class ClosedGroupPoller : NSObject {
                     do {
                         let data = try envelope.serializedData()
                         let job = MessageReceiveJob(data: data, isBackgroundPoll: false)
-                        Storage.write { transaction in
+                        SNMessagingKitConfiguration.shared.storage.write { transaction in
                             SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
                         }
                     } catch {
diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift
index 429f9b127..79486d488 100644
--- a/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift	
@@ -167,7 +167,7 @@ public final class OpenGroupPoller : NSObject {
                 envelope.setSourceDevice(1)
                 envelope.setContent(try! content.build().serializedData())
                 envelope.setServerTimestamp(message.serverTimestamp)
-                Storage.write { transaction in
+                SNMessagingKitConfiguration.shared.storage.write { transaction in
                     Storage.shared.setOpenGroupDisplayName(to: senderDisplayName, for: senderPublicKey, inOpenGroupWithID: openGroup.id, using: transaction)
                     let messageServerID = message.serverID
                     let job = MessageReceiveJob(data: try! envelope.buildSerializedData(), openGroupMessageServerID: messageServerID, openGroupID: openGroup.id, isBackgroundPoll: isBackgroundPoll)
@@ -193,9 +193,9 @@ public final class OpenGroupPoller : NSObject {
         let openGroup = self.openGroup
         let _ = OpenGroupAPI.getDeletedMessageServerIDs(for: openGroup.channel, on: openGroup.server).done(on: DispatchQueue.global(qos: .default)) { deletedMessageServerIDs in
             let deletedMessageIDs = deletedMessageServerIDs.compactMap { Storage.shared.getIDForMessage(withServerID: UInt64($0)) }
-            Storage.writeSync { transaction in
+            SNMessagingKitConfiguration.shared.storage.writeSync { transaction in
                 deletedMessageIDs.forEach { messageID in
-                    TSMessage.fetch(uniqueId: String(messageID))?.remove(with: transaction)
+                    TSMessage.fetch(uniqueId: String(messageID))?.remove(with: transaction as! YapDatabaseReadWriteTransaction)
                 }
             }
         }
diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
index f182c744e..dc0a2610c 100644
--- a/SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift	
@@ -98,7 +98,7 @@ public final class Poller : NSObject {
                 do {
                     let data = try envelope.serializedData()
                     let job = MessageReceiveJob(data: data, isBackgroundPoll: false)
-                    Storage.write { transaction in
+                    SNMessagingKitConfiguration.shared.storage.write { transaction in
                         SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
                     }
                 } catch {
diff --git a/SessionMessagingKit/Sending & Receiving/Typing Indicators/TypingIndicators.swift b/SessionMessagingKit/Sending & Receiving/Typing Indicators/TypingIndicators.swift
index 5894c3b33..8333f1763 100644
--- a/SessionMessagingKit/Sending & Receiving/Typing Indicators/TypingIndicators.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Typing Indicators/TypingIndicators.swift	
@@ -272,8 +272,8 @@ public class TypingIndicatorsImpl: NSObject, TypingIndicators {
 
             let typingIndicator = TypingIndicator()
             typingIndicator.kind = action
-            Storage.write { transaction in
-                MessageSender.send(typingIndicator, in: thread, using: transaction)
+            SNMessagingKitConfiguration.shared.storage.write { transaction in
+                MessageSender.send(typingIndicator, in: thread, using: transaction as! YapDatabaseReadWriteTransaction)
             }
         }
     }
diff --git a/SessionMessagingKit/Storage.swift b/SessionMessagingKit/Storage.swift
index 1ebeac99c..0a0ad7b2d 100644
--- a/SessionMessagingKit/Storage.swift
+++ b/SessionMessagingKit/Storage.swift
@@ -1,11 +1,15 @@
 import SessionProtocolKit
+import PromiseKit
 
 public protocol SessionMessagingKitStorageProtocol {
 
     // MARK: - Shared
 
-    func with(_ work: @escaping (Any) -> Void)
-    func withAsync(_ work: @escaping (Any) -> Void, completion: @escaping () -> Void)
+    @discardableResult
+    func write(with block: @escaping (Any) -> Void) -> Promise<Void>
+    @discardableResult
+    func write(with block: @escaping (Any) -> Void, completion: @escaping () -> Void) -> Promise<Void>
+    func writeSync(with block: @escaping (Any) -> Void)
 
     // MARK: - General
 
diff --git a/SessionMessagingKit/Utilities/DotNetAPI.swift b/SessionMessagingKit/Utilities/DotNetAPI.swift
index 47b5c286c..e3f154071 100644
--- a/SessionMessagingKit/Utilities/DotNetAPI.swift
+++ b/SessionMessagingKit/Utilities/DotNetAPI.swift
@@ -94,7 +94,7 @@ public class DotNetAPI : NSObject {
             return Promise.value(token)
         } else {
             return requestNewAuthToken(for: server).then(on: DispatchQueue.global(qos: .userInitiated)) { submitAuthToken($0, for: server) }.map(on: DispatchQueue.global(qos: .userInitiated)) { token in
-                storage.with { transaction in
+                storage.writeSync { transaction in
                     storage.setAuthToken(for: server, to: token, using: transaction)
                 }
                 return token
diff --git a/SessionProtocolKit/Storage.swift b/SessionProtocolKit/Storage.swift
index b61c5bdb1..1b13064ae 100644
--- a/SessionProtocolKit/Storage.swift
+++ b/SessionProtocolKit/Storage.swift
@@ -5,7 +5,7 @@ public enum ClosedGroupRatchetCollectionType {
 
 public protocol SessionProtocolKitStorageProtocol {
 
-    func with(_ work: @escaping (Any) -> Void)
+    func writeSync(with block: @escaping (Any) -> Void)
 
     func getUserKeyPair() -> ECKeyPair?
     func getClosedGroupRatchet(for groupPublicKey: String, senderPublicKey: String, from collection: ClosedGroupRatchetCollectionType) -> ClosedGroupRatchet?
diff --git a/SessionSnodeKit/OnionRequestAPI.swift b/SessionSnodeKit/OnionRequestAPI.swift
index 4a08a0999..ddf93b0fd 100644
--- a/SessionSnodeKit/OnionRequestAPI.swift
+++ b/SessionSnodeKit/OnionRequestAPI.swift
@@ -140,7 +140,7 @@ public enum OnionRequestAPI {
                 }
             }.map2 { paths in
                 OnionRequestAPI.paths = paths + reusablePaths
-                SNSnodeKitConfiguration.shared.storage.with { transaction in
+                SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
                     SNLog("Persisting onion request paths to database.")
                     SNSnodeKitConfiguration.shared.storage.setOnionRequestPaths(to: paths, using: transaction)
                 }
@@ -226,7 +226,7 @@ public enum OnionRequestAPI {
         oldPaths.remove(at: pathIndex)
         let newPaths = oldPaths + [ path ]
         paths = newPaths
-        SNSnodeKitConfiguration.shared.storage.with { transaction in
+        SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
             SNLog("Persisting onion request paths to database.")
             SNSnodeKitConfiguration.shared.storage.setOnionRequestPaths(to: newPaths, using: transaction)
         }
@@ -241,7 +241,7 @@ public enum OnionRequestAPI {
         guard let pathIndex = paths.firstIndex(of: path) else { return }
         paths.remove(at: pathIndex)
         OnionRequestAPI.paths = paths
-        SNSnodeKitConfiguration.shared.storage.with { transaction in
+        SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
             if !paths.isEmpty {
                 SNLog("Persisting onion request paths to database.")
                 SNSnodeKitConfiguration.shared.storage.setOnionRequestPaths(to: paths, using: transaction)
diff --git a/SessionSnodeKit/SnodeAPI.swift b/SessionSnodeKit/SnodeAPI.swift
index c957da688..f4527975b 100644
--- a/SessionSnodeKit/SnodeAPI.swift
+++ b/SessionSnodeKit/SnodeAPI.swift
@@ -67,7 +67,7 @@ public final class SnodeAPI : NSObject {
         let isSnodePoolExpired = given(Storage.shared.getLastSnodePoolRefreshDate()) { now.timeIntervalSince($0) > 24 * 60 * 60 } ?? true
         let isRefreshNeeded = (snodePool.count < minimumSnodePoolCount) || isSnodePoolExpired
         if isRefreshNeeded {
-            Storage.write { transaction in
+            SNSnodeKitConfiguration.shared.storage.write { transaction in
                 Storage.shared.setLastSnodePoolRefreshDate(to: now, using: transaction)
             }
             let target = seedNodePool.randomElement()!
@@ -104,7 +104,7 @@ public final class SnodeAPI : NSObject {
                     }
                 }.done2 { snode in
                     seal.fulfill(snode)
-                    SNSnodeKitConfiguration.shared.storage.with { transaction in
+                    SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
                         SNLog("Persisting snode pool to database.")
                         SNSnodeKitConfiguration.shared.storage.setSnodePool(to: SnodeAPI.snodePool, using: transaction)
                     }
@@ -129,7 +129,7 @@ public final class SnodeAPI : NSObject {
         var snodePool = SnodeAPI.snodePool
         snodePool.remove(snode)
         SnodeAPI.snodePool = snodePool
-        SNSnodeKitConfiguration.shared.storage.with { transaction in
+        SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
             SNSnodeKitConfiguration.shared.storage.setSnodePool(to: snodePool, using: transaction)
         }
     }
@@ -137,7 +137,7 @@ public final class SnodeAPI : NSObject {
     // MARK: Public API
     @objc public static func clearSnodePool() {
         snodePool.removeAll()
-        SNSnodeKitConfiguration.shared.storage.with { transaction in
+        SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
             SNSnodeKitConfiguration.shared.storage.setSnodePool(to: [], using: transaction)
         }
     }
@@ -150,7 +150,7 @@ public final class SnodeAPI : NSObject {
         if var swarm = swarm, let index = swarm.firstIndex(of: snode) {
             swarm.remove(at: index)
             SnodeAPI.swarmCache[publicKey] = swarm
-            SNSnodeKitConfiguration.shared.storage.with { transaction in
+            SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
                 SNSnodeKitConfiguration.shared.storage.setSwarm(to: swarm, for: publicKey, using: transaction)
             }
         }
@@ -177,7 +177,7 @@ public final class SnodeAPI : NSObject {
             }.map2 { rawSnodes in
                 let swarm = parseSnodes(from: rawSnodes)
                 swarmCache[publicKey] = swarm
-                SNSnodeKitConfiguration.shared.storage.with { transaction in
+                SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
                     SNSnodeKitConfiguration.shared.storage.setSwarm(to: swarm, for: publicKey, using: transaction)
                 }
                 return swarm
@@ -187,7 +187,7 @@ public final class SnodeAPI : NSObject {
 
     public static func getRawMessages(from snode: Snode, associatedWith publicKey: String) -> RawResponsePromise {
         let storage = SNSnodeKitConfiguration.shared.storage
-        storage.with { transaction in
+        storage.writeSync { transaction in
             storage.pruneLastMessageHashInfoIfExpired(for: snode, associatedWith: publicKey, using: transaction)
         }
         let lastHash = storage.getLastMessageHash(for: snode, associatedWith: publicKey) ?? ""
@@ -201,7 +201,7 @@ public final class SnodeAPI : NSObject {
         Threading.workQueue.async {
             attempt(maxRetryCount: maxRetryCount, recoveringOn: Threading.workQueue) {
                 getTargetSnodes(for: publicKey).mapValues2 { targetSnode in
-                    storage.with { transaction in
+                    storage.writeSync { transaction in
                         storage.pruneLastMessageHashInfoIfExpired(for: targetSnode, associatedWith: publicKey, using: transaction)
                     }
                     let lastHash = storage.getLastMessageHash(for: targetSnode, associatedWith: publicKey) ?? ""
@@ -267,7 +267,7 @@ public final class SnodeAPI : NSObject {
     
     private static func updateLastMessageHashValueIfPossible(for snode: Snode, associatedWith publicKey: String, from rawMessages: [JSON]) {
         if let lastMessage = rawMessages.last, let lastHash = lastMessage["hash"] as? String, let expirationDate = lastMessage["expiration"] as? UInt64 {
-            SNSnodeKitConfiguration.shared.storage.with { transaction in
+            SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
                 SNSnodeKitConfiguration.shared.storage.setLastMessageHashInfo(for: snode, associatedWith: publicKey,
                     to: [ "hash" : lastHash, "expirationDate" : NSNumber(value: expirationDate) ], using: transaction)
             }
@@ -285,7 +285,7 @@ public final class SnodeAPI : NSObject {
             }
             let isDuplicate = receivedMessages.contains(hash)
             receivedMessages.insert(hash)
-            SNSnodeKitConfiguration.shared.storage.with { transaction in
+            SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
                 SNSnodeKitConfiguration.shared.storage.setReceivedMessages(to: receivedMessages, for: publicKey, using: transaction)
             }
             return !isDuplicate
diff --git a/SessionSnodeKit/Storage.swift b/SessionSnodeKit/Storage.swift
index edf4334d5..878585618 100644
--- a/SessionSnodeKit/Storage.swift
+++ b/SessionSnodeKit/Storage.swift
@@ -1,8 +1,11 @@
 import SessionUtilitiesKit
+import PromiseKit
 
 public protocol SessionSnodeKitStorageProtocol {
 
-    func with(_ work: @escaping (Any) -> Void)
+    @discardableResult
+    func write(with block: @escaping (Any) -> Void) -> Promise<Void>
+    func writeSync(with block: @escaping (Any) -> Void)
 
     func getUserPublicKey() -> String?
     func getOnionRequestPaths() -> [OnionRequestAPI.Path]