diff --git a/package.json b/package.json
index 56e7e0b..c118ba0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.wikitude.phonegap.wikitudeplugin",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "Augmented Reality Wikitude SDK Plugin \n        The Wikitude Cordova Plugin enables developers to embed an augmented reality view into their Cordova project. You can create a fully featured app with advanced augmented reality features, including image recognition, object recognition purely using HTML, CSS and JavaScript.\n    ",
   "cordova": {
     "id": "",
@@ -32,7 +32,7 @@
     }
   ],
   "author": "Wikitude GmbH",
-  "license": "(c) 2016 - 2019 Wikitude GmbH - see License.md for details of the license",
+  "license": "(c) 2016 - 2020 Wikitude GmbH - see License.md for details of the license",
   "bugs": {
     "url": "https://github.com/Wikitude/wikitude-phonegap/issues"
   },
diff --git a/plugin.xml b/plugin.xml
index 0cff833..54dfaf9 100755
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.wikitude.phonegap.wikitudeplugin"
-    version="9.1.0">
+    version="9.2.0">
 
     <name>Augmented Reality - Wikitude SDK Plugin</name>
     
diff --git a/src/android/WikitudePlugin.java b/src/android/WikitudePlugin.java
index 8ab3522..16b09c5 100644
--- a/src/android/WikitudePlugin.java
+++ b/src/android/WikitudePlugin.java
@@ -17,8 +17,10 @@
 import org.json.JSONObject;
 
 import android.Manifest;
+import android.app.AlertDialog;
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -136,6 +138,8 @@ public class WikitudePlugin extends CordovaPlugin implements ArchitectJavaScript
 
     private static final String ACTION_OPEN_APP_SETTINGS = "openAppSettings";
 
+    private static final String ACTION_SHOW_ALERT = "showAlert";
+
     /**
      * check if view is on view-stack (no matter if visible or not)
      */
@@ -555,6 +559,24 @@ public void run() {
             return true;
         }
 
+        if ( WikitudePlugin.ACTION_SHOW_ALERT.equals( action ) ) {
+            try {
+                final String alertString = args.getString( 0 );
+                AlertDialog.Builder builder = new AlertDialog.Builder(cordova.getActivity());
+                builder.setMessage(alertString)
+                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                            }
+                        });
+                AlertDialog alertDialog = builder.create();
+                alertDialog.show();
+            } catch (JSONException e) {
+                callContext.error( action + ": exception thrown, " + e != null ? e.getMessage() : "(exception is NULL)" );
+                return true;
+            }
+            return true;
+        }
+
         /* fall-back return value */
         callContext.sendPluginResult( new PluginResult( PluginResult.Status.ERROR, "no such action: " + action ) );
         return false;
diff --git a/src/android/wikitudesdk.aar b/src/android/wikitudesdk.aar
index 74d9cc9..4cf34d6 100644
Binary files a/src/android/wikitudesdk.aar and b/src/android/wikitudesdk.aar differ
diff --git a/src/ios/WTWikitudePlugin.m b/src/ios/WTWikitudePlugin.m
index 4ccc8ce..290fd2f 100644
--- a/src/ios/WTWikitudePlugin.m
+++ b/src/ios/WTWikitudePlugin.m
@@ -769,6 +769,24 @@ - (void)onJSONObjectReceived:(CDVInvokedUrlCommand *)command
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+- (void)showAlert:(CDVInvokedUrlCommand *)command
+{
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_NO_RESULT];
+
+    NSString* message = [NSString stringWithFormat:@"%@", command.arguments.firstObject];
+    UIAlertController * alert = [UIAlertController alertControllerWithTitle:nil
+                                                                    message:message
+                                                             preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertAction* okButton = [UIAlertAction actionWithTitle:@"OK"
+                                                       style:UIAlertActionStyleDefault
+                                                     handler:nil];
+    [alert addAction:okButton];
+
+    [self.arViewController presentViewController:alert animated:YES completion:nil];
+
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 #pragma mark Device sensor calibration
 - (void)setDeviceSensorsNeedCalibrationHandler:(CDVInvokedUrlCommand *)command
 {
diff --git a/src/ios/WikitudeSDK.framework/Headers/ArchitectPlugin.hpp b/src/ios/WikitudeSDK.framework/Headers/ArchitectPlugin.hpp
index 32c6720..9f3f3e8 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ArchitectPlugin.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ArchitectPlugin.hpp
@@ -16,10 +16,7 @@
 #include "JavaScriptPluginModule.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class WT_EXPORT_API ArchitectPlugin : public Plugin {
         public:
@@ -36,9 +33,7 @@ namespace wikitude { namespace sdk {
         private:
             std::unique_ptr<JavaScriptPluginModule>     _javaScriptPluginModule;
         };
-    }
-    using impl::ArchitectPlugin;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraFocusMode.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraFocusMode.hpp
index 9e9ef59..9d8756e 100755
--- a/src/ios/WikitudeSDK.framework/Headers/CameraFocusMode.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/CameraFocusMode.hpp
@@ -14,9 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /**
          * @brief Use this enum to determine the focus mode of the camera.
@@ -29,9 +27,7 @@ namespace wikitude { namespace sdk {
             /** Off: The device has its focus locked */
             Off
         };
-    }
-    using impl::CameraFocusMode;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp
index cfebc53..f7d71e0 100755
--- a/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/CameraFrame.hpp
@@ -24,9 +24,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /** @class DepthCameraFrameMetadata
          *  @brief A class that encapsulates additional information about depth camera frames.
@@ -147,6 +145,7 @@ namespace wikitude { namespace sdk {
             CameraFrame(long id_, std::int64_t colorTimestamp_, ColorCameraFrameMetadata colorMetadata_, const std::vector<CameraFramePlane>& colorData_);
             CameraFrame(long id_, std::int64_t colorTimestamp_, ColorCameraFrameMetadata colorMetadata_, const std::vector<CameraFramePlane>& colorData_, const Matrix4& pose_);
             CameraFrame(long id_, std::int64_t colorTimestamp_, ColorCameraFrameMetadata colorMetadata_, const std::vector<CameraFramePlane>& colorData_, std::int64_t depthTimestamp_, DepthCameraFrameMetadata depthMetadata_, const void* depthData_);
+            CameraFrame(long id_, std::int64_t colorTimestamp_, ColorCameraFrameMetadata colorMetadata_, const std::vector<CameraFramePlane>& colorData_, std::int64_t depthTimestamp_, DepthCameraFrameMetadata depthMetadata_, const void* depthData_, const Matrix4& pose_);
 
             /** @brief Returns unique id used to identify individual frames.
              */
