diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53ecb381d..91a2c1e51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- 🐛 Fix for list command on macOS 10.14.4 #228
 - 🐟 Command completions for fish shell #214  
   thanks, [@ylectric](https://github.com/ylectric)!
 - 🎨 SwiftFormat #215
diff --git a/MasKit/Commands/List.swift b/MasKit/Commands/List.swift
index 9af6d0f62..595f0f65b 100644
--- a/MasKit/Commands/List.swift
+++ b/MasKit/Commands/List.swift
@@ -32,7 +32,11 @@ public struct ListCommand: CommandProtocol {
             return .success(())
         }
         for product in products {
-            print("\(product.itemIdentifier) \(product.appName) (\(product.bundleVersion))")
+            var appName = product.appName
+            if appName == "" {
+                appName = product.bundleIdentifier
+            }
+            print("\(product.itemIdentifier) \(appName) (\(product.bundleVersion))")
         }
         return .success(())
     }
diff --git a/MasKit/Models/SoftwareProduct.swift b/MasKit/Models/SoftwareProduct.swift
index 460cf63f1..b75b0f005 100644
--- a/MasKit/Models/SoftwareProduct.swift
+++ b/MasKit/Models/SoftwareProduct.swift
@@ -9,6 +9,7 @@
 /// Protocol describing the members of CKSoftwareProduct used throughout MasKit.
 public protocol SoftwareProduct {
     var appName: String { get }
+    var bundleIdentifier: String { get set }
     var bundlePath: String { get set }
     var bundleVersion: String { get set }
     var itemIdentifier: NSNumber { get set }
diff --git a/MasKitTests/Commands/UninstallCommandSpec.swift b/MasKitTests/Commands/UninstallCommandSpec.swift
index e0f60cd37..1382d1fb4 100644
--- a/MasKitTests/Commands/UninstallCommandSpec.swift
+++ b/MasKitTests/Commands/UninstallCommandSpec.swift
@@ -17,6 +17,7 @@ class UninstallCommandSpec: QuickSpec {
             let appId = 12345
             let app = SoftwareProductMock(
                 appName: "Some App",
+                bundleIdentifier: "com.some.app",
                 bundlePath: "/tmp/Some.app",
                 bundleVersion: "1.0",
                 itemIdentifier: NSNumber(value: appId)
diff --git a/MasKitTests/Models/SoftwareProductMock.swift b/MasKitTests/Models/SoftwareProductMock.swift
index ade3b778c..2502d1281 100644
--- a/MasKitTests/Models/SoftwareProductMock.swift
+++ b/MasKitTests/Models/SoftwareProductMock.swift
@@ -10,6 +10,7 @@
 
 struct SoftwareProductMock: SoftwareProduct {
     var appName: String
+    var bundleIdentifier: String
     var bundlePath: String
     var bundleVersion: String
     var itemIdentifier: NSNumber
diff --git a/PrivateFrameworks/CommerceKit/CKAccountStore.h b/PrivateFrameworks/CommerceKit/CKAccountStore.h
index 15f7394b7..56add7ff2 100644
--- a/PrivateFrameworks/CommerceKit/CKAccountStore.h
+++ b/PrivateFrameworks/CommerceKit/CKAccountStore.h
@@ -4,37 +4,28 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-@import Cocoa;
-
-//#import "NSObject.h"
-//#import "CKServiceInterface.h"
-
-//#import "ISStoreURLOperationDelegate.h"
+@import Foundation;
 
 @class CKDemoAccount, CKStoreAccount, CKStoreClient, ISStoreAccount, NSArray;
 
-@class NSString;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CKAccountStore : NSObject
 {
-
-    // CKStoreClient *_storeClient;
-
+    CKStoreClient *_storeClient;
 }
 
-+ (CKAccountStore *)sharedAccountStore;
++ (instancetype)sharedAccountStore;
 
 + (id)accountStoreForStoreClient:(id)arg1;
 @property(readonly) CKStoreClient *storeClient; // @synthesize storeClient=_storeClient;
 
-// - (void).cxx_destruct;
-// - (void)getTouchIDStateForAccount:(id)arg1 completionBlock:(CDUnknownBlockType)arg2;
-// - (void)setTouchIDStateForAccount:(id)arg1 state:(long long)arg2 completionBlock:(CDUnknownBlockType)arg3;
-// - (void)updatePasswordSettings:(id)arg1 completionBlock:(CDUnknownBlockType)arg2;
-// - (void)getPasswordSettingsWithCompletionBlock:(CDUnknownBlockType)arg1;
-// - (void)getEligibilityForService:(long long)arg1 completionBlock:(CDUnknownBlockType)arg2;
+//- (void).cxx_destruct;
+//- (void)getTouchIDStateForAccount:(id)arg1 completionBlock:(CDUnknownBlockType)arg2;
+//- (void)setTouchIDStateForAccount:(id)arg1 state:(long long)arg2 completionBlock:(CDUnknownBlockType)arg3;
+//- (void)updatePasswordSettings:(id)arg1 completionBlock:(CDUnknownBlockType)arg2;
+//- (void)getPasswordSettingsWithCompletionBlock:(CDUnknownBlockType)arg1;
+//- (void)getEligibilityForService:(long long)arg1 completionBlock:(CDUnknownBlockType)arg2;
 
 - (id)eligibilityForService:(long long)arg1;
 - (void)viewAccount;
@@ -42,26 +33,25 @@ NS_ASSUME_NONNULL_BEGIN
 //- (void)signInWithSuggestedAppleID:(id)arg1 allowChangeOfAppleID:(BOOL)arg2 completionHandler:(CDUnknownBlockType)arg3;
 
 - (void)signIn;
-
 - (void)addAccount:(id)arg1;
 @property(readonly) NSArray *accounts;
 - (id)accountWithAppleID:(id)arg1;
 - (id)accountForDSID:(id)arg1;
-@property(readonly) BOOL primaryAccountIsPresentAndSignedIn;
 @property(readonly) ISStoreAccount *primaryAccount;
 - (void)removePrimaryAccountObserver:(id)arg1;
 
-// - (id)addPrimaryAccountObserverWithBlock:(CDUnknownBlockType)arg1;
+//- (id)addPrimaryAccountObserverWithBlock:(CDUnknownBlockType)arg1;
 
 - (id)initWithStoreClient:(id)arg1;
 - (void)removeAccountObserver:(id)arg1;
 - (id)addAccountObserver:(id)arg1;
 
-// - (void)signOutWithCompletionHandler:(CDUnknownBlockType)arg1;
+//- (void)signOutWithCompletionHandler:(CDUnknownBlockType)arg1;
 
 - (void)signOut;
 - (id)storeAccountForAppleID:(id)arg1;
 - (id)storeAccountForDSID:(id)arg1;
+@property(readonly) BOOL primaryAccountIsPresentAndSignedIn;
 @property(readonly) CKStoreAccount *primaryStoreAccount;
 @property(readonly) CKDemoAccount *demoAccount;
 @property(readonly) BOOL isDemoModeEnabled;
diff --git a/PrivateFrameworks/CommerceKit/CKPurchaseController.h b/PrivateFrameworks/CommerceKit/CKPurchaseController.h
index cb1416da0..f6e3a8e06 100644
--- a/PrivateFrameworks/CommerceKit/CKPurchaseController.h
+++ b/PrivateFrameworks/CommerceKit/CKPurchaseController.h
@@ -5,13 +5,9 @@
 //
 
 #import "CKServiceInterface.h"
-//#import <StoreFoundation/SSPurchase.h>
-@import StoreFoundation;
 
 @class NSArray, NSMutableArray, NSNumber;
 
-@class SSPurchaseResponse;
-
 NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^SSPurchaseCompletion)(SSPurchase * _Nullable purchase, BOOL completed, NSError * _Nullable error, SSPurchaseResponse * _Nullable response);
@@ -23,23 +19,27 @@ typedef void (^SSPurchaseCompletion)(SSPurchase * _Nullable purchase, BOOL compl
     NSArray *_adoptionEligibleItems;
     NSNumber *_adoptionServerStatus;
     NSNumber *_adoptionErrorNumber;
-//    CDUnknownBlockType _dialogHandler;
+
+    // CDUnknownBlockType _dialogHandler;
 }
 
 + (void)setNeedsSilentMachineAuthorization:(BOOL)arg1;
-+ (CKPurchaseController *)sharedPurchaseController;
+
++ (instancetype)sharedPurchaseController;
 
 //@property(copy) CDUnknownBlockType dialogHandler; // @synthesize dialogHandler=_dialogHandler;
 //- (void).cxx_destruct;
-//- (BOOL)adoptionCompletedForBundleID:(id)arg1;
-//- (void)_performVPPReceiptRenewal;
-//- (void)checkServerDownloadQueue;
-//- (id)purchaseInProgressForProductID:(id)arg1;
-//- (id)purchasesInProgress;
-//- (void)cancelPurchaseWithProductID:(id)arg1;
-//- (void)resumeDownloadForPurchasedProductID:(id)arg1;
-//- (void)startPurchases:(NSArray<SSPurchase *> *)purchases shouldStartDownloads:(BOOL)downloads eventHandler:(CDUnknownBlockType)arg3;
-//- (void)startPurchases:(NSArray<SSPurchase *> *)purchases withOptions:(unsigned long long)arg2 completionHandler:(CDUnknownBlockType)arg3;
+
+- (BOOL)adoptionCompletedForBundleID:(id)arg1;
+- (void)_performVPPReceiptRenewal;
+- (void)checkServerDownloadQueue;
+- (id)purchaseInProgressForProductID:(id)arg1;
+- (id)purchasesInProgress;
+- (void)cancelPurchaseWithProductID:(id)arg1;
+- (void)resumeDownloadForPurchasedProductID:(id)arg1;
+
+//- (void)startPurchases:(id)arg1 shouldStartDownloads:(BOOL)arg2 eventHandler:(CDUnknownBlockType)arg3;
+//- (void)startPurchases:(id)arg1 withOptions:(unsigned long long)arg2 completionHandler:(CDUnknownBlockType)arg3;
 
 - (void)performPurchase:(SSPurchase *)purchase withOptions:(unsigned long long)arg2 completionHandler:(SSPurchaseCompletion _Nullable)completionHandler;
 
diff --git a/PrivateFrameworks/CommerceKit/CKServiceInterface.h b/PrivateFrameworks/CommerceKit/CKServiceInterface.h
index 3d816c4ba..14a263943 100644
--- a/PrivateFrameworks/CommerceKit/CKServiceInterface.h
+++ b/PrivateFrameworks/CommerceKit/CKServiceInterface.h
@@ -4,8 +4,6 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-@import StoreFoundation;
-//#import <StoreFoundation/ISServiceProxy.h>
 #import "ISServiceProxy.h"
 
 @interface CKServiceInterface : ISServiceProxy
diff --git a/PrivateFrameworks/CommerceKit/CKSoftwareMap.h b/PrivateFrameworks/CommerceKit/CKSoftwareMap.h
index 325561295..ecfcbace0 100644
--- a/PrivateFrameworks/CommerceKit/CKSoftwareMap.h
+++ b/PrivateFrameworks/CommerceKit/CKSoftwareMap.h
@@ -6,8 +6,6 @@
 
 #import "CKServiceInterface.h"
 
-@import StoreFoundation;
-
 @class CKSoftwareMapObserver, NSMutableDictionary;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -19,12 +17,16 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 + (instancetype)sharedSoftwareMap;
-
 @property(retain, nonatomic) CKSoftwareMapObserver *sharedObserver; // @synthesize sharedObserver=_sharedObserver;
 @property(retain, nonatomic) NSMutableDictionary *productsObservers; // @synthesize productsObservers=_productsObservers;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
+
+// Added 10.14.4
+//- (void)startAdoptionEligibilityCheckWithReplyBlock:(CDUnknownBlockType)arg1;
 
+// Added 10.14.4
+- (id)adopt:(id)arg1;
 - (id)adoptableBundleIdentifiers;
 
 - (BOOL)adoptionCompletedForBundleID:(id)arg1 adoptingDSID:(out _Nullable id * _Nullable)arg2 appleID:(out _Nullable id * _Nullable)arg3;
diff --git a/PrivateFrameworks/CommerceKit/CKUpdateController.h b/PrivateFrameworks/CommerceKit/CKUpdateController.h
index 32e5a19bf..6b00b3547 100644
--- a/PrivateFrameworks/CommerceKit/CKUpdateController.h
+++ b/PrivateFrameworks/CommerceKit/CKUpdateController.h
@@ -4,13 +4,10 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import <CommerceKit/CKServiceInterface.h>
 #import "CKServiceInterface.h"
 
 @class CKUpdateControllerClient, NSMutableDictionary;
 
-@class CKUpdate;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CKUpdateController : CKServiceInterface
@@ -33,8 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(retain, nonatomic) NSMutableDictionary *availableUpdatesObservers; // @synthesize availableUpdatesObservers=_availableUpdatesObservers;
 @property BOOL shouldNotAttemptInstallationAfterFailureDialog; // @synthesize shouldNotAttemptInstallationAfterFailureDialog=_shouldNotAttemptInstallationAfterFailureDialog;
 
-// @property(copy) CDUnknownBlockType dialogHandler; // @synthesize dialogHandler=_dialogHandler;
-// - (void).cxx_destruct;
+//@property(copy) CDUnknownBlockType dialogHandler; // @synthesize dialogHandler=_dialogHandler;
+//- (void).cxx_destruct;
 
 - (void)didInteractivelyPurchaseItemIdentifier:(unsigned long long)arg1 success:(BOOL)arg2;
 - (BOOL)willInteractivelyPurchaseItemIdentifier:(unsigned long long)arg1;
@@ -73,18 +70,18 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)installAvailableUpdatesLaterWithMode:(long long)arg1;
 - (BOOL)shouldOfferDoItLater;
 
-// - (void)updatesWithTags:(id)arg1 completionHandler:(CDUnknownBlockType)arg2;
+//- (void)updatesWithTags:(id)arg1 completionHandler:(CDUnknownBlockType)arg2;
 
 - (void)installAllAvailableUpdates;
 
-// - (void)startAppInstallWithTags:(id)arg1 fallbackPurchase:(id)arg2 completionHandler:(CDUnknownBlockType)arg3;
-// - (void)startAppUpdates:(id)arg1 andOSUpdates:(id)arg2 withDelegate:(id)arg3 completionHandler:(CDUnknownBlockType)arg4;
-// - (void)_checkForBookUpdatesWithCompletionHandler:(CDUnknownBlockType)arg1;
-// - (void)checkForUpdatesWithUserHasSeenUpdates:(BOOL)arg1 completionHandler:(CDUnknownBlockType)arg2;
+//- (void)startAppInstallWithTags:(id)arg1 fallbackPurchase:(id)arg2 completionHandler:(CDUnknownBlockType)arg3;
+//- (void)startAppUpdates:(id)arg1 andOSUpdates:(id)arg2 withDelegate:(id)arg3 completionHandler:(CDUnknownBlockType)arg4;
+//- (void)_checkForBookUpdatesWithCompletionHandler:(CDUnknownBlockType)arg1;
+//- (void)checkForUpdatesWithUserHasSeenUpdates:(BOOL)arg1 completionHandler:(CDUnknownBlockType)arg2;
 
 - (void)removeAvailableUpdatesObserver:(id)arg1;
 
-// - (id)addAvailableUpdatesObserverWithBlock:(CDUnknownBlockType)arg1;
+//- (id)addAvailableUpdatesObserverWithBlock:(CDUnknownBlockType)arg1;
 
 - (unsigned long long)availableUpdatesBadgeCount;
 - (id)incompatibleUpdates;
diff --git a/PrivateFrameworks/CommerceKit/ISStoreURLOperationDelegate.h b/PrivateFrameworks/CommerceKit/ISStoreURLOperationDelegate.h
index 6e073bcdd..cb15080f7 100644
--- a/PrivateFrameworks/CommerceKit/ISStoreURLOperationDelegate.h
+++ b/PrivateFrameworks/CommerceKit/ISStoreURLOperationDelegate.h
@@ -5,7 +5,7 @@
 //
 
 @import StoreFoundation;
-//#import <StoreFoundation/ISURLOperationDelegate.h>
+
 #import "ISURLOperationDelegate.h"
 
 @class ISStoreURLOperation, NSNumber, NSString;
diff --git a/PrivateFrameworks/StoreFoundation/CKSoftwareProduct.h b/PrivateFrameworks/StoreFoundation/CKSoftwareProduct.h
index 273e050bf..f4939e806 100644
--- a/PrivateFrameworks/StoreFoundation/CKSoftwareProduct.h
+++ b/PrivateFrameworks/StoreFoundation/CKSoftwareProduct.h
@@ -5,11 +5,6 @@
 //
 
 @import Foundation;
-// #import <Foundation/NSZone.h>
-
-//#import "NSObject.h"
-//#import "NSCopying.h"
-//#import "NSSecureCoding.h"
 
 @class NSDate, NSNumber, NSString, NSValue;
 
@@ -23,8 +18,12 @@ NS_ASSUME_NONNULL_BEGIN
     BOOL _isMachineLicensed;
     BOOL _isLegacyApp;
     BOOL _metadataChangeIsExpected;
+    // Added 10.14.4
+    BOOL _metadataChangeHasAlreadyOccurred;
     NSString *_accountOpaqueDSID;
     NSString *_accountIdentifier;
+    // Added 10.14.4
+    NSString *_appName;
     NSString *_bundleIdentifier;
     NSString *_bundleVersion;
     NSString *_bundlePath;
@@ -51,6 +50,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(copy, nullable) NSNumber *expectedStoreVersion; // @synthesize expectedStoreVersion=_expectedStoreVersion;
 @property(copy, nullable) NSString *expectedBundleVersion; // @synthesize expectedBundleVersion=_expectedBundleVersion;
 
+// Added 10.14.4
+@property BOOL metadataChangeHasAlreadyOccurred; // @synthesize metadataChangeHasAlreadyOccurred=_metadataChangeHasAlreadyOccurred;
 @property BOOL metadataChangeIsExpected; // @synthesize metadataChangeIsExpected=_metadataChangeIsExpected;
 @property long long source; // @synthesize source=_source;
 @property BOOL isLegacyApp; // @synthesize isLegacyApp=_isLegacyApp;
@@ -64,7 +65,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property BOOL vppLicenseRevoked; // @synthesize vppLicenseRevoked=_vppLicenseRevoked;
 @property BOOL isVPPLicensed; // @synthesize isVPPLicensed=_isVPPLicensed;
 @property BOOL installed; // @synthesize installed=_installed;
-
 @property(retain) NSValue *mdItemRef; // @synthesize mdItemRef=_mdItemRef;
 @property(retain) NSDate *purchaseDate; // @synthesize purchaseDate=_purchaseDate;
 @property(retain) NSNumber *versionIdentifier; // @synthesize versionIdentifier=_versionIdentifier;
@@ -74,15 +74,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property(retain) NSString *bundlePath; // @synthesize bundlePath=_bundlePath;
 @property(retain) NSString *bundleVersion; // @synthesize bundleVersion=_bundleVersion;
 @property(retain) NSString *bundleIdentifier; // @synthesize bundleIdentifier=_bundleIdentifier;
+
+@property(retain, nonnull) NSString *appName; // @synthesize appName=_appName;
+
 @property(retain) NSString *accountIdentifier; // @synthesize accountIdentifier=_accountIdentifier;
 @property(retain) NSString *accountOpaqueDSID; // @synthesize accountOpaqueDSID=_accountOpaqueDSID;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (instancetype)copyWithZone:(nullable NSZone *)zone;
 - (nullable instancetype)initWithCoder:(nonnull NSCoder *)coder;
 - (void)encodeWithCoder:(nonnull NSCoder *)coder;
-@property(readonly, nonnull) NSString *appName;
 - (nonnull NSString *)description;
 @property(readonly, nullable) NSString *sourceString;
 
diff --git a/PrivateFrameworks/StoreFoundation/CKUpdate.h b/PrivateFrameworks/StoreFoundation/CKUpdate.h
index a544c4bc6..f99b14e09 100644
--- a/PrivateFrameworks/StoreFoundation/CKUpdate.h
+++ b/PrivateFrameworks/StoreFoundation/CKUpdate.h
@@ -4,9 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class NSDate, NSDictionary, NSMutableDictionary, NSNumber, NSString, SSPurchase;
 
@@ -22,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic) long long softwareUpdateState; // @synthesize softwareUpdateState=_softwareUpdateState;
 @property(readonly) NSDictionary *dictionary; // @synthesize dictionary=_dictionary;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 @property(readonly, nonatomic) NSString *autoUpdateAbortReason;
 @property(nonatomic) BOOL hasBeenSeenByUser;
diff --git a/PrivateFrameworks/StoreFoundation/ISAuthenticationContext.h b/PrivateFrameworks/StoreFoundation/ISAuthenticationContext.h
index 7565ad201..539a4a87f 100644
--- a/PrivateFrameworks/StoreFoundation/ISAuthenticationContext.h
+++ b/PrivateFrameworks/StoreFoundation/ISAuthenticationContext.h
@@ -4,9 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class NSDictionary, NSNumber, NSString;
 
@@ -50,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(retain) NSDictionary *additionalQueryParameters; // @synthesize additionalQueryParameters=_additionalQueryParameters;
 @property(readonly) NSNumber *accountID; // @synthesize accountID=_accountID;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (void)encodeWithCoder:(id)arg1;
 - (id)initWithCoder:(id)arg1;
diff --git a/PrivateFrameworks/StoreFoundation/ISAuthenticationResponse.h b/PrivateFrameworks/StoreFoundation/ISAuthenticationResponse.h
index a15fc40c3..1084e3c1e 100644
--- a/PrivateFrameworks/StoreFoundation/ISAuthenticationResponse.h
+++ b/PrivateFrameworks/StoreFoundation/ISAuthenticationResponse.h
@@ -4,10 +4,6 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
-
 @class NSNumber, NSString;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -35,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(readonly) NSString *accountIdentifier; // @synthesize accountIdentifier=_accountIdentifier;
 @property unsigned long long URLBagType; // @synthesize URLBagType=_URLBagType;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (BOOL)_loadFromDictionary:(id)arg1;
 - (id)initWithCoder:(id)arg1;
diff --git a/PrivateFrameworks/StoreFoundation/ISOperationDelegate.h b/PrivateFrameworks/StoreFoundation/ISOperationDelegate.h
index e847d143d..a686addb7 100644
--- a/PrivateFrameworks/StoreFoundation/ISOperationDelegate.h
+++ b/PrivateFrameworks/StoreFoundation/ISOperationDelegate.h
@@ -4,8 +4,6 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
 @class ISOperation, NSError, SSOperationProgress;
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/PrivateFrameworks/StoreFoundation/ISServiceProxy.h b/PrivateFrameworks/StoreFoundation/ISServiceProxy.h
index 4cb8dffa4..f693e67ef 100644
--- a/PrivateFrameworks/StoreFoundation/ISServiceProxy.h
+++ b/PrivateFrameworks/StoreFoundation/ISServiceProxy.h
@@ -4,14 +4,10 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-#import <CoreFoundation/CoreFoundation.h>
+@import Foundation;
 
 @class ISStoreClient, Protocol;
 
-@class NSLock, NSMutableDictionary;
-
 @protocol ISAccountService;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -29,36 +25,36 @@ typedef void (^ISErrorHandler)(NSError * __nonnull error);
 
 @property(retain, nonatomic, nullable) ISStoreClient *storeClient; // @synthesize storeClient=_storeClient;
 
-// - (void).cxx_destruct;
-// - (void)uiServiceSynchronousBlock:(CDUnknownBlockType)arg1;
-// @property(readonly, nonatomic) id <ISUIService> uiService;
-// - (id)uiServiceWithErrorHandler:(CDUnknownBlockType)arg1;
-// - (void)inAppServiceSynchronousBlock:(CDUnknownBlockType)arg1;
-// @property(readonly, nonatomic) id <ISInAppService> inAppService;
-// - (id)inAppServiceWithErrorHandler:(CDUnknownBlockType)arg1;
-// - (void)transactionServiceSynchronousBlock:(CDUnknownBlockType)arg1;
-// @property(readonly, nonatomic) id <ISTransactionService> transactionService;
-// - (id)transactionServiceWithErrorHandler:(CDUnknownBlockType)arg1;
-// - (void)assetServiceSynchronousBlock:(CDUnknownBlockType)arg1;
-// @property(readonly, nonatomic) id <ISAssetService> assetService;
-// - (id)assetServiceWithErrorHandler:(CDUnknownBlockType)arg1;
-// - (void)downloadServiceSynchronousBlock:(CDUnknownBlockType)arg1;
-// @property(readonly, nonatomic) id <ISDownloadService> downloadService;
-// - (id)downloadServiceWithErrorHandler:(CDUnknownBlockType)arg1;
-// - (void)accountServiceSynchronousBlock:(CDUnknownBlockType)arg1;
+//- (void).cxx_destruct;
+//- (void)uiServiceSynchronousBlock:(CDUnknownBlockType)arg1;
+//@property(readonly, nonatomic) id <ISUIService> uiService;
+//- (id)uiServiceWithErrorHandler:(CDUnknownBlockType)arg1;
+//- (void)inAppServiceSynchronousBlock:(CDUnknownBlockType)arg1;
+//@property(readonly, nonatomic) id <ISInAppService> inAppService;
+//- (id)inAppServiceWithErrorHandler:(CDUnknownBlockType)arg1;
+//- (void)transactionServiceSynchronousBlock:(CDUnknownBlockType)arg1;
+//@property(readonly, nonatomic) id <ISTransactionService> transactionService;
+//- (id)transactionServiceWithErrorHandler:(CDUnknownBlockType)arg1;
+//- (void)assetServiceSynchronousBlock:(CDUnknownBlockType)arg1;
+//@property(readonly, nonatomic) id <ISAssetService> assetService;
+//- (id)assetServiceWithErrorHandler:(CDUnknownBlockType)arg1;
+//- (void)downloadServiceSynchronousBlock:(CDUnknownBlockType)arg1;
+//@property(readonly, nonatomic) id <ISDownloadService> downloadService;
+//- (id)downloadServiceWithErrorHandler:(CDUnknownBlockType)arg1;
+//- (void)accountServiceSynchronousBlock:(CDUnknownBlockType)arg1;
 
 @property(readonly, nonatomic) id <ISAccountService> accountService;
 
-// - (id)accountServiceWithErrorHandler:(CDUnknownBlockType)arg1;
+//- (id)accountServiceWithErrorHandler:(CDUnknownBlockType)arg1;
 
 - (void)connectionWasInterrupted;
 - (void)registerForInterrptionNotification;
 
-// - (void)performSynchronousBlock:(CDUnknownBlockType)arg1 withServiceName:(id)arg2 protocol:(id)arg3 isMachService:(BOOL)arg4 interfaceClassName:(id)arg5;
-// - (id)objectProxyForServiceName:(id)arg1 protocol:(id)arg2 interfaceClassName:(id)arg3 isMachService:(BOOL)arg4 errorHandler:(CDUnknownBlockType)arg5;
-// - (id)connectionWithServiceName:(id)arg1 protocol:(id)arg2 isMachService:(BOOL)arg3;
-// @property(readonly, nonatomic) Protocol *exportedProtocol;
-// @property(readonly, nonatomic) __weak id <ISServiceRemoteObject> exportedObject;
+//- (void)performSynchronousBlock:(CDUnknownBlockType)arg1 withServiceName:(id)arg2 protocol:(id)arg3 isMachService:(BOOL)arg4 interfaceClassName:(id)arg5;
+//- (id)objectProxyForServiceName:(id)arg1 protocol:(id)arg2 interfaceClassName:(id)arg3 isMachService:(BOOL)arg4 errorHandler:(CDUnknownBlockType)arg5;
+//- (id)connectionWithServiceName:(id)arg1 protocol:(id)arg2 isMachService:(BOOL)arg3;
+//@property(readonly, nonatomic) Protocol *exportedProtocol;
+//@property(readonly, nonatomic) __weak id <ISServiceRemoteObject> exportedObject;
 
 - (ISServiceProxy * __nonnull)initWithStoreClient:(ISStoreClient * __nonnull)arg1;
 
diff --git a/PrivateFrameworks/StoreFoundation/ISServiceRemoteObject.h b/PrivateFrameworks/StoreFoundation/ISServiceRemoteObject.h
index 441d4e87b..f4a247a54 100644
--- a/PrivateFrameworks/StoreFoundation/ISServiceRemoteObject.h
+++ b/PrivateFrameworks/StoreFoundation/ISServiceRemoteObject.h
@@ -4,11 +4,8 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
 @class ISStoreClient;
 
-
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol ISServiceRemoteObject <NSObject>
diff --git a/PrivateFrameworks/StoreFoundation/ISStoreAccount.h b/PrivateFrameworks/StoreFoundation/ISStoreAccount.h
index bb05ee221..567c7a90c 100644
--- a/PrivateFrameworks/StoreFoundation/ISStoreAccount.h
+++ b/PrivateFrameworks/StoreFoundation/ISStoreAccount.h
@@ -4,9 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class NSDate, NSNumber, NSString, NSTimer;
 
@@ -48,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(copy) NSString *identifier; // @synthesize identifier=_identifier;
 @property(copy) NSNumber *dsID; // @synthesize dsID=_dsID;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (long long)getTouchIDState;
 @property long long touchIDState; // @synthesize touchIDState=_touchIDState;
diff --git a/PrivateFrameworks/StoreFoundation/ISStoreClient.h b/PrivateFrameworks/StoreFoundation/ISStoreClient.h
index 71b051166..fedf225f3 100644
--- a/PrivateFrameworks/StoreFoundation/ISStoreClient.h
+++ b/PrivateFrameworks/StoreFoundation/ISStoreClient.h
@@ -4,12 +4,9 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-// #import "NSSecureCoding.h"
+@import Foundation;
 
-#import "ISStoreAccount.h"
-
-@class NSArray, NSDictionary, NSString;
+@class ISStoreAccount, NSArray, NSDictionary, NSString;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -72,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(copy) NSString *identifier; // @synthesize identifier=_identifier;
 @property unsigned long long frameworkVersion; // @synthesize frameworkVersion=_frameworkVersion;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (id)callerIdentity;
 - (BOOL)isEqualToStoreClient:(id)arg1;
diff --git a/PrivateFrameworks/StoreFoundation/SSDownload.h b/PrivateFrameworks/StoreFoundation/SSDownload.h
index c86451933..827d425d5 100644
--- a/PrivateFrameworks/StoreFoundation/SSDownload.h
+++ b/PrivateFrameworks/StoreFoundation/SSDownload.h
@@ -4,9 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class NSArray, NSNumber, NSString, NSURL, SSDownloadMetadata, SSDownloadStatus;
 
@@ -43,7 +41,7 @@
 @property(copy, nonatomic) SSDownloadMetadata *metadata; // @synthesize metadata=_metadata;
 @property(copy, nonatomic) NSArray *assets; // @synthesize assets=_assets;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 @property BOOL skipInstallPhase;
 - (void)setUseUniqueDownloadFolder:(BOOL)arg1;
diff --git a/PrivateFrameworks/StoreFoundation/SSDownloadMetadata.h b/PrivateFrameworks/StoreFoundation/SSDownloadMetadata.h
index 9080dbe35..7fc4b7e0c 100644
--- a/PrivateFrameworks/StoreFoundation/SSDownloadMetadata.h
+++ b/PrivateFrameworks/StoreFoundation/SSDownloadMetadata.h
@@ -4,12 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSCopying.h"
-// #import "NSSecureCoding.h"
-
-#import <Foundation/NSZone.h>
+@import Foundation;
 
 @class NSArray, NSData, NSDictionary, NSLock, NSMutableDictionary, NSNumber, NSString, NSURL;
 
@@ -91,11 +86,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property(retain, nullable) NSString *productType;
 @property(readonly, nullable) NSString *applicationIdentifier;
 
-- (id)copyWithZone:(nullable NSZone *)zone;
-- (nullable instancetype)initWithCoder:( NSCoder *)coder;
-- (void)encodeWithCoder:(NSCoder *)coder;
-- (nullable instancetype)initWithDictionary:(NSDictionary *)dictionary;
-- (nullable instancetype)initWithKind:(NSString *)kind;
+- (id)copyWithZone:(nullable struct _NSZone *)arg1;
+- (id)initWithCoder:(id)arg1;
+- (void)encodeWithCoder:(id)arg1;
+
+- (nullable instancetype)initWithDictionary:(id)arg1;
+- (nullable instancetype)initWithKind:(id)arg1;
 - (instancetype)init;
 
 @end
diff --git a/PrivateFrameworks/StoreFoundation/SSDownloadPhase.h b/PrivateFrameworks/StoreFoundation/SSDownloadPhase.h
index 1c6598057..6fbad425d 100644
--- a/PrivateFrameworks/StoreFoundation/SSDownloadPhase.h
+++ b/PrivateFrameworks/StoreFoundation/SSDownloadPhase.h
@@ -4,10 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSCopying.h"
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class SSOperationProgress;
 
@@ -20,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (BOOL)supportsSecureCoding;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 @property(readonly) SSOperationProgress *operationProgress;
 @property(readonly) long long totalProgressValue;
diff --git a/PrivateFrameworks/StoreFoundation/SSDownloadStatus.h b/PrivateFrameworks/StoreFoundation/SSDownloadStatus.h
index 1a6650cb4..9a071d091 100644
--- a/PrivateFrameworks/StoreFoundation/SSDownloadStatus.h
+++ b/PrivateFrameworks/StoreFoundation/SSDownloadStatus.h
@@ -4,9 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class NSError, SSDownloadPhase;
 
@@ -30,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(retain, nonatomic) NSError *error; // @synthesize error=_error;
 @property(readonly, nonatomic) SSDownloadPhase *activePhase; // @synthesize activePhase=_activePhase;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (void)setOperationProgress:(id)arg1;
 @property(readonly, nonatomic) long long phaseTimeRemaining;
diff --git a/PrivateFrameworks/StoreFoundation/SSPurchase.h b/PrivateFrameworks/StoreFoundation/SSPurchase.h
index dff73e71e..57d7d0405 100644
--- a/PrivateFrameworks/StoreFoundation/SSPurchase.h
+++ b/PrivateFrameworks/StoreFoundation/SSPurchase.h
@@ -4,10 +4,7 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSCopying.h"
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class ISOperation, NSData, NSDictionary, NSNumber, NSString, SSDownloadMetadata;
 
@@ -68,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(copy, nonatomic) NSString *buyParameters; // @synthesize buyParameters=_buyParameters;
 @property(retain, nonatomic) NSNumber *accountIdentifier; // @synthesize accountIdentifier=_accountIdentifier;
 
-// - (void).cxx_destruct;
+//- (void).cxx_destruct;
 
 - (BOOL)purchaseDSIDMatchesPrimaryAccount;
 @property(readonly) BOOL needsAuthentication; // @dynamic needsAuthentication;
diff --git a/PrivateFrameworks/StoreFoundation/SSPurchaseResponse.h b/PrivateFrameworks/StoreFoundation/SSPurchaseResponse.h
index da70812b7..44bc45807 100644
--- a/PrivateFrameworks/StoreFoundation/SSPurchaseResponse.h
+++ b/PrivateFrameworks/StoreFoundation/SSPurchaseResponse.h
@@ -4,14 +4,10 @@
 //     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
 //
 
-// #import "NSObject.h"
-
-// #import "NSSecureCoding.h"
+@import Foundation;
 
 @class NSArray, NSDictionary;
 
-@class SSDownload;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SSPurchaseResponse : NSObject <NSSecureCoding>
@@ -24,7 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)supportsSecureCoding;
 @property(retain) NSDictionary *metrics; // @synthesize metrics=_metrics;
 @property(retain) NSArray<SSDownload*> *downloads; // @synthesize downloads=_downloads;
