diff --git a/samples/blackmisc/samplescontainer.cpp b/samples/blackmisc/samplescontainer.cpp
index faafea370..bed4f25c7 100644
--- a/samples/blackmisc/samplescontainer.cpp
+++ b/samples/blackmisc/samplescontainer.cpp
@@ -71,7 +71,7 @@ namespace BlackMiscTest
         atcList.push_back(station1);
         CAtcStation station1Cpy(station1);
         CFrequency changedFrequency(118.25, CFrequencyUnit::MHz());
-        CPropertyIndexVariantMap vm(CAtcStation::IndexFrequency, changedFrequency.toCVariant());
+        CPropertyIndexVariantMap vm(CAtcStation::IndexFrequency, CVariant::from(changedFrequency));
 
 
         // demonstration apply
diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp
index 98a7694df..de941f4b0 100644
--- a/src/blackcore/airspace_monitor.cpp
+++ b/src/blackcore/airspace_monitor.cpp
@@ -167,7 +167,7 @@ namespace BlackCore
     {
         Q_UNUSED(originator);
         QWriteLocker l(&m_lockAircraft);
-        CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, model.toCVariant());
+        CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, CVariant::from(model));
         int c = m_aircraftInRange.applyIfCallsign(callsign, vm);
         return c > 0;
     }
@@ -471,7 +471,7 @@ namespace BlackCore
         capabilities.addValue(CClient::FsdWithModelDescription, (flags & INetwork::SupportsModelDescriptions));
         capabilities.addValue(CClient::FsdWithAircraftConfig, (flags & INetwork::SupportsAircraftConfigs));
 
-        CPropertyIndexVariantMap vm(CClient::IndexCapabilities, capabilities.toCVariant());
+        CPropertyIndexVariantMap vm(CClient::IndexCapabilities, CVariant::from(capabilities));
         CVoiceCapabilities caps = m_vatsimDataFileReader->getVoiceCapabilityForCallsign(callsign);
         vm.addValue({CClient::IndexVoiceCapabilities}, caps);
         if (!this->m_otherClients.containsCallsign(callsign)) { this->m_otherClients.push_back(CClient(callsign)); }
@@ -550,7 +550,7 @@ namespace BlackCore
         CInformationMessage metar(CInformationMessage::METAR, metarMessage);
 
         // add METAR to existing stations
-        CPropertyIndexVariantMap vm(CAtcStation::IndexMetar, metar.toCVariant());
+        CPropertyIndexVariantMap vm(CAtcStation::IndexMetar, CVariant::from(metar));
         this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsignTower, vm);
         this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsignTower, vm);
         this->m_metarCache.insert(icaoCode, metar);
@@ -746,7 +746,7 @@ namespace BlackCore
     {
         Q_ASSERT(BlackCore::isCurrentThreadObjectThread(this));
         if (!this->m_connected || callsign.isEmpty()) return;
-        CPropertyIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toCVariant());
+        CPropertyIndexVariantMap vm(CAtcStation::IndexAtis, CVariant::from(atisMessage));
         int changedOnline = this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm);
 
         // receiving an ATIS means station is online, update in bookings
@@ -779,7 +779,7 @@ namespace BlackCore
         }
 
         // receiving voice room means ATC has voice
-        vm = CPropertyIndexVariantMap(CClient::IndexVoiceCapabilities, CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Voice).toCVariant());
+        vm = CPropertyIndexVariantMap(CClient::IndexVoiceCapabilities, CVariant::from(CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Voice)));
         this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm, false);
     }
 
@@ -814,14 +814,14 @@ namespace BlackCore
         if (!this->m_connected) { return; }
 
         // update