@@ -199,14 +198,7 @@ namespace wikitude { namespace sdk {
             bool                                    _hasPose;
         };
         /** @}*/
-    }
-    using impl::DepthDataFormat;
-    using impl::DepthCameraFrameMetadata;
-    using impl::ColorCameraFrameMetadata;
-    using impl::DistortionMode;
-    using impl::IntrinsicsCalibration;
-    using impl::CameraFrame;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraFrameInputPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraFrameInputPluginModule.hpp
index 7d1dd97..03abb28 100755
--- a/src/ios/WikitudeSDK.framework/Headers/CameraFrameInputPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/CameraFrameInputPluginModule.hpp
@@ -23,11 +23,8 @@
 #include "PluginModule.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
     
-    namespace impl {
-
-
         class WT_EXPORT_API CameraFrameInputPluginModule : public PluginModule {
         public:
             CameraFrameInputPluginModule() noexcept = default;
@@ -92,9 +89,7 @@ namespace wikitude { namespace sdk {
             std::function<void(float)>                      _cameraToSurfaceAngleChangedHandler;
             std::function<void(const sdk::Error&)>          _onPluginCameraErrorHandler;
         };
-    }
-    using impl::CameraFrameInputPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraFramePlane.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraFramePlane.hpp
index 7845eee..2d484fa 100755
--- a/src/ios/WikitudeSDK.framework/Headers/CameraFramePlane.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/CameraFramePlane.hpp
@@ -13,9 +13,7 @@
 
 #include "CompilerAttributes.hpp"
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /** @class CameraFramePlane
          *  @brief A single plane of image data.
@@ -48,9 +46,7 @@ namespace wikitude { namespace sdk {
             int             _pixelStride;
             int             _rowStride;
         };
-    }
-    using impl::CameraFramePlane;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraParameters.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraParameters.hpp
index d0f9996..de90786 100755
--- a/src/ios/WikitudeSDK.framework/Headers/CameraParameters.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/CameraParameters.hpp
@@ -18,19 +18,11 @@
 #include "PlatformCameraHandler.hpp"
 
 
-namespace wikitude {
-    namespace universal_sdk {
-        namespace impl {
-            class CameraParametersInternal;
-        }
-        using impl::CameraParametersInternal;
-    }
+namespace wikitude::universal_sdk {
+    class CameraParametersInternal;
 }
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         /**
          * @brief CameraParameters provide access to camera specific information.
@@ -73,9 +65,7 @@ namespace wikitude { namespace sdk {
         protected:
             universal_sdk::CameraParametersInternal*    _internalCameraParameters = nullptr;
         };
-    }
-    using impl::CameraParameters;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/CameraPosition.hpp b/src/ios/WikitudeSDK.framework/Headers/CameraPosition.hpp
index fd7d4ea..5d1076e 100755
--- a/src/ios/WikitudeSDK.framework/Headers/CameraPosition.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/CameraPosition.hpp
@@ -14,9 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /** @enum CameraPosition
          *  @brief An enum indicating the physical position of the camera used to capture frames.
@@ -32,9 +30,7 @@ namespace wikitude { namespace sdk {
              */
             Front
         };
-    }
-    using impl::CameraPosition;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ColorSpace.hpp b/src/ios/WikitudeSDK.framework/Headers/ColorSpace.hpp
index bee323a..e16fd0a 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ColorSpace.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ColorSpace.hpp
@@ -14,10 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         enum WT_EXPORT_API ColorSpace {
             /**
@@ -83,9 +80,7 @@ namespace wikitude { namespace sdk {
             */
             UNKNOWN
         };