+
 //- (void).cxx_destruct;
+
 - (id)initWithCoder:(id)arg1;
 - (void)encodeWithCoder:(id)arg1;
 - (id)_newDownloadsFromItems:(id)arg1 withDSID:(id)arg2;
diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj
index d12306aa1..e5f8257d1 100644
--- a/mas-cli.xcodeproj/project.pbxproj
+++ b/mas-cli.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
 		B576FE3021E5BD130016B39D /* OutputListenerSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE2F21E5BD130016B39D /* OutputListenerSpec.swift */; };
 		B576FE3321E985250016B39D /* SearchResultFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE3221E985250016B39D /* SearchResultFormatter.swift */; };
 		B576FE3521E98AAE0016B39D /* StoreSearchSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = B576FE3421E98AAE0016B39D /* StoreSearchSpec.swift */; };
+		B578F061224FB5BD00D2086A /* ISAuthenticationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = B578F060224FB5BD00D2086A /* ISAuthenticationResponse.h */; };
 		B5793E29219BDD4800135B39 /* JSON in Resources */ = {isa = PBXBuildFile; fileRef = B5793E28219BDD4800135B39 /* JSON */; };
 		B588CE0221DC89490047D305 /* ExternalCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = B588CE0121DC89490047D305 /* ExternalCommand.swift */; };
 		B594B12021D53A8200F3AC59 /* Uninstall.swift in Sources */ = {isa = PBXBuildFile; fileRef = B594B11F21D53A8200F3AC59 /* Uninstall.swift */; };