-        CPropertyIndexVariantMap vm(CAircraft::IndexIcao, icaoData.toCVariant());
+        CPropertyIndexVariantMap vm(CAircraft::IndexIcao, CVariant::from(icaoData));
         if (!icaoData.hasAircraftDesignator())
         {
             // empty so far, try to fetch from data file
             CLogMessage(this).warning("Empty ICAO info for %1 %2") << callsign.toQString() << icaoData.toQString();
             CAircraftIcaoData icaoDataFromDataFile = this->m_vatsimDataFileReader->getIcaoInfo(callsign);
             if (!icaoDataFromDataFile.hasAircraftDesignator()) { return; } // give up!
-            vm = CPropertyIndexVariantMap(CAircraft::IndexIcao, icaoDataFromDataFile.toCVariant());
+            vm = CPropertyIndexVariantMap(CAircraft::IndexIcao, CVariant::from(icaoDataFromDataFile));
         }
         // ICAO code received when aircraft is already removed or not yet ready
         // We add it to cache and use it when aircraft is created
@@ -1004,7 +1004,7 @@ namespace BlackCore
 
         // update
         int changed;
-        CPropertyIndexVariantMap vm({CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency}, frequency.toCVariant());
+        CPropertyIndexVariantMap vm({CAircraft::IndexCom1System, CComSystem::IndexActiveFrequency}, CVariant::from(frequency));
         {
             QWriteLocker l(&m_lockAircraft);
             changed = this->m_aircraftInRange.applyIf(&CAircraft::getCallsign, callsign, vm, true);
diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp
index dea10d53b..3dea678ef 100644
--- a/src/blackgui/components/settingshotkeycomponent.cpp
+++ b/src/blackgui/components/settingshotkeycomponent.cpp
@@ -11,8 +11,10 @@
 #include "ui_settingshotkeycomponent.h"
 #include "blackcore/context_settings.h"
 #include "blackmisc/settingutilities.h"
+#include "blackmisc/variant.h"
 
 using namespace BlackCore;
+using namespace BlackMisc;
 using namespace BlackMisc::Settings;
 
 namespace BlackGui
@@ -56,7 +58,7 @@ namespace BlackGui
         void CSettingsHotkeyComponent::ps_saveHotkeys()
         {
             const QString path = CSettingUtilities::appendPaths(IContextSettings::PathRoot(), IContextSettings::PathHotkeys());
-            this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), this->ui->tvp_SettingsMiscHotkeys->derivedModel()->getContainer().toCVariant());
+            this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), CVariant::from(this->ui->tvp_SettingsMiscHotkeys->derivedModel()->getContainer()));
         }
 
         void CSettingsHotkeyComponent::ps_clearHotkey()
diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp
index 14455418d..1baaec829 100644
--- a/src/blackgui/components/settingsnetworkserverscomponent.cpp
+++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp
@@ -79,11 +79,11 @@ namespace BlackGui
             QObject *sender = QObject::sender();
             if (sender == this->ui->pb_SettingsTnServersRemoveServer)
             {
-                this->getIContextSettings()->value(path, CSettingUtilities::CmdRemove(), server.toCVariant());
+                this->getIContextSettings()->value(path, CSettingUtilities::CmdRemove(), CVariant::from(server));
             }
             else if (sender == this->ui->pb_SettingsTnServersSaveServer)
             {
-                this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), server.toCVariant());
+                this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), CVariant::from(server));
             }
         }
 
diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp
index 56ab537ed..ec2e05d93 100644
--- a/src/blackgui/components/settingssimulatorcomponent.cpp
+++ b/src/blackgui/components/settingssimulatorcomponent.cpp
@@ -157,7 +157,7 @@ namespace BlackGui
             // update
             CSimulatorPluginInfo currentDriver = simDrivers[index];
             const QString path = CSettingUtilities::appendPaths(IContextSettings::PathSimulatorSettings(), CSettingsSimulator::ValueSelectedDriver());
-            this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), currentDriver.toCVariant());
+            this->getIContextSettings()->value(path, CSettingUtilities::CmdUpdate(), CVariant::from(currentDriver));
         }
 
         void CSettingsSimulatorComponent::ps_settingsHaveChanged(uint settingsType)
diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp
index e5353b654..bdc21ca38 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -142,7 +142,7 @@ namespace BlackGui
                     // if the channel is selected, do nothing
                     if (!this->isCorrespondingTextMessageTabSelected(message))
                     {
-                        emit this->displayInInfoWindow(message.toCVariant(), 5 * 1000);
+                        emit this->displayInInfoWindow(CVariant::from(message), 5 * 1000);
                     }
                 }
             }
diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp
index 05be7a2fd..d51266a14 100644
--- a/src/blackgui/models/listmodelbase.cpp
+++ b/src/blackgui/models/listmodelbase.cpp
@@ -234,7 +234,7 @@ namespace BlackGui
             {
                 ContainerType sortedContainer = this->sortContainerByColumn(container, sortColumn, sortOrder);
                 QMetaObject::invokeMethod(this, "ps_updateContainer",
-                                          Q_ARG(BlackMisc::CVariant, sortedContainer.toCVariant()), Q_ARG(bool, false));
+                                          Q_ARG(BlackMisc::CVariant, CVariant::from(sortedContainer)), Q_ARG(bool, false));
             });
             worker->then(this, &CListModelBase::asyncUpdateFinished);
             return worker;
diff --git a/src/blackgui/models/namevariantpairlistmodel.cpp b/src/blackgui/models/namevariantpairlistmodel.cpp
index c59a22e31..1c8cbc1f0 100644
--- a/src/blackgui/models/namevariantpairlistmodel.cpp
+++ b/src/blackgui/models/namevariantpairlistmodel.cpp
@@ -85,7 +85,7 @@ namespace BlackGui
             if (rowIndex < 0) { return false; }
             QModelIndex i = this->index(rowIndex, 0);
             const CNameVariantPair cv = this->at(i);
-            return value == cv.toCVariant();
+            return value == CVariant::from(cv);
         }
     } // namespace
 } // namespace
diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp
index 9a5f38720..ec00fdc09 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/blackgui/views/viewbase.cpp
@@ -239,7 +239,7 @@ namespace BlackGui
             {
                 ContainerType sortedContainer = model->sortContainerByColumn(container, sortColumn, sortOrder);
                 QMetaObject::invokeMethod(this, "ps_updateContainer",
-                                          Q_ARG(BlackMisc::CVariant, sortedContainer.toCVariant()), Q_ARG(bool, false), Q_ARG(bool, resize));
+                                          Q_ARG(BlackMisc::CVariant, CVariant::from(sortedContainer)), Q_ARG(bool, false), Q_ARG(bool, resize));
             });
             worker->then(this, &CViewBase::asyncUpdateFinished);
             return worker;
