diff --git a/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj b/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj
index e8acc68..b754c4b 100644
--- a/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj
+++ b/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
 		433710E823F5950F0083BAE9 /* NSStream+Options.m in Sources */ = {isa = PBXBuildFile; fileRef = 433710E623F5950F0083BAE9 /* NSStream+Options.m */; };
 		43C5D3E223F5530D006487F6 /* NSStream+TLS.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C5D3E023F5530D006487F6 /* NSStream+TLS.h */; };
 		43C5D3E323F5530D006487F6 /* NSStream+TLS.m in Sources */ = {isa = PBXBuildFile; fileRef = 43C5D3E123F5530D006487F6 /* NSStream+TLS.m */; };
-		43F12C6C2527720100B746C7 /* pEpIOSToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F12C6B2527720100B746C7 /* pEpIOSToolbox.framework */; };
+		43FD718A26411ED900D823B6 /* pEpIOSToolboxForExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43FD718926411ED900D823B6 /* pEpIOSToolboxForExtensions.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -343,6 +343,7 @@
 		43C5D3E023F5530D006487F6 /* NSStream+TLS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSStream+TLS.h"; sourceTree = "<group>"; };
 		43C5D3E123F5530D006487F6 /* NSStream+TLS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSStream+TLS.m"; sourceTree = "<group>"; };
 		43F12C6B2527720100B746C7 /* pEpIOSToolbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = pEpIOSToolbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		43FD718926411ED900D823B6 /* pEpIOSToolboxForExtensions.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = pEpIOSToolboxForExtensions.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -350,7 +351,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43F12C6C2527720100B746C7 /* pEpIOSToolbox.framework in Frameworks */,
+				43FD718A26411ED900D823B6 /* pEpIOSToolboxForExtensions.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -620,6 +621,7 @@
 		43A3C6D625028F9100CA29BA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				43FD718926411ED900D823B6 /* pEpIOSToolboxForExtensions.framework */,
 				43F12C6B2527720100B746C7 /* pEpIOSToolbox.framework */,
 			);
 			name = Frameworks;
@@ -1056,6 +1058,7 @@
 		4329CA612238FCBF007D377E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
@@ -1082,6 +1085,7 @@
 		4329CA622238FCBF007D377E /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
diff --git a/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m b/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m
index 4172ba2..c497b70 100644
--- a/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m
+++ b/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m
@@ -27,7 +27,7 @@
 #import "CWFlags.h"
 #import "CWIMAPStore+Protected.h"
 #import "CWIMAPMessage.h"
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 #import "NSData+Extensions.h"
 #import "Pantomime/NSString+Extensions.h"
 
diff --git a/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m b/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m
index 48eb11d..8036dca 100644
--- a/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m
+++ b/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m
@@ -12,7 +12,7 @@
 #import "Pantomime/NSString+Extensions.h"
 #import "CWThreadSafeArray.h"
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 @implementation CWIMAPStore (Protected)
 
diff --git a/pantomime-lib/Framework/Pantomime/CWIMAPStore.m b/pantomime-lib/Framework/Pantomime/CWIMAPStore.m
index 5167e33..afe7e9c 100644
--- a/pantomime-lib/Framework/Pantomime/CWIMAPStore.m
+++ b/pantomime-lib/Framework/Pantomime/CWIMAPStore.m
@@ -22,7 +22,7 @@
 
 #import "CWIMAPStore+Protected.h"
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 #import "CWConstants.h"
 #import "CWFlags.h"
 #import "Pantomime/CWFolderInformation.h"
diff --git a/pantomime-lib/Framework/Pantomime/CWParser.m b/pantomime-lib/Framework/Pantomime/CWParser.m
index e1bbef9..0dacfc9 100644
--- a/pantomime-lib/Framework/Pantomime/CWParser.m
+++ b/pantomime-lib/Framework/Pantomime/CWParser.m
@@ -24,7 +24,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 #import "CWConstants.h"
 #import "CWFlags.h"
diff --git a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m
index 95ed25b..d9fb8fe 100644
--- a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m
+++ b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m
@@ -12,7 +12,7 @@
 #import <PantomimeFramework/CWMessage.h>
 #import "CWThreadSafeArray.h"
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 #import "NSData+Extensions.h"
 
 @implementation CWSMTP (Protected)
diff --git a/pantomime-lib/Framework/Pantomime/CWSMTP.m b/pantomime-lib/Framework/Pantomime/CWSMTP.m
index 451de0f..c2129e7 100644
--- a/pantomime-lib/Framework/Pantomime/CWSMTP.m
+++ b/pantomime-lib/Framework/Pantomime/CWSMTP.m
@@ -40,7 +40,7 @@
 #import "CWOAuthUtils.h"
 #import "CWService+Protected.h"
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 // The hostname/domain used to do EHLO/HELO
 static NSString *pEpEHLOBase = @"pretty.Easy.privacy";
diff --git a/pantomime-lib/Framework/Pantomime/CWService.m b/pantomime-lib/Framework/Pantomime/CWService.m
index a02f7bc..bcf172b 100644
--- a/pantomime-lib/Framework/Pantomime/CWService.m
+++ b/pantomime-lib/Framework/Pantomime/CWService.m
@@ -25,7 +25,7 @@
 
 #import "CWConstants.h"
 #import "NSData+Extensions.h"
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSDictionary.h>
diff --git a/pantomime-lib/Framework/Pantomime/CWTCPConnection.h b/pantomime-lib/Framework/Pantomime/CWTCPConnection.h
index 99de593..7679cbd 100644
--- a/pantomime-lib/Framework/Pantomime/CWTCPConnection.h
+++ b/pantomime-lib/Framework/Pantomime/CWTCPConnection.h
@@ -10,7 +10,7 @@
 
 #import "CWConnection.h"
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 @interface CWTCPConnection : NSObject<CWConnection, NSStreamDelegate>
 
diff --git a/pantomime-lib/Framework/Pantomime/CWTCPConnection.m b/pantomime-lib/Framework/Pantomime/CWTCPConnection.m
index a06aff9..401af28 100644
--- a/pantomime-lib/Framework/Pantomime/CWTCPConnection.m
+++ b/pantomime-lib/Framework/Pantomime/CWTCPConnection.m
@@ -12,7 +12,7 @@
 
 #import "CWTCPConnection.h"
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 #import "NSStream+TLS.h"
 
diff --git a/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m b/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m
index 60ed3b8..152c80a 100644
--- a/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m
+++ b/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m
@@ -6,7 +6,7 @@
 //  Copyright © 2016 pEp Security S.A. All rights reserved.
 //
 
-#import <pEpIOSToolbox/PEPLogger.h>
+#import <pEpIOSToolboxForExtensions/PEPLogger.h>
 
 #import "CWThreadSafeArray.h"