@@ -261,6 +262,7 @@
 		B576FE2F21E5BD130016B39D /* OutputListenerSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutputListenerSpec.swift; sourceTree = "<group>"; };
 		B576FE3221E985250016B39D /* SearchResultFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultFormatter.swift; sourceTree = "<group>"; };
 		B576FE3421E98AAE0016B39D /* StoreSearchSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreSearchSpec.swift; sourceTree = "<group>"; };
+		B578F060224FB5BD00D2086A /* ISAuthenticationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISAuthenticationResponse.h; sourceTree = "<group>"; };
 		B5793E28219BDD4800135B39 /* JSON */ = {isa = PBXFileReference; lastKnownFileType = folder; path = JSON; sourceTree = "<group>"; };
 		B588CE0121DC89490047D305 /* ExternalCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExternalCommand.swift; sourceTree = "<group>"; };
 		B592D8522201702A00A9C970 /* .swiftformat */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftformat; sourceTree = "<group>"; };
@@ -402,6 +404,21 @@
 		B55B3D7821ED96AA0009A1A5 /* Project */ = {
 			isa = PBXGroup;
 			children = (
+				B55B3D8C21ED96FD0009A1A5 /* bin */,
+				B55B3D8B21ED96FD0009A1A5 /* Brewfile */,
+				B55B3D8721ED96FD0009A1A5 /* build */,
+				B55B3D8121ED96FD0009A1A5 /* Cartfile */,
+				B55B3D8021ED96FD0009A1A5 /* Carthage */,
+				B55B3D8321ED96FD0009A1A5 /* contrib */,
+				B55B3D7B21ED96FC0009A1A5 /* Dangerfile */,
+				B55B3D7E21ED96FD0009A1A5 /* docs */,
+				B55B3D7F21ED96FD0009A1A5 /* Gemfile */,
+				B55B3D8421ED96FD0009A1A5 /* Homebrew */,
+				B55B3D8921ED96FD0009A1A5 /* Jenkinsfile */,
+				B55B3D8621ED96FD0009A1A5 /* LICENSE */,
+				B55B3D8E21ED96FD0009A1A5 /* Package */,
+				B55B3D7D21ED96FC0009A1A5 /* releases */,
+				B55B3D8521ED96FD0009A1A5 /* script */,
 				B55B3D9921EEA6AA0009A1A5 /* .bundle */,
 				B55B3D9A21EEA6AA0009A1A5 /* .editorconfig */,
 				B55B3D9D21EEBD7D0009A1A5 /* .envrc */,
@@ -413,29 +430,14 @@
 				B592D8522201702A00A9C970 /* .swiftformat */,
 				B55B3D9521EEA6AA0009A1A5 /* .swiftlint.yml */,
 				B55B3D9621EEA6AA0009A1A5 /* .travis.yml */,
-				B55B3D8C21ED96FD0009A1A5 /* bin */,
-				B55B3D8B21ED96FD0009A1A5 /* Brewfile */,
-				B55B3D8721ED96FD0009A1A5 /* build */,
-				B55B3D8121ED96FD0009A1A5 /* Cartfile */,
 				B55B3D7C21ED96FC0009A1A5 /* Cartfile.private */,
 				B55B3D7921ED96FC0009A1A5 /* Cartfile.resolved */,
-				B55B3D8021ED96FD0009A1A5 /* Carthage */,
 				B55B3D8D21ED96FD0009A1A5 /* CHANGELOG.md */,
 				B55B3D7A21ED96FC0009A1A5 /* CODE_OF_CONDUCT.md */,
-				B55B3D8321ED96FD0009A1A5 /* contrib */,
 				B55B3D8821ED96FD0009A1A5 /* CONTRIBUTING.md */,
-				B55B3D7B21ED96FC0009A1A5 /* Dangerfile */,
-				B55B3D7E21ED96FD0009A1A5 /* docs */,
-				B55B3D7F21ED96FD0009A1A5 /* Gemfile */,
 				B55B3D8221ED96FD0009A1A5 /* Gemfile.lock */,
-				B55B3D8421ED96FD0009A1A5 /* Homebrew */,
-				B55B3D8921ED96FD0009A1A5 /* Jenkinsfile */,
-				B55B3D8621ED96FD0009A1A5 /* LICENSE */,
 				B55B3D8A21ED96FD0009A1A5 /* mas-cli.png */,
-				B55B3D8E21ED96FD0009A1A5 /* Package */,
 				B55B3D8F21ED96FD0009A1A5 /* README.md */,
-				B55B3D7D21ED96FC0009A1A5 /* releases */,
-				B55B3D8521ED96FD0009A1A5 /* script */,
 			);
 			name = Project;
 			sourceTree = "<group>";
@@ -730,10 +732,10 @@
 				B594B12C21D584E800F3AC59 /* Models */,
 				B576FE0A21E116470016B39D /* Network */,
 				B576FE1821E28E460016B39D /* Nimble */,
+				B576FE2621E29DD90016B39D /* SupportingFiles */,
 				B576FE2B21E42A230016B39D /* OutputListener.swift */,
 				B576FE2F21E5BD130016B39D /* OutputListenerSpec.swift */,
 				B576FE2D21E5A8010016B39D /* Strongify.swift */,
-				B576FE2621E29DD90016B39D /* SupportingFiles */,
 			);
 			path = MasKitTests;
 			sourceTree = "<group>";