diff --git a/src/blackmisc/audio/voiceroom.cpp b/src/blackmisc/audio/voiceroom.cpp
index dc1cfa0a5..1e2095669 100644
--- a/src/blackmisc/audio/voiceroom.cpp
+++ b/src/blackmisc/audio/voiceroom.cpp
@@ -28,7 +28,7 @@ namespace BlackMisc
 
         CVariant CVoiceRoom::propertyByIndex(const CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircraft.cpp b/src/blackmisc/aviation/aircraft.cpp
index b351edd6b..1f5a05602 100644
--- a/src/blackmisc/aviation/aircraft.cpp
+++ b/src/blackmisc/aviation/aircraft.cpp
@@ -192,7 +192,7 @@ namespace BlackMisc
 
         CVariant CAircraft::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index c32c762be..2aeeef916 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -79,7 +79,7 @@ namespace BlackMisc
 
         CVariant CAircraftIcaoCode::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircrafticaodata.cpp b/src/blackmisc/aviation/aircrafticaodata.cpp
index fc116a89a..4f562f925 100644
--- a/src/blackmisc/aviation/aircrafticaodata.cpp
+++ b/src/blackmisc/aviation/aircrafticaodata.cpp
@@ -77,7 +77,7 @@ namespace BlackMisc
 
         CVariant CAircraftIcaoData::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp
index 3358632b5..4395f296d 100644
--- a/src/blackmisc/aviation/aircraftlights.cpp
+++ b/src/blackmisc/aviation/aircraftlights.cpp
@@ -51,7 +51,7 @@ namespace BlackMisc
 
         CVariant CAircraftLights::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
 
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp
index 0d1ffe2e5..cd00cf025 100644
--- a/src/blackmisc/aviation/aircraftparts.cpp
+++ b/src/blackmisc/aviation/aircraftparts.cpp
@@ -33,7 +33,7 @@ namespace BlackMisc
 
         CVariant CAircraftParts::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             if (ITimestampBased::canHandleIndex(index))
             {
                 return ITimestampBased::propertyByIndex(index);
@@ -45,7 +45,7 @@ namespace BlackMisc
             case IndexCallsign:
                 return m_correspondingCallsign.propertyByIndex(index.copyFrontRemoved());
             case IndexEngines:
-                return this->m_engines.toCVariant();
+                return CVariant::fromValue(this->m_engines);
             case IndexFlapsPercentage:
                 return CVariant::fromValue(this->m_flapsPercentage);
             case IndexGearDown:
diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index cc9e115ac..90f94dbc4 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -47,7 +47,7 @@ namespace BlackMisc
 
         CVariant CAircraftSituation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             if (ITimestampBased::canHandleIndex(index))
             {
                 return ITimestampBased::propertyByIndex(index);
diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index a762a73e6..7c08fbfa4 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -37,7 +37,7 @@ namespace BlackMisc
 
         CVariant CAirlineIcaoCode::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp
index d5bc26d01..b8c06607c 100644
--- a/src/blackmisc/aviation/airport.cpp
+++ b/src/blackmisc/aviation/airport.cpp
@@ -53,7 +53,7 @@ namespace BlackMisc
 
         CVariant CAirport::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp
index 718c1bcd8..9ff85f3a0 100644
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -335,7 +335,7 @@ namespace BlackMisc
 
         CVariant CAtcStation::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index 067d4e58d..07b37ab07 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -128,7 +128,7 @@ namespace BlackMisc
 
         CVariant CCallsign::propertyByIndex(const CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/modulator.cpp b/src/blackmisc/aviation/modulator.cpp
index 8ff44db51..a7852ba58 100644
--- a/src/blackmisc/aviation/modulator.cpp
+++ b/src/blackmisc/aviation/modulator.cpp
@@ -106,7 +106,7 @@ namespace BlackMisc
         template <class AVIO>
         CVariant CModulator<AVIO>::propertyByIndex(const CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*derived()); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/transponder.cpp b/src/blackmisc/aviation/transponder.cpp
index cac0435ed..9c66aeb1d 100644
--- a/src/blackmisc/aviation/transponder.cpp
+++ b/src/blackmisc/aviation/transponder.cpp
@@ -146,7 +146,7 @@ namespace BlackMisc
 
         CVariant CTransponder::propertyByIndex(const CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp
index 43899e389..4c003934c 100644
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -126,7 +126,7 @@ namespace BlackMisc
 
         CVariant CCoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             if (ICoordinateGeodetic::canHandleIndex(index))
             {
                 return ICoordinateGeodetic::propertyByIndex(index);
diff --git a/src/blackmisc/hardware/joystickbutton.cpp b/src/blackmisc/hardware/joystickbutton.cpp
index 969fb5815..c15b1753b 100644
--- a/src/blackmisc/hardware/joystickbutton.cpp
+++ b/src/blackmisc/hardware/joystickbutton.cpp
@@ -56,7 +56,7 @@ namespace BlackMisc
 
         CVariant CJoystickButton::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/hardware/keyboardkey.cpp b/src/blackmisc/hardware/keyboardkey.cpp
index d84916323..ef7e7987b 100644
--- a/src/blackmisc/hardware/keyboardkey.cpp
+++ b/src/blackmisc/hardware/keyboardkey.cpp
@@ -248,7 +248,7 @@ namespace BlackMisc
 
         CVariant CKeyboardKey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp
index b28baf4dd..a88bdacd2 100644
--- a/src/blackmisc/namevariantpair.cpp
+++ b/src/blackmisc/namevariantpair.cpp
@@ -34,7 +34,7 @@ namespace BlackMisc
 
     CVariant CNameVariantPair::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
     {
-        if (index.isMyself()) { return this->toCVariant(); }
+        if (index.isMyself()) { return CVariant::from(*this); }
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         switch (i)
         {
diff --git a/src/blackmisc/network/aircraftmapping.cpp b/src/blackmisc/network/aircraftmapping.cpp
index 3a727732b..e61aac252 100644
--- a/src/blackmisc/network/aircraftmapping.cpp
+++ b/src/blackmisc/network/aircraftmapping.cpp
@@ -36,7 +36,7 @@ namespace BlackMisc
 
         CVariant CAircraftMapping::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/network/client.cpp b/src/blackmisc/network/client.cpp
index 4854e84b6..fb83e6b36 100644
--- a/src/blackmisc/network/client.cpp
+++ b/src/blackmisc/network/client.cpp
@@ -70,12 +70,12 @@ namespace BlackMisc
 
         CVariant CClient::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
             case IndexCapabilities:
-                return this->m_capabilities.toCVariant();
+                return CVariant::fromValue(this->m_capabilities);
             case IndexCapabilitiesString:
                 return CVariant(this->getCapabilitiesAsString());
             case IndexCallsign:
@@ -91,7 +91,7 @@ namespace BlackMisc
             case IndexVoiceCapabilitiesPixmap:
                 return CVariant::from(this->m_voiceCapabilities.toPixmap());
             case IndexVoiceCapabilitiesIcon:
-                return this->m_voiceCapabilities.toIcon().toCVariant();
+                return CVariant::fromValue(this->m_voiceCapabilities.toIcon());
             case IndexVoiceCapabilitiesString:
                 return CVariant(this->m_voiceCapabilities.toQString(true));
             default:
diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp
index 693c01fd4..ce5db21eb 100644
--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -47,7 +47,7 @@ namespace BlackMisc
 
         CVariant CServer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp
index 3854b6e48..60f1a5f30 100644
--- a/src/blackmisc/network/textmessage.cpp
+++ b/src/blackmisc/network/textmessage.cpp
@@ -186,7 +186,7 @@ namespace BlackMisc
 
         CVariant CTextMessage::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
 
             ColumnIndex i = index.frontCasted<ColumnIndex>();
diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp
index fdf1cc87d..f84b5df46 100644
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -193,7 +193,7 @@ namespace BlackMisc
 
         CVariant CUser::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/originator.cpp b/src/blackmisc/originator.cpp
index c76a7648d..2f0847319 100644
--- a/src/blackmisc/originator.cpp
+++ b/src/blackmisc/originator.cpp
@@ -55,7 +55,7 @@ namespace BlackMisc
 
     CVariant COriginator::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
     {
-        if (index.isMyself()) { return this->toCVariant(); }
+        if (index.isMyself()) { return CVariant::from(*this); }
 
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp
index 7fad0c2ad..1875eaf9f 100644
--- a/src/blackmisc/pq/physicalquantity.cpp
+++ b/src/blackmisc/pq/physicalquantity.cpp
@@ -345,14 +345,14 @@ namespace BlackMisc
         template <class MU, class PQ>
         CVariant CPhysicalQuantity<MU, PQ>::propertyByIndex(const CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*derived()); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
             case IndexValue:
                 return CVariant::from(this->m_value);
             case IndexUnit:
-                return this->m_unit.toCVariant();
+                return CVariant::from(this->m_unit);
             case IndexValueRounded0DigitsWithUnit:
                 return CVariant::from(this->valueRoundedWithUnit(0));
             case IndexValueRounded1DigitsWithUnit:
diff --git a/src/blackmisc/pq/pqstring.cpp b/src/blackmisc/pq/pqstring.cpp
index ae36d7865..3306c99c9 100644
--- a/src/blackmisc/pq/pqstring.cpp
+++ b/src/blackmisc/pq/pqstring.cpp
@@ -49,55 +49,55 @@ namespace BlackMisc
             if (CMeasurementUnit::isValidUnitSymbol<CAccelerationUnit>(unit))
             {
                 CAcceleration pq(numberD, CMeasurementUnit::unitFromSymbol<CAccelerationUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CAngleUnit>(unit))
             {
                 CAngle pq(numberD, CMeasurementUnit::unitFromSymbol<CAngleUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CFrequencyUnit>(unit))
             {
                 CFrequency pq(numberD, CMeasurementUnit::unitFromSymbol<CFrequencyUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CLengthUnit>(unit))
             {
                 CLength pq(numberD, CMeasurementUnit::unitFromSymbol<CLengthUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CMassUnit>(unit))
             {
                 CMass pq(numberD, CMeasurementUnit::unitFromSymbol<CMassUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CPressureUnit>(unit))
             {
                 CPressure pq(numberD, CMeasurementUnit::unitFromSymbol<CPressureUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CSpeedUnit>(unit))
             {
                 CSpeed pq(numberD, CMeasurementUnit::unitFromSymbol<CSpeedUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CTimeUnit>(unit))
             {
                 CTime pq(numberD, CMeasurementUnit::unitFromSymbol<CTimeUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CTemperatureUnit>(unit))
             {
                 CTemperature pq(numberD, CMeasurementUnit::unitFromSymbol<CTemperatureUnit>(unit, false));
-                return pq.toCVariant();
+                return CVariant::from(pq);
             }
             return v;
         }
diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp
index 367ecc200..c883b3b0c 100644
--- a/src/blackmisc/propertyindexvariantmap.cpp
+++ b/src/blackmisc/propertyindexvariantmap.cpp
@@ -39,7 +39,7 @@ namespace BlackMisc
         {
             // QVariant cannot be compared directly
             CVariant p = variant.propertyByIndex(it.key()); // from value object
-            CVariant v = it.value().toCVariant(); // from map
+            CVariant v = it.value(); // from map
             if (p != v) return false;
         }
         return true;
diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index 5b389cb01..de6afab51 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -149,7 +149,7 @@ namespace BlackMisc
         bool isEmpty() const { return this->m_values.isEmpty(); }
 
         //! Value
-        CVariant value(const CPropertyIndex &index) const { return this->m_values.value(index).toCVariant(); }
+        CVariant value(const CPropertyIndex &index) const { return CVariant::from(this->m_values.value(index)); }
 
         //! Set value
         void value(const CPropertyIndex &index, const CVariant &value) { this->m_values.value(index, value); }
@@ -252,7 +252,7 @@ namespace BlackMisc
             const auto &map = indexMap.map();
             for (auto it = map.begin(); it != map.end(); ++it)
             {
-                const CVariant value = it.value().toCVariant();
+                const CVariant value = it.value();
                 const CPropertyIndex index = it.key();
                 if (skipEqualValues)
                 {
diff --git a/src/blackmisc/setkeyboardhotkey.cpp b/src/blackmisc/setkeyboardhotkey.cpp
index 9952eeacb..749f5e013 100644
--- a/src/blackmisc/setkeyboardhotkey.cpp
+++ b/src/blackmisc/setkeyboardhotkey.cpp
@@ -42,7 +42,7 @@ namespace BlackMisc
 
         CVariant CSettingKeyboardHotkey::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index e1459849c..8e2f801ea 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -35,7 +35,7 @@ namespace BlackMisc
 
         CVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
index 45e678424..bb42eb2f9 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
@@ -101,7 +101,7 @@ namespace BlackMisc
 
         CVariant CAirspaceAircraftSnapshot::propertyByIndex(const CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             return CValueObject::propertyByIndex(index);
         }
 
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
index 3f000a4dc..fce878d3c 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
@@ -101,7 +101,7 @@ namespace BlackMisc
 
             CVariant CAircraftCfgEntries::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
             {
-                if (index.isMyself()) { return this->toCVariant(); }
+                if (index.isMyself()) { return CVariant::from(*this); }
                 ColumnIndex i = index.frontCasted<ColumnIndex>();
                 switch (i)
                 {
diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
index 28710c1a3..6ef65f193 100644
--- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
+++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
@@ -93,7 +93,7 @@ namespace BlackMisc
         bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const COriginator &originator)
         {
             Q_UNUSED(originator);
-            CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, model.toCVariant());
+            CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, CVariant::from(model));
             int n = this->m_aircraft.applyIfCallsign(callsign, vm);
             return n > 0;
         }
diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp
index a725f41e7..b430856f8 100644
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -41,7 +41,7 @@ namespace BlackMisc
 
         CVariant CSimulatedAircraft::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/simulation/simulatorsetup.cpp b/src/blackmisc/simulation/simulatorsetup.cpp
index b6336ac02..6ffb3c344 100644
--- a/src/blackmisc/simulation/simulatorsetup.cpp
+++ b/src/blackmisc/simulation/simulatorsetup.cpp
@@ -57,12 +57,12 @@ namespace BlackMisc
 
         CVariant CSimulatorSetup::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return this->toCVariant(); }
+            if (index.isMyself()) { return CVariant::from(*this); }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
             case IndexData:
-                return m_data.toCVariant();
+                return CVariant::from(m_data);
             default:
                 return CValueObject::propertyByIndex(index);
             }
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 4ac24beb5..298950e61 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -246,7 +246,7 @@ namespace BlackMisc
      */
     CVariant CStatusMessage::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
     {
-        if (index.isMyself()) { return this->toCVariant(); }
+        if (index.isMyself()) { return CVariant::from(*this); }
         if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         switch (i)
diff --git a/src/blackmisc/testing.cpp b/src/blackmisc/testing.cpp
index f89e15133..bf0224bca 100644
--- a/src/blackmisc/testing.cpp
+++ b/src/blackmisc/testing.cpp
@@ -47,15 +47,15 @@ namespace BlackMisc
             CAtcStation station;
             if (byPropertyIndex)
             {
-                station.setPropertyByIndex(CCallsign(cs).toCVariant(), CAtcStation::IndexCallsign);
-                station.setPropertyByIndex(user.toCVariant(), CAtcStation::IndexController);
-                station.setPropertyByIndex(CFrequency(f, CFrequencyUnit::MHz()).toCVariant(), CAtcStation::IndexFrequency);
-                station.setPropertyByIndex(CLength(50, CLengthUnit::km()).toCVariant(), CAtcStation::IndexRange);
-                station.setPropertyByIndex(geoPos.toCVariant(), CAtcStation::IndexPosition);
+                station.setPropertyByIndex(CVariant::from(CCallsign(cs)), CAtcStation::IndexCallsign);
+                station.setPropertyByIndex(CVariant::from(user), CAtcStation::IndexController);
+                station.setPropertyByIndex(CVariant::from(CFrequency(f, CFrequencyUnit::MHz())), CAtcStation::IndexFrequency);
+                station.setPropertyByIndex(CVariant::from(CLength(50, CLengthUnit::km())), CAtcStation::IndexRange);
+                station.setPropertyByIndex(CVariant::from(geoPos), CAtcStation::IndexPosition);
                 station.setPropertyByIndex(CVariant::from(false), CAtcStation::IndexIsOnline);
                 station.setPropertyByIndex(CVariant::from(dtFrom), CAtcStation::IndexBookedFrom);
                 station.setPropertyByIndex(CVariant::from(dtUntil), CAtcStation::IndexBookedUntil);
-                station.setPropertyByIndex(CLength(index + 1, CLengthUnit::NM()).toCVariant(), CAtcStation::IndexDistanceToOwnAircraft);
+                station.setPropertyByIndex(CVariant::from(CLength(index + 1, CLengthUnit::NM())), CAtcStation::IndexDistanceToOwnAircraft);
             }
             else
             {
diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h
index a8b707fb2..b2c5adace 100644
--- a/src/blackmisc/valueobject.h
+++ b/src/blackmisc/valueobject.h
@@ -110,7 +110,7 @@ namespace BlackMisc
         using Mixin::Index<Derived>::apply;
 
         //! \copydoc BlackMisc::Mixin::MetaType::toCVariant
-        using Mixin::MetaType<Derived>::toCVariant;
+//        using Mixin::MetaType<Derived>::toCVariant;
 
         //! \copydoc BlackMisc::Mixin::MetaType::convertFromCVariant
         using Mixin::MetaType<Derived>::convertFromCVariant;
diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h
index 2ddffcd70..4c971419e 100644
--- a/src/blackmisc/variant.h
+++ b/src/blackmisc/variant.h
@@ -65,12 +65,8 @@ namespace BlackMisc
                 return baseIsA(static_cast<const MetaBaseOfT<Derived> *>(derived()), metaTypeId);
             }
 
-            //! Method to return CVariant
-            //! \deprecated Use CVariant::to() instead.
-            CVariant toCVariant() const;
-
             //! Set from CVariant
-            //! \deprecated Use CVariant::from() instead.
+            //! \deprecated Use CVariant::to() instead.
             void convertFromCVariant(const CVariant &variant);
 
             //! Return QVariant, used with DBus QVariant lists
@@ -112,7 +108,6 @@ namespace BlackMisc
             using ::BlackMisc::Mixin::MetaType<DERIVED>::registerMetadata;      \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::getMetaTypeId;         \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;                   \
-            using ::BlackMisc::Mixin::MetaType<DERIVED>::toCVariant;            \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::toQVariant;            \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::convertFromCVariant;   \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::convertFromQVariant;
@@ -125,7 +120,6 @@ namespace BlackMisc
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::registerMetadata;      \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::getMetaTypeId;         \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::isA;                   \
-            using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::toCVariant;            \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::toQVariant;            \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::convertFromCVariant;   \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::convertFromQVariant;
@@ -375,11 +369,6 @@ namespace BlackMisc
 
     namespace Mixin
     {
-        template <class Derived, class... AdditionalTypes>
-        CVariant MetaType<Derived, AdditionalTypes...>::toCVariant() const
-        {
-            return CVariant(derived()->toQVariant());
-        }
         template <class Derived, class... AdditionalTypes>
         void MetaType<Derived, AdditionalTypes...>::convertFromCVariant(const CVariant &variant)
         {
diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulator_fscommon.cpp
index 138b0e738..744226ad3 100644
--- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp
+++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp
@@ -211,7 +211,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFsCommon::ps_aircraftCfgParsingFinished()
         {
-            setPluginData(this, "aircraft_cfg", m_aircraftCfgParser.getAircraftCfgEntriesList().toCVariant());
+            setPluginData(this, "aircraft_cfg", CVariant::from(m_aircraftCfgParser.getAircraftCfgEntriesList()));
             m_modelMatcher.setInstalledModels(m_aircraftCfgParser.getAircraftCfgEntriesList().toAircraftModelList());
 
             // Now the matcher has all required information to be initialized
diff --git a/tests/blackmisc/testvalueobject.cpp b/tests/blackmisc/testvalueobject.cpp
index 120602c6c..aa145437f 100644
--- a/tests/blackmisc/testvalueobject.cpp
+++ b/tests/blackmisc/testvalueobject.cpp
@@ -28,7 +28,7 @@ namespace BlackMisc
      */
     CVariant CTestValueObject::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
     {
-        if (index.isMyself()) { return this->toCVariant(); }
+        if (index.isMyself()) { return CVariant::from(*this); }
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         switch (i)
         {