-    }
-    using impl::ColorSpace;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/DepthDataFormat.hpp b/src/ios/WikitudeSDK.framework/Headers/DepthDataFormat.hpp
index 93896c2..4c9ac4a 100755
--- a/src/ios/WikitudeSDK.framework/Headers/DepthDataFormat.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/DepthDataFormat.hpp
@@ -14,10 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         enum class WT_EXPORT_API DepthDataFormat {
             FLOAT_32,
@@ -26,9 +23,7 @@ namespace wikitude { namespace sdk {
             INTEGER_16,
             INTEGER_32
         };
-    }
-    using impl::DepthDataFormat;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/DeviceMotionInputPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/DeviceMotionInputPluginModule.hpp
index 048f90d..635c213 100755
--- a/src/ios/WikitudeSDK.framework/Headers/DeviceMotionInputPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/DeviceMotionInputPluginModule.hpp
@@ -18,10 +18,7 @@
 #include "SensorEvent.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class WT_EXPORT_API DeviceMotionInputPluginModule : public PluginModule {
         public:
@@ -46,9 +43,7 @@ namespace wikitude { namespace sdk {
             std::function<void(sdk::DeviceRotationEvent)>       _notifyNewDeviceRotationEventHandler;
             std::function<void(sdk::DeviceOrientationEvent)>    _notifyNewDeviceOrientationEventHandler;
         };
-    }
-    using impl::DeviceMotionInputPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Error.hpp b/src/ios/WikitudeSDK.framework/Headers/Error.hpp
index 6ddae59..f9e69bc 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Error.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Error.hpp
@@ -18,10 +18,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         /**
          * A simple data type to represent an error. Domains help to reduce the amount of unique codes by introducing an additional layer of separation.
@@ -87,9 +84,7 @@ namespace wikitude { namespace sdk {
 
             std::unique_ptr<Error>  _underlyingError;
         };
-    }
-    using impl::Error;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ErrorHandling.hpp b/src/ios/WikitudeSDK.framework/Headers/ErrorHandling.hpp
index ee44aa3..93c7495 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ErrorHandling.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ErrorHandling.hpp
@@ -15,10 +15,7 @@
 #include "Error.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         struct WT_EXPORT_API CallStatus {
         public:
@@ -65,10 +62,7 @@ namespace wikitude { namespace sdk {
             T           _value;
             CallStatus  _status;
         };
-    }
-    using impl::CallStatus;
-    using impl::CallValue;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ImageTarget.hpp b/src/ios/WikitudeSDK.framework/Headers/ImageTarget.hpp
index 89bf5e4..c9e6da0 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ImageTarget.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ImageTarget.hpp
@@ -19,10 +19,8 @@
 #include "ImageTargetType.hpp"
 #include "CompilerAttributes.hpp"
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
 
+namespace wikitude::sdk {
 
         /** @addtogroup ImageTracking
         *  @{
@@ -30,8 +28,8 @@ namespace wikitude { namespace sdk {
         /** @class ImageTarget
          *  @brief A class that represents image targets that are found by an image tracker.
          */
-        class Matrix4;
         class ImageTracker;
+        class Matrix4;
         class WT_EXPORT_API ImageTarget {
         public:
             using DistanceToTargetChangedHandler = std::function<void(int distance_, ImageTarget& firstTarget_, ImageTarget& secondTarget_)>;
@@ -170,9 +168,7 @@ namespace wikitude { namespace sdk {
             virtual int getCircumferenceTop() const = 0;
         };
         /** @}*/
-    }    
-    using impl::ImageTarget;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ImageTargetType.hpp b/src/ios/WikitudeSDK.framework/Headers/ImageTargetType.hpp
index 24bc033..6637eb0 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ImageTargetType.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ImageTargetType.hpp
@@ -14,9 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /**
          * @brief Use this enum to determine the type of a image target that was detected by the image tracker.
@@ -27,9 +25,7 @@ namespace wikitude { namespace sdk {
             /** Cylinder: The detected image target is a cylinder. */
             Cylinder
         };
-    }
-    using impl::ImageTargetType;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ImageTrackingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/ImageTrackingPluginModule.hpp
index 8a9ef88..b1a9984 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ImageTrackingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ImageTrackingPluginModule.hpp
@@ -19,21 +19,10 @@
 #include "TrackingPluginModule.hpp"
 
 
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-            class ManagedCameraFrame;
-        }
-        using impl::ManagedCameraFrame;
-    }
-}
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         class ImageTracker;
-
+        class ManagedCameraFrame;
         class WT_EXPORT_API ImageTrackingPluginModule : public TrackingPluginModule {
         public:
             virtual ~ImageTrackingPluginModule() = default;            
@@ -41,9 +30,7 @@ namespace wikitude { namespace sdk {
             virtual universal_sdk::ImageState getTrackingState(ImageTracker& imageTracker_) const = 0;
             virtual sdk::Matrix4 getViewMatrix() const = 0;
         };
-    }
-    using impl::ImageTrackingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/InitializationPose.hpp b/src/ios/WikitudeSDK.framework/Headers/InitializationPose.hpp
index e45ef50..104b550 100755
--- a/src/ios/WikitudeSDK.framework/Headers/InitializationPose.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/InitializationPose.hpp
@@ -14,11 +14,8 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
     
-    namespace impl {
-
-
         /** @addtogroup InstantTracking
          *  @{
          */
@@ -57,9 +54,7 @@ namespace wikitude { namespace sdk {
             virtual const Matrix4& getViewMatrix() const = 0;
         };
         /** @}*/
-    }
-    using impl::InitializationPose;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/InstantTarget.hpp b/src/ios/WikitudeSDK.framework/Headers/InstantTarget.hpp
index 4d0257e..38b5a65 100755
--- a/src/ios/WikitudeSDK.framework/Headers/InstantTarget.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/InstantTarget.hpp
@@ -14,10 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         /** @addtogroup InstantTracking
         *  @{
@@ -58,9 +55,7 @@ namespace wikitude { namespace sdk {
             virtual const Matrix4& getViewMatrix() const = 0;
         };
         /** @}*/
-    }
-    using impl::InstantTarget;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/InstantTrackingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/InstantTrackingPluginModule.hpp
index 14002bb..9d8fd55 100755
--- a/src/ios/WikitudeSDK.framework/Headers/InstantTrackingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/InstantTrackingPluginModule.hpp
@@ -21,9 +21,7 @@
 #include "InstantTrackingState.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         class WT_EXPORT_API InstantTrackingPluginModule : public TrackingPluginModule {
         public:
@@ -32,9 +30,7 @@ namespace wikitude { namespace sdk {
             virtual universal_sdk::InstantState getInitializationState(/*float deviceHeightAboveGround*/) const = 0;
             virtual universal_sdk::InstantState getTrackingState() const = 0;
         };
-    }
-    using impl::InstantTrackingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/InstantTrackingState.hpp b/src/ios/WikitudeSDK.framework/Headers/InstantTrackingState.hpp
index aeeb1c9..6e40722 100755
--- a/src/ios/WikitudeSDK.framework/Headers/InstantTrackingState.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/InstantTrackingState.hpp
@@ -14,11 +14,8 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
     
-    namespace impl {
-
-        
         /** @addtogroup InstantTracking
          *  @{
          */
@@ -34,9 +31,7 @@ namespace wikitude { namespace sdk {
             Tracking
         };
         /** @}*/
-    }
-    using impl::InstantTrackingState;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/InterfaceOrientation.h b/src/ios/WikitudeSDK.framework/Headers/InterfaceOrientation.hpp
similarity index 82%
rename from src/ios/WikitudeSDK.framework/Headers/InterfaceOrientation.h
rename to src/ios/WikitudeSDK.framework/Headers/InterfaceOrientation.hpp
index 1bcb8e8..b99167b 100755
--- a/src/ios/WikitudeSDK.framework/Headers/InterfaceOrientation.h
+++ b/src/ios/WikitudeSDK.framework/Headers/InterfaceOrientation.hpp
@@ -1,5 +1,5 @@
 //
-//  InterfaceOrientation.h
+//  InterfaceOrientation.hpp
 //  CommonLibrary
 //
 //  Created by Daniel Guttenberg on 08/04/16.
@@ -14,9 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-    
-    namespace impl {
+namespace wikitude::sdk {
         
         enum WT_EXPORT_API InterfaceOrientation : int {
             InterfaceOrientationLandscapeLeft = 90,
@@ -25,9 +23,7 @@ namespace wikitude { namespace sdk {
             InterfaceOrientationPortraitUpsideDown = 180,
             InterfaceOrientationUnknown
         };
-    }
-    using impl::InterfaceOrientation;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/JavaScriptPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/JavaScriptPluginModule.hpp
index f2ccd1a..b0a5930 100755
--- a/src/ios/WikitudeSDK.framework/Headers/JavaScriptPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/JavaScriptPluginModule.hpp
@@ -18,11 +18,8 @@
 #include "PluginModule.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
 
-    namespace impl {
-
-        
         class Positionable;
         class WT_EXPORT_API JavaScriptPluginModule : public PluginModule {
         public:
@@ -53,9 +50,7 @@ namespace wikitude { namespace sdk {
             std::function<void(const std::string&)> _callJavaScriptHandler;
             std::vector<std::string>                _pendingJavaScriptCalls;
         };
-    }
-    using impl::JavaScriptPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp b/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp
index 5b2eb3c..9527b75 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ManagedCameraFrame.hpp
@@ -19,10 +19,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class CameraFramePlane;
         class WT_EXPORT_API ManagedCameraFrame {
@@ -73,9 +70,7 @@ namespace wikitude { namespace sdk {
             std::shared_ptr<std::mutex>                         _safeStorageMutex;
             std::shared_ptr<int>                                _refCount = nullptr;
         };
-    }
-    using impl::ManagedCameraFrame;
-}}
+}
 
 #endif /* ManagedCameraFrame_hpp */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Matrix4.hpp b/src/ios/WikitudeSDK.framework/Headers/Matrix4.hpp
index b116834..ce47964 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Matrix4.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Matrix4.hpp
@@ -15,9 +15,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /**
         * A four by four, float based matrix providing methods for spatial transformations in three dimensions. The matrix data is arranged in column-major order.
@@ -384,9 +382,7 @@ namespace wikitude { namespace sdk {
 
             float m[16];
         };
-    }
-    using impl::Matrix4;
-}}
+}
             
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/MetalRenderingObjects.h b/src/ios/WikitudeSDK.framework/Headers/MetalRenderingObjects.h
index 22bbfe2..6bd7f88 100755
--- a/src/ios/WikitudeSDK.framework/Headers/MetalRenderingObjects.h
+++ b/src/ios/WikitudeSDK.framework/Headers/MetalRenderingObjects.h
@@ -19,9 +19,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-    
-        namespace impl {
+namespace wikitude::sdk {
             
             class WT_EXPORT_API MetalRenderingObjects {
             public:
@@ -36,10 +34,7 @@ namespace wikitude { namespace sdk {
                 id<MTLRenderCommandEncoder>     _commandEncoder;
                 MTLPixelFormat                  _pixelFormat;
             };
-            
-        }
-        using impl::MetalRenderingObjects;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/MetalRenderingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/MetalRenderingPluginModule.hpp
index 2dcb010..1f7016e 100755
--- a/src/ios/WikitudeSDK.framework/Headers/MetalRenderingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/MetalRenderingPluginModule.hpp
@@ -15,27 +15,16 @@
 #include "RenderingPluginModule.hpp"
 
 
-namespace wikitude { namespace sdk {
-    
-    namespace impl {
-        class RenderableCameraFrameBucket;
-    }
-    using impl::RenderableCameraFrameBucket;
-}}
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         class MetalRenderingObjects;
+        class RenderableCameraFrameBucket;
         class WT_EXPORT_API MetalRenderingPluginModule : public RenderingPluginModule {
         public:
             virtual void startRender(const MetalRenderingObjects& metalRenderingObjects, RenderableCameraFrameBucket& frameBucket_) = 0;
             virtual void endRender(const MetalRenderingObjects& metalRenderingObjects, RenderableCameraFrameBucket& frameBucket_) = 0;
         };
-    }
-    using impl::MetalRenderingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ObjectTarget.hpp b/src/ios/WikitudeSDK.framework/Headers/ObjectTarget.hpp
index 988fd4f..5faefc0 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ObjectTarget.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ObjectTarget.hpp
@@ -16,11 +16,7 @@
 #include "Geometry.hpp"
 #include "CompilerAttributes.hpp"
 
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         /** @addtogroup ObjectTracking
         *  @{
@@ -102,9 +98,7 @@ namespace wikitude { namespace sdk {
             virtual const Matrix4& getViewMatrix() const = 0;
         };
         /** @}*/
-    }
-    using impl::ObjectTarget;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/ObjectTrackingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/ObjectTrackingPluginModule.hpp
index 195c1de..8bf0a3f 100755
--- a/src/ios/WikitudeSDK.framework/Headers/ObjectTrackingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/ObjectTrackingPluginModule.hpp
@@ -16,22 +16,10 @@
 #include "TrackingPluginModule.hpp"
 
 
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-            class ManagedCameraFrame;
-            class ObjectTracker;
-        }
-        using impl::ManagedCameraFrame;
-        using impl::ObjectTracker;
-    }
-}
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
+        class ManagedCameraFrame;
+        class ObjectTracker;
         class WT_EXPORT_API ObjectTrackingPluginModule : public TrackingPluginModule {
         public:
             virtual ~ObjectTrackingPluginModule() = default;
@@ -39,9 +27,7 @@ namespace wikitude { namespace sdk {
             virtual universal_sdk::ObjectState getTrackingState(sdk::ObjectTracker& objectTracker_) const = 0;
             virtual sdk::Matrix4 getViewMatrix() const = 0;
         };
-    }
-    using impl::ObjectTrackingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/OpenGLESRenderingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/OpenGLESRenderingPluginModule.hpp
index deabdc4..c9914b0 100755
--- a/src/ios/WikitudeSDK.framework/Headers/OpenGLESRenderingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/OpenGLESRenderingPluginModule.hpp
@@ -15,27 +15,15 @@
 #include "RenderingPluginModule.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
 
-    namespace impl {
         class RenderableCameraFrameBucket;
-    }
-    using impl::RenderableCameraFrameBucket;
-}}
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
-
         class WT_EXPORT_API OpenGLESRenderingPluginModule : public RenderingPluginModule {
         public:
             virtual void startRender(RenderableCameraFrameBucket& frameBucket_) = 0;
             virtual void endRender(RenderableCameraFrameBucket& frameBucket_) = 0;
         };