@@ -771,6 +773,7 @@
 				F8FB71A420F2EC4500F56FDC /* CKUpdate.h */,
 				F8FB71A520F2EC4500F56FDC /* ISAccountService.h */,
 				F8FB71A620F2EC4500F56FDC /* ISAuthenticationContext.h */,
+				B578F060224FB5BD00D2086A /* ISAuthenticationResponse.h */,
 				F8FB71A720F2EC4500F56FDC /* ISOperationDelegate.h */,
 				F8FB71A820F2EC4500F56FDC /* ISServiceProxy.h */,
 				F8FB71A920F2EC4500F56FDC /* ISServiceRemoteObject.h */,
@@ -807,6 +810,7 @@
 				F832138F2173D3E1008BA8A0 /* CKUpdateController.h in Headers */,
 				F83213942173D5AB008BA8A0 /* ISAccountService.h in Headers */,
 				F83213952173D5AB008BA8A0 /* ISAuthenticationContext.h in Headers */,
+				B578F061224FB5BD00D2086A /* ISAuthenticationResponse.h in Headers */,
 				F83213962173D5AB008BA8A0 /* ISOperationDelegate.h in Headers */,
 				F83213972173D5AB008BA8A0 /* ISServiceProxy.h in Headers */,
 				F83213982173D5AB008BA8A0 /* ISServiceRemoteObject.h in Headers */,
