diff --git a/.gitignore b/.gitignore
index 3e970b1..0660869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ Build/
 
 # Ignore Xcode Cache
 xcuserdata/
+*.entitlements
+*.pbxproj
diff --git a/ScreenShare/ScreenShare.entitlements b/ScreenShare/ScreenShare.entitlements
index c225717..2eb7e33 100644
--- a/ScreenShare/ScreenShare.entitlements
+++ b/ScreenShare/ScreenShare.entitlements
@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.io.antmedia.ios.webrtc-sample.screen.share</string>
-	</array>
+	<array/>
 </dict>
 </plist>
diff --git a/WebRTC-Sample-App/WebRTC-Sample-App.entitlements b/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
index 5f6774b..2eb7e33 100644
--- a/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
+++ b/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.io.antmedia.ios.webrtc-sample</string>
-	</array>
+	<array/>
 </dict>
 </plist>
diff --git a/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements b/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
index 5f6774b..2eb7e33 100644
--- a/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
+++ b/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.io.antmedia.ios.webrtc-sample</string>
-	</array>
+	<array/>
 </dict>
 </plist>
diff --git a/WebRTCiOSSDK.xcodeproj/project.pbxproj b/WebRTCiOSSDK.xcodeproj/project.pbxproj
index fcc5792..779a9ad 100644
--- a/WebRTCiOSSDK.xcodeproj/project.pbxproj
+++ b/WebRTCiOSSDK.xcodeproj/project.pbxproj
@@ -808,7 +808,7 @@
 				CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ScreenShare/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
@@ -820,7 +820,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample.screen.share";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.sbd.ios.webrtc-sample.screen.share";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -835,7 +835,7 @@
 				CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ScreenShare/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
@@ -847,7 +847,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample.screen.share";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.sbd.ios.webrtc-sample.screen.share";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -985,7 +985,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1021,7 +1021,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1056,11 +1056,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDKTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.ios.WebRTCiOSSDKTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1074,11 +1074,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDKTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.ios.WebRTCiOSSDKTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1096,7 +1096,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
@@ -1113,7 +1113,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.sbd.ios.webrtc-sample";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1135,7 +1135,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2YK9J8G25K;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
@@ -1152,7 +1152,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.webrtc-sample";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.sbd.ios.webrtc-sample";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1171,11 +1171,11 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.ios.webrtc.sample.AppTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1191,11 +1191,11 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppTests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.ios.webrtc.sample.AppTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1210,11 +1210,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppUITests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.ios.webrtc.sample.AppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
@@ -1229,11 +1229,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = MJU7KX4L7S;
+				DEVELOPMENT_TEAM = 84D2TM7KGZ;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.webrtc.sample.AppUITests;
+				PRODUCT_BUNDLE_IDENTIFIER = io.sbd.ios.webrtc.sample.AppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
diff --git a/WebRTCiOSSDK/api/AntMediaClient.swift b/WebRTCiOSSDK/api/AntMediaClient.swift
index eeba25a..68d1689 100644
--- a/WebRTCiOSSDK/api/AntMediaClient.swift
+++ b/WebRTCiOSSDK/api/AntMediaClient.swift
@@ -92,8 +92,25 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
     
     private var cameraPosition: AVCaptureDevice.Position = .front
     
-    private var targetWidth: Int = 1_280
-    private var targetHeight: Int = 720
+    private var targetWidth: Int = {
+        guard let activeView = (UIApplication.shared.connectedScenes.first as? UIWindowScene)?.windows.first else {
+            return .zero
+        }
+        
+        let nativeBounds = activeView.screen.nativeBounds
+        
+        return Int(nativeBounds.width.rounded(.down))
+    }()
+    
+    private var targetHeight: Int = {
+        guard let activeView = (UIApplication.shared.connectedScenes.first as? UIWindowScene)?.windows.first else {
+            return .zero
+        }
+        
+        let nativeBounds = activeView.screen.nativeBounds
+        
+        return Int(nativeBounds.height.rounded(.down))
+    }()
     
     private var maxVideoBps: NSNumber = 0