-    }
-    using impl::OpenGLESRenderingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Plane.hpp b/src/ios/WikitudeSDK.framework/Headers/Plane.hpp
index 0b40090..44feed8 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Plane.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Plane.hpp
@@ -18,10 +18,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         /** @addtogroup InstantTracking
          *  @{
@@ -106,10 +103,7 @@ namespace wikitude { namespace sdk {
              */
             virtual const std::vector<Point<float>>& getConvexHull() const = 0;
         };
-    }
-
-    using impl::Plane;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/PlaneType.hpp b/src/ios/WikitudeSDK.framework/Headers/PlaneType.hpp
index 43c76f8..0bfc7c3 100755
--- a/src/ios/WikitudeSDK.framework/Headers/PlaneType.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/PlaneType.hpp
@@ -14,9 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /**
          * @brief Use this enum to determine the type of a plane that was detected by the instant tracker.
@@ -31,9 +29,7 @@ namespace wikitude { namespace sdk {
             /** Arbitrary: The detected plane has an arbitrary orientation. */
             Arbitrary,
         };
-    }
-    using impl::PlaneType;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/PlatformCameraHandler.hpp b/src/ios/WikitudeSDK.framework/Headers/PlatformCameraHandler.hpp
index fac7eb7..3fa1bfa 100755
--- a/src/ios/WikitudeSDK.framework/Headers/PlatformCameraHandler.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/PlatformCameraHandler.hpp
@@ -17,20 +17,9 @@
 #include "CameraPosition.hpp"
 
 
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-            class ManagedCameraFrame;
-        }
-        using impl::ManagedCameraFrame;
-    }
-}
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
+        class ManagedCameraFrame;
         using CameraFrameSizeChangedHandler = std::function<void(const sdk::Size<int>& cameraFrameSize_)>;
         using CameraVerticalFieldOfViewChangedHandler = std::function<void(const float verticalFieldOfView_)>;
         using CameraToSurfaceCorrectedFieldOfViewChangedHandler = std::function<void(const float cameraToSurfaceCorrectedFieldOfView_)>;
