diff --git a/src/blackmisc/network/webdataservicesprovider.cpp b/src/blackmisc/network/webdataservicesprovider.cpp
index 850916c67..a66f9b22c 100644
--- a/src/blackmisc/network/webdataservicesprovider.cpp
+++ b/src/blackmisc/network/webdataservicesprovider.cpp
@@ -254,7 +254,7 @@ namespace BlackMisc
             return this->m_webDataReaderProvider->updateWithVatsimDataFileData(aircraftToBeUdpated);
         }
 
-        CStatusMessageList CWebDataServicesAware::asyncWriteModel(CAircraftModel &model) const
+        CStatusMessageList CWebDataServicesAware::asyncWriteModelToDb(CAircraftModel &model) const
         {
             Q_ASSERT_X(this->m_webDataReaderProvider, Q_FUNC_INFO, "Missing provider");
             if (!hasProvider()) { return CStatusMessageList(); }
diff --git a/src/blackmisc/network/webdataservicesprovider.h b/src/blackmisc/network/webdataservicesprovider.h
index ce415e553..41d0f3dbf 100644
--- a/src/blackmisc/network/webdataservicesprovider.h
+++ b/src/blackmisc/network/webdataservicesprovider.h
@@ -211,6 +211,14 @@ namespace BlackMisc
             //! Destructor
             ~CWebDataServicesAware();
 
+        public:
+            //! \copydoc IWebDataReaderProvider::getMetarForAirport
+            BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &icao) const;
+
+        protected:
+            //! Constructor
+            CWebDataServicesAware(IWebDataServicesProvider *webDataReaderProvider = nullptr) : m_webDataReaderProvider(webDataReaderProvider) { }
+
             //! \copydoc IWebDataReaderProvider::getVatsimFsdServers
             BlackMisc::Network::CServerList getVatsimFsdServers() const;
 
@@ -301,9 +309,6 @@ namespace BlackMisc
             //! \copydoc IWebDataReaderProvider::getMetars
             BlackMisc::Weather::CMetarSet getMetars() const;
 
-            //! \copydoc IWebDataReaderProvider::getMetarForAirport
-            BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &icao) const;
-
             //! \copydoc IWebDataReaderProvider::getMetarCount
             int getMetarCount() const;
 
@@ -311,7 +316,7 @@ namespace BlackMisc
             void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const;
 
             //! \copydoc IWebDataReaderProvider::asyncWriteModel
-            BlackMisc::CStatusMessageList asyncWriteModel(BlackMisc::Simulation::CAircraftModel &model) const;
+            BlackMisc::CStatusMessageList asyncWriteModelToDb(BlackMisc::Simulation::CAircraftModel &model) const;
 
             //! Set the provider
             virtual void setProvider(IWebDataServicesProvider *webDataReaderProvider);
@@ -339,10 +344,6 @@ namespace BlackMisc
             //! \copydoc IWebDataReaderProvider::readDbDataFromDisk
             bool readDbDataFromDisk(const QString &dir, bool inBackround);
 
-        protected:
-            //! Constructor
-            CWebDataServicesAware(IWebDataServicesProvider *webDataReaderProvider = nullptr) : m_webDataReaderProvider(webDataReaderProvider) { }
-
         private:
             IWebDataServicesProvider    *m_webDataReaderProvider = nullptr; //!< access to object
             BlackMisc::CConnectionGuard m_swiftConnections;                 //!< signal connection with swift
diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp
index 9dda26d4f..b25edf3bb 100644
--- a/src/swiftdata/swiftdatamenus.cpp
+++ b/src/swiftdata/swiftdatamenus.cpp
@@ -15,6 +15,7 @@
 #include "blackgui/stylesheetutility.h"
 #include "blackcore/datacache.h"
 #include "blackcore/settingscache.h"
+#include "blackcore/webdataservices.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/project.h"
@@ -156,7 +157,7 @@ void CSwiftData::initDynamicMenus()
         Q_ASSERT_X(this->ui->comp_MainInfoArea, Q_FUNC_INFO, "Missing main info area");
         Q_ASSERT_X(this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), Q_FUNC_INFO, "Missing DB info area");
         this->ui->menu_Mapping->addAction(CIcons::load16(), "Load DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(readDbDataFromResourceDir()));
-        if (CProject::isRunningInDeveloperEnvironment() && this->ui->comp_MainInfoArea->getDataInfoAreaComponent()->canConnectSwiftDb())
+        if (CProject::isRunningInDeveloperEnvironment() && this->m_webDataReader && this->m_webDataReader->canConnectSwiftDb())
         {
             this->ui->menu_Mapping->addAction(CIcons::save16(), "Save DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(writeDbDataToResourceDir()));
         }