diff --git a/src/blackcore/airspace_monitor.cpp b/src/blackcore/airspace_monitor.cpp
index fdaccf941..80c5883b7 100644
--- a/src/blackcore/airspace_monitor.cpp
+++ b/src/blackcore/airspace_monitor.cpp
@@ -423,6 +423,7 @@ namespace BlackCore
             emit removedAircraft(aircraft.getCallsign());
         }
         m_aircraftSituations.clear();
+        m_aircraftParts.clear();
         m_aircraftInRange.clear();
         m_flightPlanCache.clear();
         m_icaoCodeCache.clear();
diff --git a/src/blackcore/airspace_monitor.h b/src/blackcore/airspace_monitor.h
index c97dcce89..ae24a9c83 100644
--- a/src/blackcore/airspace_monitor.h
+++ b/src/blackcore/airspace_monitor.h
@@ -55,7 +55,13 @@ namespace BlackCore
         //! \copydoc IRenderedAircraftProvider::renderedAircraftSituations
         virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() override { return m_aircraftSituations; }
 
-        //! \copydoc IRenderedAircraftProvider::updateAircraftEnabled
+        //! \copydoc IRenderedAircraftProvider::renderedAircraftParts
+        virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const override { return m_aircraftParts; }
+
+        //! \copydoc IRenderedAircraftProvider::renderedAircraftParts
+        virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() override { return m_aircraftParts; }
+
+        //! \copydoc IRenderedAircraftProvider::renderedAircraftParts
         virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) override;
 
         //! \copydoc IRenderedAircraftProvider::updateAircraftModel
@@ -130,6 +136,7 @@ namespace BlackCore
         BlackMisc::Network::CClientList      m_otherClients;
         BlackMisc::Simulation::CSimulatedAircraftList  m_aircraftInRange;
         BlackMisc::Aviation::CAircraftSituationList    m_aircraftSituations;
+        BlackMisc::Aviation::CAircraftPartsList        m_aircraftParts;
 
         QMap<BlackMisc::Aviation::CAirportIcao, BlackMisc::Aviation::CInformationMessage> m_metarCache;
         QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan>            m_flightPlanCache;
diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp
index bec9e7bf4..e85211a21 100644
--- a/src/blackcore/context_network_impl.cpp
+++ b/src/blackcore/context_network_impl.cpp
@@ -109,6 +109,18 @@ namespace BlackCore
         return m_airspace->renderedAircraftSituations();
     }
 
+    const CAircraftPartsList &CContextNetwork::renderedAircraftParts() const
+    {
+        Q_ASSERT(this->m_airspace);
+        return m_airspace->renderedAircraftParts();
+    }
+
+    CAircraftPartsList &CContextNetwork::renderedAircraftParts()
+    {
+        Q_ASSERT(this->m_airspace);
+        return m_airspace->renderedAircraftParts();
+    }
+
     void CContextNetwork::gracefulShutdown()
     {
         if (this->m_vatsimBookingReader)  { this->m_vatsimBookingReader->quit(); }
diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h
index 23e740c62..1ae583437 100644
--- a/src/blackcore/context_network_impl.h
+++ b/src/blackcore/context_network_impl.h
@@ -60,6 +60,12 @@ namespace BlackCore
         //! \copydoc IRenderedAircraftProviderReadOnly::renderedAircraftSituations
         virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() override;
 
+        //! \copydoc IRenderedAircraftProvider::renderedAircraftParts
+        virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const override;
+
+        //! \copydoc IRenderedAircraftProvider::renderedAircraftParts
+        virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() override;
+
     public slots:
 
         //! \copydoc IContextNetwork::readAtcBookingsFromSource()
diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp
index 10264b491..0436fae72 100644
--- a/src/blackcore/context_simulator_impl.cpp
+++ b/src/blackcore/context_simulator_impl.cpp
@@ -314,13 +314,6 @@ namespace BlackCore
         this->m_simulator->addRemoteAircraft(remoteAircraft);
     }
 
-    void CContextSimulator::ps_addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation)
-    {
-        Q_ASSERT(this->m_simulator);
-        if (!this->m_simulator) { return; }
-        this->m_simulator->addAircraftSituation(callsign, situation);
-    }
-
     void CContextSimulator::ps_removeRemoteAircraft(const CCallsign &callsign)
     {
         Q_ASSERT(this->m_simulator);
diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h
index 4a6c9f111..b97578022 100644
--- a/src/blackcore/context_simulator_impl.h
+++ b/src/blackcore/context_simulator_impl.h
@@ -126,9 +126,6 @@ namespace BlackCore
         //! \copydoc ISimulator::addRemoteAircraft
         void ps_addRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft);
 
-        //! \copydoc ISimulator::addAircraftSituation
-        void ps_addAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation);
-
         //! \copydoc ISimulator::removeRemoteAircraft
         void ps_removeRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);