@@ -991,8 +995,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				F8FB716F20F2B4DD00F56FDC /* Account.swift in Sources */,
+				B576FE2A21E4240B0016B39D /* AppInfoFormatter.swift in Sources */,
 				B594B12721D5825800F3AC59 /* AppLibrary.swift in Sources */,
 				B594B12B21D5837200F3AC59 /* CKSoftwareProduct+SoftwareProduct.swift in Sources */,
+				B576FE2821E423E60016B39D /* Dictionary+StringOrEmpty.swift in Sources */,
 				F8FB716A20F2B4DD00F56FDC /* Downloader.swift in Sources */,
 				B588CE0221DC89490047D305 /* ExternalCommand.swift in Sources */,
 				B594B14C21D8983700F3AC59 /* Home.swift in Sources */,
@@ -1010,16 +1016,14 @@
 				B5DBF80D21DEE4E600F3B151 /* Open.swift in Sources */,
 				B576FDF721E107AA0016B39D /* OpenSystemCommand.swift in Sources */,
 				F8FB717420F2B4DD00F56FDC /* Outdated.swift in Sources */,
-				B576FE2A21E4240B0016B39D /* AppInfoFormatter.swift in Sources */,
 				F8FB716C20F2B4DD00F56FDC /* PurchaseDownloadObserver.swift in Sources */,
 				F8FB717520F2B4DD00F56FDC /* Reset.swift in Sources */,
 				F8FB717620F2B4DD00F56FDC /* Search.swift in Sources */,
 				B594B15421D89DF400F3AC59 /* SearchResult.swift in Sources */,
