diff --git a/src/backends/AddressBookBackend.h b/src/backends/AddressBookBackend.h
index 7856851927da81939ad531cf00fb37d1a92e9df0..74a24c45e2588d582b5d365dd614d760b49de60e 100644
--- a/src/backends/AddressBookBackend.h
+++ b/src/backends/AddressBookBackend.h
@@ -51,7 +51,7 @@ public:
     virtual QVariant   icon     () const override;
     virtual bool       isEnabled() const override;
     virtual QByteArray id       () const override;
-    virtual SupportedFeatures  supportedFeatures() const override;
+    virtual FlagPack<SupportedFeatures>  supportedFeatures() const override;
 
 private:
     CollectionMediator<Person>*  m_pMediator;
diff --git a/src/backends/AddressBookBackend.mm b/src/backends/AddressBookBackend.mm
index d2073c003bcf144e75e2dbcc182be5ebea506348..34f3ec7355d57b94051276b3243ec074a5044f9a 100644
--- a/src/backends/AddressBookBackend.mm
+++ b/src/backends/AddressBookBackend.mm
@@ -229,9 +229,9 @@ bool AddressBookBackend::reload()
     return false;
 }
 
-CollectionInterface::SupportedFeatures AddressBookBackend::supportedFeatures() const
+FlagPack<AddressBookBackend::SupportedFeatures> AddressBookBackend::supportedFeatures() const
 {
-    return (CollectionInterface::SupportedFeatures) (
+    return (FlagPack<SupportedFeatures>) (
                                                      CollectionInterface::SupportedFeatures::NONE  |
                                                      CollectionInterface::SupportedFeatures::LOAD  |
                                                      CollectionInterface::SupportedFeatures::CLEAR |
diff --git a/src/backends/MinimalHistoryBackend.h b/src/backends/MinimalHistoryBackend.h
index 50eef51dec2ad5a20cffc8a4b46aafe37650d8b1..3e5f8899ba6c8317e19d6cf3836ae93407c8fc11 100644
--- a/src/backends/MinimalHistoryBackend.h
+++ b/src/backends/MinimalHistoryBackend.h
@@ -39,7 +39,7 @@ public:
     virtual QVariant   icon     () const override;
     virtual bool       isEnabled() const override;
     virtual QByteArray id       () const override;
-    virtual SupportedFeatures  supportedFeatures() const override;
+    virtual FlagPack<SupportedFeatures>  supportedFeatures() const override;
     int daysSince(time_t timestamp);
 
 
diff --git a/src/backends/MinimalHistoryBackend.mm b/src/backends/MinimalHistoryBackend.mm
index 65fd4720cfa7e9ca8e8fe307da0ced8b8afa2a9f..915094ca76e2ac30d8fb3ecde46c50c5ea8adb4a 100644
--- a/src/backends/MinimalHistoryBackend.mm
+++ b/src/backends/MinimalHistoryBackend.mm
@@ -266,9 +266,9 @@ bool MinimalHistoryBackend::reload()
     return false;
 }
 
-CollectionInterface::SupportedFeatures MinimalHistoryBackend::supportedFeatures() const
+FlagPack<CollectionInterface::SupportedFeatures> MinimalHistoryBackend::supportedFeatures() const
 {
-    return (CollectionInterface::SupportedFeatures) (
+    return (FlagPack<SupportedFeatures>) (
                                                      CollectionInterface::SupportedFeatures::NONE  |
                                                      CollectionInterface::SupportedFeatures::LOAD  |
                                                      CollectionInterface::SupportedFeatures::CLEAR |