diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index ee6dbaf66..5f2f6a47e 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -32,6 +32,15 @@ namespace BlackMisc
 {
     namespace Aviation
     {
+        void CAircraftSituation::registerMetadata()
+        {
+            CValueObject<CAircraftSituation>::registerMetadata();
+            qRegisterMetaType<CAircraftSituation::IsOnGround>();
+            qRegisterMetaType<CAircraftSituation::OnGroundDetails>();
+            qRegisterMetaType<CAircraftSituation::AltitudeCorrection>();
+            qRegisterMetaType<CAircraftSituation::GndElevationInfo>();
+        }
+
         CAircraftSituation::CAircraftSituation() {}
 
         CAircraftSituation::CAircraftSituation(const CCallsign &correspondingCallsign) : m_correspondingCallsign(correspondingCallsign)
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index 3e62b27e8..9555761fc 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -547,6 +547,9 @@ namespace BlackMisc
             //! \remark NULL if there are no two elevations
             static Geo::CElevationPlane interpolatedElevation(const CAircraftSituation &situation, const CAircraftSituation &oldSituation, const CAircraftSituation &newSituation, const PhysicalQuantities::CLength &distance = PhysicalQuantities::CLength::null());
 
+            //! Register metadata
+            static void registerMetadata();
+
         private:
             CCallsign m_correspondingCallsign;
             Geo::CCoordinateGeodetic m_position; //!< NULL position as default
diff --git a/src/blackmisc/aviation/aircraftsituationchange.cpp b/src/blackmisc/aviation/aircraftsituationchange.cpp
index 238055673..1de0c0540 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.cpp
+++ b/src/blackmisc/aviation/aircraftsituationchange.cpp
@@ -32,6 +32,12 @@ namespace BlackMisc
 {
     namespace Aviation
     {
+        void CAircraftSituationChange::registerMetadata()
+        {
+            CValueObject<CAircraftSituationChange>::registerMetadata();
+            qRegisterMetaType<CAircraftSituationChange::GuessedSceneryDeviation>();
+        }
+
         CAircraftSituationChange::CAircraftSituationChange() {}
 
         CAircraftSituationChange::CAircraftSituationChange(const CAircraftSituationList &situations, const PhysicalQuantities::CLength &cg, bool isVtol, bool alreadySortedLatestFirst, bool calcStdDeviations)
diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h
index 153c5ce35..34d5db860 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.h
+++ b/src/blackmisc/aviation/aircraftsituationchange.h
@@ -183,6 +183,9 @@ namespace BlackMisc
             //! Within this range deviation is so small we consider values "almost constant"
             static const PhysicalQuantities::CLength &allowedAltitudeDeviation();
 
+            //! Register metadata
+            static void registerMetadata();
+
         private:
             //! Scenery deviation hint
             void setSceneryDeviationHint(GuessedSceneryDeviation hint) { m_guessedSceneryDeviationHint = static_cast<int>(hint); }
diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp
index 2d2083c73..7797349e8 100644
--- a/src/blackmisc/aviation/altitude.cpp
+++ b/src/blackmisc/aviation/altitude.cpp
@@ -25,6 +25,13 @@ namespace BlackMisc
 {
     namespace Aviation
     {
+        void CAltitude::registerMetadata()
+        {
+            Mixin::MetaType<CAltitude>::registerMetadata();
+            qRegisterMetaType<CAltitude::ReferenceDatum>();
+            qRegisterMetaType<CAltitude::AltitudeType>();
+        }
+
         CAltitude::CAltitude(const QString &altitudeAsString, CPqString::SeparatorMode mode) : CLength(0, CLengthUnit::m()), m_datum(MeanSeaLevel)
         {
             this->parseFromString(altitudeAsString, mode);
diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h
index 74ef7edf5..02de8d8c7 100644
--- a/src/blackmisc/aviation/altitude.h
+++ b/src/blackmisc/aviation/altitude.h
@@ -198,6 +198,9 @@ namespace BlackMisc
             //! Standard pressure 1013.25mbar/hPa
             static const PhysicalQuantities::CPressure &standardISASeaLevelPressure();
 
+            //! Register metadata
+            static void registerMetadata();
+
         private:
             ReferenceDatum m_datum; //!< MSL or AGL?
             AltitudeType m_altitudeType = TrueAltitude; //!< type
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index 6bacd3ae2..6c91a3b2e 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -21,6 +21,12 @@ namespace BlackMisc
 {
     namespace Aviation
     {
+        void CCallsign::registerMetadata()
+        {
+            CValueObject<CCallsign>::registerMetadata();
+            qRegisterMetaType<CCallsign::TypeHint>();
+        }
+
         QString CCallsign::convertToQString(bool i18n) const
         {
             Q_UNUSED(i18n);
diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h
index 675b48ad4..193d972f0 100644
--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -162,6 +162,9 @@ namespace BlackMisc
             //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
+            //! Register metadata
+            static void registerMetadata();
+
         private:
             QString  m_callsignAsSet;
             QString  m_callsign;
diff --git a/src/blackmisc/aviation/heading.cpp b/src/blackmisc/aviation/heading.cpp
index 482a3fe78..7ecd23a90 100644
--- a/src/blackmisc/aviation/heading.cpp
+++ b/src/blackmisc/aviation/heading.cpp
@@ -34,5 +34,11 @@ namespace BlackMisc
                              this->isMagneticHeading() ? "magnetic" : "true");
             }
         }
+
+        void CHeading::registerMetadata()
+        {
+            Mixin::MetaType<CHeading>::registerMetadata();
+            qRegisterMetaType<CHeading::ReferenceNorth>();
+        }
     } // namespace
 } // namespace
diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h
index 17616ac92..1220da9d7 100644
--- a/src/blackmisc/aviation/heading.h
+++ b/src/blackmisc/aviation/heading.h
@@ -87,6 +87,9 @@ namespace BlackMisc
             //! Get reference north (magnetic or true)
             ReferenceNorth getReferenceNorth() const { return m_north; }
 
+            //! Register metadata
+            static void registerMetadata();
+
         private:
             ReferenceNorth m_north; //!< magnetic or true?
 
diff --git a/src/blackmisc/aviation/registermetadataaviation.cpp b/src/blackmisc/aviation/registermetadataaviation.cpp
index 69f562036..ece9aeba2 100644
--- a/src/blackmisc/aviation/registermetadataaviation.cpp
+++ b/src/blackmisc/aviation/registermetadataaviation.cpp
@@ -25,12 +25,7 @@ namespace BlackMisc
             CAircraftParts::registerMetadata();
             CAircraftPartsList::registerMetadata();
             CAircraftSituation::registerMetadata();
-            qRegisterMetaType<CAircraftSituation::IsOnGround>();
-            qRegisterMetaType<CAircraftSituation::OnGroundDetails>();
-            qRegisterMetaType<CAircraftSituation::AltitudeCorrection>();
-            qRegisterMetaType<CAircraftSituation::GndElevationInfo>();
             CAircraftSituationChange::registerMetadata();
-            qRegisterMetaType<CAircraftSituationChange::GuessedSceneryDeviation>();
             CAircraftSituationList::registerMetadata();
             CAirlineIcaoCode::registerMetadata();
             CAirlineIcaoCodeList::registerMetadata();
@@ -38,19 +33,15 @@ namespace BlackMisc
             CAirport::registerMetadata();
             CAirportList::registerMetadata();
             CAltitude::registerMetadata();
-            qRegisterMetaType<CAltitude::ReferenceDatum>();
-            qRegisterMetaType<CAltitude::AltitudeType>();
             CAtcStation::registerMetadata();
             CAtcStationList::registerMetadata();
             CCallsign::registerMetadata();
-            qRegisterMetaType<CCallsign::TypeHint>();
             CCallsignSet::registerMetadata();
             CComSystem::registerMetadata();
             CFlightPlan::registerMetadata();
             CFlightPlanList::registerMetadata();
             CFlightPlanRemarks::registerMetadata();
             CHeading::registerMetadata();
-            qRegisterMetaType<CHeading::ReferenceNorth>();
             CInformationMessage::registerMetadata();
             CLivery::registerMetadata();
             CLiveryList::registerMetadata();