+				B576FE3321E985250016B39D /* SearchResultFormatter.swift in Sources */,
 				B576FDFA21E1081C0016B39D /* SearchResultList.swift in Sources */,
-				B576FE2821E423E60016B39D /* Dictionary+StringOrEmpty.swift in Sources */,
 				F8FB717720F2B4DD00F56FDC /* SignIn.swift in Sources */,
 				F8FB717820F2B4DD00F56FDC /* SignOut.swift in Sources */,
-				B576FE3321E985250016B39D /* SearchResultFormatter.swift in Sources */,
 				B594B12921D5831D00F3AC59 /* SoftwareProduct.swift in Sources */,
 				F8FB716D20F2B4DD00F56FDC /* SSPurchase.swift in Sources */,
 				F8FB716E20F2B4DD00F56FDC /* StoreAccount.swift in Sources */,
@@ -1050,28 +1054,28 @@
 				B576FDF321E03B780016B39D /* MasStoreSearchSpec.swift in Sources */,
 				B576FE0C21E116590016B39D /* NetworkManagerTests.swift in Sources */,
 				B576FE1B21E28E8A0016B39D /* NetworkSessionMock.swift in Sources */,
-				B55B3D9221ED9B8C0009A1A5 /* SearchResultFormatterSpec.swift in Sources */,
-				B576FE2C21E42A230016B39D /* OutputListener.swift in Sources */,
 				B576FE1221E1D82D0016B39D /* NetworkSessionMockFromFile.swift in Sources */,
 				B5DBF81321DEEC7C00F3B151 /* OpenCommandSpec.swift in Sources */,
 				B5DBF81721E02E3400F3B151 /* OpenSystemCommandMock.swift in Sources */,
 				B594B14221D6D8EC00F3AC59 /* OutdatedCommandSpec.swift in Sources */,