@@ -38,14 +27,7 @@ namespace wikitude { namespace sdk {
         using CameraDataOutputHandler = std::function<void(ManagedCameraFrame& managedCameraFrame_)>;
 
         using CameraVerticalFieldOfViewCorrectionHandler = std::function<float(float originalVerticalFieldOfView_)>;
-    }
-    using impl::CameraFrameSizeChangedHandler;
-    using impl::CameraVerticalFieldOfViewChangedHandler;
-    using impl::CameraToSurfaceCorrectedFieldOfViewChangedHandler;
-    using impl::CameraPositionChangedHandler;
-    using impl::CameraDataOutputHandler;
-    using impl::CameraVerticalFieldOfViewCorrectionHandler;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/PlatformRuntimeHandler.hpp b/src/ios/WikitudeSDK.framework/Headers/PlatformRuntimeHandler.hpp
index 96339d4..6042f09 100755
--- a/src/ios/WikitudeSDK.framework/Headers/PlatformRuntimeHandler.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/PlatformRuntimeHandler.hpp
@@ -16,19 +16,12 @@
 #include "Geometry.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         using SurfaceSizeChangedHandler = std::function<void(const sdk::Size<int> surfaceSize_)>;
         using CameraToSurfaceScalingChangedHandler = std::function<void(const sdk::Scale2D<float> cameraToSurfaceScaling_)>;
         using CameraToSurfaceAngleChangedHandler = std::function<void(const float cameraToSurfaceAngle_)>;
-    }
-    using impl::SurfaceSizeChangedHandler;
-    using impl::CameraToSurfaceScalingChangedHandler;
-    using impl::CameraToSurfaceAngleChangedHandler;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/PlatformTrackingHandler.hpp b/src/ios/WikitudeSDK.framework/Headers/PlatformTrackingHandler.hpp
index efc33ec..4abf28b 100755
--- a/src/ios/WikitudeSDK.framework/Headers/PlatformTrackingHandler.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/PlatformTrackingHandler.hpp
@@ -14,15 +14,10 @@
 #include <functional>
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         using ProcessedFrameIdChangedHandler = std::function<void(const long processedFrameId_)>;
-    }
-    using impl::ProcessedFrameIdChangedHandler;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Plugin.hpp b/src/ios/WikitudeSDK.framework/Headers/Plugin.hpp
index ce48a6f..2a22cbe 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Plugin.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Plugin.hpp
@@ -36,14 +36,9 @@
 #include "D3D11RenderingPluginModule.hpp"
 #endif
 
