diff --git a/samples/blacksim/main.cpp b/samples/blacksim/main.cpp
index b54efc210..47c73cc31 100644
--- a/samples/blacksim/main.cpp
+++ b/samples/blacksim/main.cpp
@@ -4,8 +4,11 @@
  *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "blacksim/blacksimfreefunctions.h"
+#include "blackmisc/blackmiscfreefunctions.h"
 #include "samplesfscommon.h"
 #include "samplesfsx.h"
+#include "samplesmodelmapping.h"
+
 #include <QCoreApplication>
 #include <QTextStream>
 #include <QDebug>
@@ -16,11 +19,16 @@
 int main(int argc, char *argv[])
 {
     QTextStream streamIn(stdin);
+    BlackMisc::registerMetadata();
     BlackSim::registerMetadata();
+
     qDebug() << "Run samples:";
     qDebug() << "1 .. FS common";
     qDebug() << "2 .. FSX";
+    qDebug() << "3 .. Mappings";
+    qDebug() << "x .. exit";
     QString i = streamIn.readLine().toLower().trimmed();
+
     if (i.startsWith("1"))
     {
         BlackSimTest::CSamplesFsCommon::samples();
@@ -29,6 +37,15 @@ int main(int argc, char *argv[])
     {
         BlackSimTest::CSamplesFsx::samples();
     }
+    else if (i.startsWith("3"))
+    {
+        BlackSimTest::CSamplesModelMapping::samples();
+    }
+    else if (i.startsWith("x"))
+    {
+        return 0;
+    }
+
     QCoreApplication a(argc, argv);
     return a.exec();
 }
diff --git a/samples/blacksim/samplesmodelmapping.cpp b/samples/blacksim/samplesmodelmapping.cpp
new file mode 100644
index 000000000..91ce0fe1d
--- /dev/null
+++ b/samples/blacksim/samplesmodelmapping.cpp
@@ -0,0 +1,37 @@
+/*  Copyright (C) 2013 VATSIM Community / contributors
+ *  This Source Code Form is subject to the terms of the Mozilla Public
+ *  License, v. 2.0. If a copy of the MPL was not distributed with this
+ *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "samplesmodelmapping.h"
+#include "blackmisc/blackmiscfreefunctions.h"
+#include "blacksim/blacksimfreefunctions.h"
+#include "blacksim/vpilotmodelmappings.h"
+
+#include <QDebug>
+
+using namespace BlackSim;
+
+namespace BlackSimTest
+{
+
+    /*
+     * Samples
+     */
+    int CSamplesModelMapping::samples()
+    {
+        BlackMisc::registerMetadata();
+        BlackSim::registerMetadata();
+
+        CVPilotModelMappings cvm;
+        cvm.addDirectory(CVPilotModelMappings::standardMappingsDirectory());
+        bool s = cvm.load();
+        qDebug() << "loaded:" << s << "size:" << cvm.size();
+
+        BlackMisc::Aviation::CAircraftIcao icao("C172");
+        qDebug() << cvm.findByIcao(icao);
+
+        return 0;
+    }
+
+} // namespace
diff --git a/samples/blacksim/samplesmodelmapping.h b/samples/blacksim/samplesmodelmapping.h
new file mode 100644
index 000000000..177d4e899
--- /dev/null
+++ b/samples/blacksim/samplesmodelmapping.h
@@ -0,0 +1,24 @@
+/*  Copyright (C) 2013 VATSIM Community / contributors
+ *  This Source Code Form is subject to the terms of the Mozilla Public
+ *  License, v. 2.0. If a copy of the MPL was not distributed with this
+ *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BLACKSIMTEST_SAMPLESMODELMAPPING_H
+#define BLACKSIMTEST_SAMPLESMODELMAPPING_H
+
+namespace BlackSimTest
+{
+    /*!
+     * \brief Samples for model mapping classes
+     */
+    class CSamplesModelMapping
+    {
+    public:
+        /*!
+         * \brief Run the samples
+         */
+        static int samples();
+    };
+} // namespace
+
+#endif