+				B576FE2C21E42A230016B39D /* OutputListener.swift in Sources */,
+				B576FE3021E5BD130016B39D /* OutputListenerSpec.swift in Sources */,
 				B594B14021D6D8BF00F3AC59 /* ResetCommandSpec.swift in Sources */,
 				B594B13221D5876200F3AC59 /* ResultPredicates.swift in Sources */,
 				B594B13E21D6D78900F3AC59 /* SearchCommandSpec.swift in Sources */,
+				B55B3D9221ED9B8C0009A1A5 /* SearchResultFormatterSpec.swift in Sources */,
 				B594B13C21D6D72E00F3AC59 /* SignInCommandSpec.swift in Sources */,
 				B594B13A21D6D70400F3AC59 /* SignOutCommandSpec.swift in Sources */,
-				B576FE3021E5BD130016B39D /* OutputListenerSpec.swift in Sources */,
-				B576FE3521E98AAE0016B39D /* StoreSearchSpec.swift in Sources */,
 				B576FDF921E107CA0016B39D /* SoftwareProductMock.swift in Sources */,
 				B5DBF81521E02BA900F3B151 /* StoreSearchMock.swift in Sources */,
+				B576FE3521E98AAE0016B39D /* StoreSearchSpec.swift in Sources */,
 				B576FE1621E1D8CB0016B39D /* String+FileExtension.swift in Sources */,
