diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp
index e667f15eb..81f331b5e 100644
--- a/src/blackcore/vatsim/vatsimdatafilereader.cpp
+++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp
@@ -96,30 +96,30 @@ namespace BlackCore
             return m_lastGoodSetup.get().getFsdServers();
         }
 
-        CUserList CVatsimDataFileReader::getPilotsForCallsigns(const CCallsignSet &callsigns)
+        CUserList CVatsimDataFileReader::getPilotsForCallsigns(const CCallsignSet &callsigns) const
         {
             return this->getAircraft().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CSimulatedAircraft::getPilot));
         }
 
-        CUserList CVatsimDataFileReader::getPilotsForCallsign(const CCallsign &callsign)
+        CUserList CVatsimDataFileReader::getPilotsForCallsign(const CCallsign &callsign) const
         {
             const CCallsignSet callsigns({callsign});
             return this->getPilotsForCallsigns(callsigns);
         }
 
-        CAirlineIcaoCode CVatsimDataFileReader::getAirlineIcaoCode(const CCallsign &callsign)
+        CAirlineIcaoCode CVatsimDataFileReader::getAirlineIcaoCode(const CCallsign &callsign) const
         {
             const CSimulatedAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign);
             return aircraft.getAirlineIcaoCode();
         }
 
-        CAircraftIcaoCode CVatsimDataFileReader::getAircraftIcaoCode(const CCallsign &callsign)
+        CAircraftIcaoCode CVatsimDataFileReader::getAircraftIcaoCode(const CCallsign &callsign) const
         {
             const CSimulatedAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign);
             return aircraft.getAircraftIcaoCode();
         }
 
-        CVoiceCapabilities CVatsimDataFileReader::getVoiceCapabilityForCallsign(const CCallsign &callsign)
+        CVoiceCapabilities CVatsimDataFileReader::getVoiceCapabilityForCallsign(const CCallsign &callsign) const
         {
             if (callsign.isEmpty()) { return CVoiceCapabilities(); }
             QReadLocker rl(&m_lock);
@@ -128,7 +128,7 @@ namespace BlackCore
                    CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Unknown);
         }
 
-        QString CVatsimDataFileReader::getFlightPlanRemarksForCallsign(const CCallsign &callsign)
+        QString CVatsimDataFileReader::getFlightPlanRemarksForCallsign(const CCallsign &callsign) const
         {
             if (callsign.isEmpty()) { return QString(); }
             QReadLocker rl(&m_lock);
@@ -140,24 +140,24 @@ namespace BlackCore
             this->getAircraft().updateWithVatsimDataFileData(aircraftToBeUdpated);
         }
 
-        CUserList CVatsimDataFileReader::getControllersForCallsign(const CCallsign &callsign)
+        CUserList CVatsimDataFileReader::getControllersForCallsign(const CCallsign &callsign) const
         {
             const CCallsignSet cs({callsign});
             return this->getControllersForCallsigns(cs);
         }
 
-        CUserList CVatsimDataFileReader::getControllersForCallsigns(const CCallsignSet &callsigns)
+        CUserList CVatsimDataFileReader::getControllersForCallsigns(const CCallsignSet &callsigns) const
         {
             return this->getAtcStations().findByCallsigns(callsigns).transform(Predicates::MemberTransform(&CAtcStation::getController));
         }
 
-        CUserList CVatsimDataFileReader::getUsersForCallsign(const CCallsign &callsign)
+        CUserList CVatsimDataFileReader::getUsersForCallsign(const CCallsign &callsign) const
         {
             const CCallsignSet callsigns({callsign});
             return this->getUsersForCallsigns(callsigns);
         }
 
-        CUserList CVatsimDataFileReader::getUsersForCallsigns(const CCallsignSet &callsigns)
+        CUserList CVatsimDataFileReader::getUsersForCallsigns(const CCallsignSet &callsigns) const
         {
             CUserList users;
             if (callsigns.isEmpty()) { return users; }
diff --git a/src/blackcore/vatsim/vatsimdatafilereader.h b/src/blackcore/vatsim/vatsimdatafilereader.h
index 3787b519e..1fd010f22 100644
--- a/src/blackcore/vatsim/vatsimdatafilereader.h
+++ b/src/blackcore/vatsim/vatsimdatafilereader.h
@@ -18,6 +18,7 @@
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/aviation/flightplanutils.h"
 #include "blackmisc/network/entityflags.h"
 #include "blackmisc/network/serverlist.h"
 #include "blackmisc/network/userlist.h"
@@ -74,43 +75,43 @@ namespace BlackCore
 
             //! Users for callsign(s)
             //! \threadsafe
-            BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns);
+            BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
 
             //! User for callsign
             //! \threadsafe
-            BlackMisc::Network::CUserList getUsersForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
+            BlackMisc::Network::CUserList getUsersForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Controllers for callsigns
             //! \threadsafe
-            BlackMisc::Network::CUserList getControllersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns);
+            BlackMisc::Network::CUserList getControllersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
 
             //! Controllers for callsign
             //! \threadsafe
-            BlackMisc::Network::CUserList getControllersForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
+            BlackMisc::Network::CUserList getControllersForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Users for callsigns
             //! \threadsafe
-            BlackMisc::Network::CUserList getPilotsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns);
+            BlackMisc::Network::CUserList getPilotsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
 
             //! Users for callsign
             //! \threadsafe
-            BlackMisc::Network::CUserList getPilotsForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
+            BlackMisc::Network::CUserList getPilotsForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Aircraft ICAO info for callsign
             //! \threadsafe
-            BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCode(const BlackMisc::Aviation::CCallsign &callsign);
+            BlackMisc::Aviation::CAircraftIcaoCode getAircraftIcaoCode(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Airline ICAO info for callsign
             //! \threadsafe
-            BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCode(const BlackMisc::Aviation::CCallsign &callsign);
+            BlackMisc::Aviation::CAirlineIcaoCode getAirlineIcaoCode(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Voice capability for callsign
             //! \threadsafe
-            BlackMisc::Network::CVoiceCapabilities getVoiceCapabilityForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
+            BlackMisc::Network::CVoiceCapabilities getVoiceCapabilityForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Flight plan remarks for callsign
             //! \threadsafe
-            QString getFlightPlanRemarksForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
+            QString getFlightPlanRemarksForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
 
             //! Update aircraft with VATSIM aircraft data from data file
             //! \threadsafe