-
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-
+namespace wikitude::sdk {
 
             class CameraFrame;
-            class ManagedCameraFrame;
             class RuntimeParameters;
             class CameraParameters;
             class TrackingParameters;
@@ -51,6 +46,7 @@ namespace wikitude {
             class PluginParameterCollection;
             class DeviceRotationEvent;
             class DeviceOrientationEvent;
+            class ManagedCameraFrame;
 
             enum class WT_EXPORT_API PluginType {
                 Plugin,
@@ -205,11 +201,6 @@ namespace wikitude {
                 std::unique_ptr<D3D11RenderingPluginModule>     _d3d11RenderingModule;
 #endif
             };
-        }
-        using impl::PluginParameterCollection;
-        using impl::Plugin;
-        using impl::PluginType;
-    }
 }
 
 #endif /* __cplusplus */
diff --git a/src/ios/WikitudeSDK.framework/Headers/PluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/PluginModule.hpp
index 811e7b5..5bdbe23 100755
--- a/src/ios/WikitudeSDK.framework/Headers/PluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/PluginModule.hpp
@@ -13,20 +13,9 @@
 
 #include "CompilerAttributes.hpp"
 
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-            class ManagedCameraFrame;
-        }
-        using impl::ManagedCameraFrame;
-    }
-}
-
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
+        class ManagedCameraFrame;
         class WT_EXPORT_API PluginModule {
         public:
             virtual ~PluginModule() = default;
@@ -44,9 +33,7 @@ namespace wikitude { namespace sdk {
         protected:
             bool    _isEnabled = true;
         };
-    }
-    using impl::PluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/PluginParameterCollection.hpp b/src/ios/WikitudeSDK.framework/Headers/PluginParameterCollection.hpp
index dae090b..5afc2b2 100755
--- a/src/ios/WikitudeSDK.framework/Headers/PluginParameterCollection.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/PluginParameterCollection.hpp
@@ -14,11 +14,8 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
 
-    namespace impl {
-
-        
         class RuntimeParameters;
         class CameraParameters;
         class TrackingParameters;
@@ -35,9 +32,7 @@ namespace wikitude { namespace sdk {
             virtual const TrackingParameters& getTrackingParameters() const = 0;
             virtual TrackingParameters& getTrackingParameters() = 0;
         };
-    }
-    using impl::PluginParameterCollection;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Positionable.hpp b/src/ios/WikitudeSDK.framework/Headers/Positionable.hpp
index de946c1..3d47a68 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Positionable.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Positionable.hpp
@@ -16,9 +16,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         class PositionableFunctionCollection
         {
@@ -119,10 +117,7 @@ namespace wikitude { namespace sdk {
         private:
             PositionableFunctionCollection _positionableFunctionCollection;
         };
-    }
-    using impl::PositionableFunctionCollection;
-    using impl::Positionable;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RecognizedTargetsBucket.hpp b/src/ios/WikitudeSDK.framework/Headers/RecognizedTargetsBucket.hpp
index 47e707f..ecbbcf9 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RecognizedTargetsBucket.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RecognizedTargetsBucket.hpp
@@ -21,9 +21,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         class Matrix4;
         class WT_EXPORT_API RecognizedTargetsBucket {
@@ -39,9 +37,7 @@ namespace wikitude { namespace sdk {
             virtual const std::vector<Plane*>& getPlanes() const = 0;
             virtual const Matrix4& getViewMatrix() const = 0;
         };
-    }
-    using impl::RecognizedTargetsBucket;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrame.hpp b/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrame.hpp
index 384c770..5ae5127 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrame.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrame.hpp
@@ -19,9 +19,7 @@
 #include "CameraFrame.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         class WT_EXPORT_API RenderableCameraFrame {
         public:
@@ -34,9 +32,7 @@ namespace wikitude { namespace sdk {
             virtual const std::vector<CameraFramePlane>& getData() = 0;
             virtual const sdk::ColorCameraFrameMetadata& getColorMetadata() const = 0;
         };
-    }
-    using impl::RenderableCameraFrame;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrameBucket.hpp b/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrameBucket.hpp
index 4f0b153..dea3671 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrameBucket.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RenderableCameraFrameBucket.hpp
@@ -17,10 +17,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class RenderableCameraFrame;
         class WT_EXPORT_API RenderableCameraFrameBucket {
@@ -29,9 +26,7 @@ namespace wikitude { namespace sdk {
             
             virtual void getRenderableCameraFrameForId(long id_, std::function<void(RenderableCameraFrame&)> successHandler_, std::function<void(Error&)> errorHandler_) = 0;
         };
-    }
-    using impl::RenderableCameraFrameBucket;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RenderingAPI.hpp b/src/ios/WikitudeSDK.framework/Headers/RenderingAPI.hpp
index eaa97e1..7000aee 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RenderingAPI.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RenderingAPI.hpp
@@ -13,9 +13,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-    
-    namespace impl {
+namespace wikitude::sdk {
         
         enum class WT_EXPORT_API RenderingAPI {
             OpenGL_ES_2,
@@ -25,9 +23,7 @@ namespace wikitude { namespace sdk {
             None,
             RenderingAPIs
         };    
-    }
-    using impl::RenderingAPI;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RenderingParameters.hpp b/src/ios/WikitudeSDK.framework/Headers/RenderingParameters.hpp
index bb7514b..3844e51 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RenderingParameters.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RenderingParameters.hpp
@@ -12,28 +12,13 @@
 #ifdef __cplusplus
 
 #include "CompilerAttributes.hpp"
-
-
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-            enum class RenderingAPI;
-        }
-        using impl::RenderingAPI;
-    }
-    namespace universal_sdk {
-        namespace impl {
-            class RenderingParametersInternal;
-        }
-        using impl::RenderingParametersInternal;
-    }
+namespace wikitude::universal_sdk {
+    class RenderingParametersInternal;
 }
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
+        enum class RenderingAPI;
         class WT_EXPORT_API RenderingParameters {
         public:
             RenderingParameters(universal_sdk::RenderingParametersInternal& internalRenderingParameters_);
@@ -45,9 +30,7 @@ namespace wikitude { namespace sdk {
         protected:
             universal_sdk::RenderingParametersInternal&     _internalRenderingParameters;
         };
-    }
-    using impl::RenderingParameters;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RenderingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/RenderingPluginModule.hpp
index e1ffda3..7f3903f 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RenderingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RenderingPluginModule.hpp
@@ -15,18 +15,13 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class WT_EXPORT_API RenderingPluginModule : public PluginModule {
         public:
             virtual ~RenderingPluginModule() = default;
         };
-    }
-    using impl::RenderingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/RuntimeParameters.hpp b/src/ios/WikitudeSDK.framework/Headers/RuntimeParameters.hpp
index 9c08338..064b606 100755
--- a/src/ios/WikitudeSDK.framework/Headers/RuntimeParameters.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/RuntimeParameters.hpp
@@ -15,18 +15,11 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude {
-    namespace universal_sdk {
-        namespace impl {
-            class RuntimeParametersInternal;
-        }
-        using impl::RuntimeParametersInternal;
-    }
+namespace wikitude::universal_sdk {
+    class RuntimeParametersInternal;
 }
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /**
          * @brief RuntimeParameters provide access to runtime specific information.
@@ -98,9 +91,7 @@ namespace wikitude { namespace sdk {
         protected:
             universal_sdk::RuntimeParametersInternal*   _internalRuntimeParameters;
         };
-    }
-    using impl::RuntimeParameters;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/SDKEdition.hpp b/src/ios/WikitudeSDK.framework/Headers/SDKEdition.hpp
index 2349bba..a4b5ea2 100755
--- a/src/ios/WikitudeSDK.framework/Headers/SDKEdition.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/SDKEdition.hpp
@@ -14,9 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
+namespace wikitude::sdk {
 
         /**
          * @brief Use this enum to determine which edition of the SDK is running.
@@ -27,9 +25,7 @@ namespace wikitude { namespace sdk {
             /** ExpertEdition: The Expert edition of the SDK enables additional features. */
             ExpertEdition
         };
-    }
-    using impl::SDKEdition;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/SensorEvent.hpp b/src/ios/WikitudeSDK.framework/Headers/SensorEvent.hpp
index 6b000be..670aec5 100755
--- a/src/ios/WikitudeSDK.framework/Headers/SensorEvent.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/SensorEvent.hpp
@@ -15,11 +15,8 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
+namespace wikitude::sdk {
     
-    namespace impl {
-
-
         struct WT_EXPORT_API DeviceMotionData {
             DeviceMotionData(std::shared_ptr<float> motion_)
             :
@@ -123,16 +120,7 @@ namespace wikitude { namespace sdk {
         private:
             HeadingData     _heading;
         };
-    }
-    using impl::SensorEvent;
-    using impl::DeviceMotionData;
-    using impl::AccelerationData;
-    using impl::HeadingData;
-    using impl::DeviceRotationEvent;
-    using impl::DeviceOrientationEvent;
-    using impl::AccelerationEvent;
-    using impl::HeadingEvent;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/State.hpp b/src/ios/WikitudeSDK.framework/Headers/State.hpp
index 8046f6c..37f3532 100755
--- a/src/ios/WikitudeSDK.framework/Headers/State.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/State.hpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <string>
 
-#include "Unit.h"
+#include "Unit.hpp"
 #include "Geometry.hpp"
 #include "Matrix4.hpp"
 #include "Timestamp.hpp"
@@ -30,10 +30,7 @@ namespace aramis {
     struct Plane;
 }
 
-namespace wikitude { namespace universal_sdk {
-
-    namespace impl {
-
+namespace wikitude::universal_sdk {
 
         struct WT_EXPORT_API CommonProperties {
         public:
@@ -144,14 +141,7 @@ namespace wikitude { namespace universal_sdk {
             std::vector<InstantTargetState>      _targetStates;
             std::vector<PlaneState>              _planeStates;
         };
-    }
-    using impl::ImageTargetState;
-    using impl::ObjectTargetState;
-    using impl::InstantTargetState;
-    using impl::ImageState;
-    using impl::InstantState;
-    using impl::ObjectState;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Timestamp.hpp b/src/ios/WikitudeSDK.framework/Headers/Timestamp.hpp
index 787815f..136fb42 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Timestamp.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Timestamp.hpp
@@ -16,10 +16,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         /** @struct Timestamp
          * @brief Timestamp represents a single point in time. _value/_timescale = seconds.
@@ -29,9 +26,7 @@ namespace wikitude { namespace sdk {
             std::int64_t    _value = 0;
             std::int32_t    _timescale = 0;
         };
-    }
-    using impl::Timestamp;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/TrackingParameters.hpp b/src/ios/WikitudeSDK.framework/Headers/TrackingParameters.hpp
index 8a9e505..3b62ae6 100755
--- a/src/ios/WikitudeSDK.framework/Headers/TrackingParameters.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/TrackingParameters.hpp
@@ -15,19 +15,11 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude {
-    namespace universal_sdk {
-        namespace impl {
-            class TrackingParametersInternal;
-        }
-        using impl::TrackingParametersInternal;
-    }
+namespace wikitude::universal_sdk {
+    class TrackingParametersInternal;
 }
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class WT_EXPORT_API TrackingParameters {
         public:
@@ -40,9 +32,7 @@ namespace wikitude { namespace sdk {
         protected:
             universal_sdk::TrackingParametersInternal*  _internalTrackingParameters;
         };
-    }
-    using impl::TrackingParameters;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/TrackingPluginModule.hpp b/src/ios/WikitudeSDK.framework/Headers/TrackingPluginModule.hpp
index 6f597eb..a9e43af 100755
--- a/src/ios/WikitudeSDK.framework/Headers/TrackingPluginModule.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/TrackingPluginModule.hpp
@@ -17,19 +17,11 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude {
-    namespace universal_sdk {
-        namespace impl {
-            class BaseTracker;
-        }
-        using impl::BaseTracker;
-    }
+namespace wikitude::universal_sdk {
+    class BaseTracker;
 }
 
-namespace wikitude { namespace sdk {
-
-    namespace impl {
-
+namespace wikitude::sdk {
 
         class WT_EXPORT_API TrackingPluginModule : public PluginModule {
         public:
@@ -43,9 +35,7 @@ namespace wikitude { namespace sdk {
             virtual void addTracker(universal_sdk::BaseTracker& tracker_) = 0;
             virtual void removeTracker(universal_sdk::BaseTracker& tracker_) = 0;
         };
-    }
-    using impl::TrackingPluginModule;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Unit.h b/src/ios/WikitudeSDK.framework/Headers/Unit.hpp
similarity index 93%
rename from src/ios/WikitudeSDK.framework/Headers/Unit.h
rename to src/ios/WikitudeSDK.framework/Headers/Unit.hpp
index 6f28b08..093e610 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Unit.h
+++ b/src/ios/WikitudeSDK.framework/Headers/Unit.hpp
@@ -1,5 +1,5 @@
 //
-//  Unit.h
+//  Unit.hpp
 //  CommonLibrary
 //
 //  Created by Andreas Schacherbauer on 14/09/14.
@@ -14,10 +14,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-    
-    namespace impl {
-        
+namespace wikitude::sdk {
         
         template <typename T>
         class WT_EXPORT_API Unit {
@@ -68,10 +65,8 @@ namespace wikitude { namespace sdk {
             Millimeter(T value) : Unit<T>(value) {};
             virtual ~Millimeter() {};
         };
-    }
-    using impl::Unit;
     using Millimeter = Unit<int>::Millimeter;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/Vector3.hpp b/src/ios/WikitudeSDK.framework/Headers/Vector3.hpp
index 1d527fa..f5dbd9c 100755
--- a/src/ios/WikitudeSDK.framework/Headers/Vector3.hpp
+++ b/src/ios/WikitudeSDK.framework/Headers/Vector3.hpp
@@ -17,9 +17,7 @@
 #include "CompilerAttributes.hpp"
 
 
-namespace wikitude { namespace sdk {
-    
-    namespace impl {
+namespace wikitude::sdk {
         
         /**
          * A three component float based vector providing utility methods for working with and manipulating 3D vectors. Compatible with Matrix4.
@@ -271,9 +269,7 @@ namespace wikitude { namespace sdk {
              */
             float z;
         };
-    }
-    using impl::Vector3;
-}}
+}
 
 #endif /* __cplusplus */
 
diff --git a/src/ios/WikitudeSDK.framework/Headers/WTArchitectView+Plugins.h b/src/ios/WikitudeSDK.framework/Headers/WTArchitectView+Plugins.h
index 1926bb6..ca10995 100755
--- a/src/ios/WikitudeSDK.framework/Headers/WTArchitectView+Plugins.h
+++ b/src/ios/WikitudeSDK.framework/Headers/WTArchitectView+Plugins.h
@@ -14,13 +14,8 @@
 #include <memory>
 
 
-namespace wikitude {
-    namespace sdk {
-        namespace impl {
-            class Plugin;
-        }
-        using impl::Plugin;
-    }
+namespace wikitude::sdk {
+    class Plugin;
 }
 
 /**
diff --git a/src/ios/WikitudeSDK.framework/Headers/WikitudeSDK.h b/src/ios/WikitudeSDK.framework/Headers/WikitudeSDK.h
index c1a668d..7286ee5 100755
--- a/src/ios/WikitudeSDK.framework/Headers/WikitudeSDK.h
+++ b/src/ios/WikitudeSDK.framework/Headers/WikitudeSDK.h
@@ -46,7 +46,7 @@ FOUNDATION_EXPORT const unsigned char WikitudeSDKVersionString[];
 #import <WikitudeSDK/InstantTarget.hpp>
 #import <WikitudeSDK/InstantTrackingPluginModule.hpp>
 #import <WikitudeSDK/InstantTrackingState.hpp>
-#import <WikitudeSDK/InterfaceOrientation.h>
+#import <WikitudeSDK/InterfaceOrientation.hpp>
 #import <WikitudeSDK/InitializationPose.hpp>
 #import <WikitudeSDK/JavaScriptPluginModule.hpp>
 #import <WikitudeSDK/ManagedCameraFrame.hpp>
@@ -78,5 +78,5 @@ FOUNDATION_EXPORT const unsigned char WikitudeSDKVersionString[];
 #import <WikitudeSDK/Timestamp.hpp>
 #import <WikitudeSDK/TrackingParameters.hpp>
 #import <WikitudeSDK/TrackingPluginModule.hpp>
-#import <WikitudeSDK/Unit.h>
+#import <WikitudeSDK/Unit.hpp>
 #import <WikitudeSDK/Vector3.hpp>
diff --git a/src/ios/WikitudeSDK.framework/Info.plist b/src/ios/WikitudeSDK.framework/Info.plist
index f1bf8ea..93985da 100755
Binary files a/src/ios/WikitudeSDK.framework/Info.plist and b/src/ios/WikitudeSDK.framework/Info.plist differ
diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 b/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64
index 68cca2e..64c5fa2 100755
Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-arm64 differ
diff --git a/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 b/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64
index f05c0e3..77df076 100755
Binary files a/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 and b/src/ios/WikitudeSDK.framework/WikitudeSDK-x86_64 differ
diff --git a/www/WikitudePlugin.js b/www/WikitudePlugin.js
index 9246f8d..ecb4d6a 100644
--- a/www/WikitudePlugin.js
+++ b/www/WikitudePlugin.js
@@ -274,6 +274,15 @@
     	cordova.exec(this.onWikitudeOK, this.onWikitudeError, "WikitudePlugin", "openAppSettings", []);
 	}
 
+	/**
+	 * Use this function to display an alert with a specific message.
+	 *
+	 * @param alertString The message to display in the alert.
+	 */
+	WikitudePlugin.prototype.showAlert = function(alertString) {
+		cordova.exec(this.onWikitudeOK, this.onWikitudeError, "WikitudePlugin", "showAlert", [alertString]);
+	};
+
 	/*
 	 *	=============================================================================================================================
 	 *