+				B576FE2E21E5A8010016B39D /* Strongify.swift in Sources */,
 				B576FDFE21E10B660016B39D /* TestURLSessionDelegate.swift in Sources */,
 				B594B12521D580BB00F3AC59 /* UninstallCommandSpec.swift in Sources */,
 				B594B13821D6D6C100F3AC59 /* UpgradeCommandSpec.swift in Sources */,
 				B576FDFC21E10A610016B39D /* URLSessionConfiguration+Tests.swift in Sources */,
 				B576FE1D21E28EF70016B39D /* URLSessionDataTaskMock.swift in Sources */,
-				B576FE2E21E5A8010016B39D /* Strongify.swift in Sources */,
 				B5DBF81121DEEC4200F3B151 /* VendorCommandSpec.swift in Sources */,
 				B594B13621D6D68600F3AC59 /* VersionCommandSpec.swift in Sources */,
 			);
diff --git a/script/update_headers b/script/update_headers
index 17d3b6c28..19b0661e1 100755
--- a/script/update_headers
+++ b/script/update_headers
@@ -13,15 +13,17 @@ main() {
 }
 
 check_class_dump() {
-  if command --quiet --search class-dump; then
-    echo "'class-dump' is not installed" >&2
+  # command: usage: command [-pVv] command [arg ...]
+  if ! command -v class-dump; then
+    echo "class-dump is not installed." >&2
+    echo "Download from http://stevenygard.com/projects/class-dump/" >&2
     exit 1
   fi
 }
 
 extract_private_framework_headers() {
   local framework_name="$1"; shift
-  local directory="App/PrivateHeaders/${framework_name}"
+  local directory="PrivateFrameworks/${framework_name}"
   mkdir -p "$directory"
   class-dump -Ho "$directory" "/System/Library/PrivateFrameworks/${framework_name}.framework"
 }