Index: src/settings/iptunnelsetting.cpp
===================================================================
--- src/settings/iptunnelsetting.cpp
+++ src/settings/iptunnelsetting.cpp
@@ -32,7 +32,7 @@
     , mode(IpTunnelSetting::Unknown)
     , pathMtuDiscovery(true)
     , encapsulationLimit(0)
-    , flags(IpTunnelSetting::Unknown)
+    , flags(IpTunnelSetting::None)
     , flowLabel(0)
     , mtu(0)
     , tos(0)
Index: src/settings/proxysetting.h
===================================================================
--- src/settings/proxysetting.h
+++ src/settings/proxysetting.h
@@ -32,13 +32,18 @@
 class ProxySettingPrivate;
 
 /**
- * Represents generic setting
+ * Represents proxy setting
  */
 class NETWORKMANAGERQT_EXPORT ProxySetting : public Setting
 {
 public:
     typedef QSharedPointer<ProxySetting> Ptr;
     typedef QList<Ptr> List;
+    enum Mode
+    {
+        None = NM_SETTING_PROXY_METHOD_NONE,
+        Auto = NM_SETTING_PROXY_METHOD_AUTO
+    };
 
     ProxySetting();
     explicit ProxySetting(const Ptr &other);
@@ -49,8 +54,8 @@
     void setBrowserOnly(bool browserOnly);
     bool browserOnly() const;
 
-    void setMethod(quint32 method);
-    quint32 method() const;
+    void setMethod(Mode method);
+    Mode method() const;
 
     void setPacScript(const QString &script);
     QString pacScript() const;
Index: src/settings/proxysetting.cpp
===================================================================
--- src/settings/proxysetting.cpp
+++ src/settings/proxysetting.cpp
@@ -23,10 +23,19 @@
 
 #include <QDebug>
 
+#if NM_CHECK_VERSION(1, 16, 0)
+#define NM_SETTING_PROXY_SETTING_NAME    "proxy"
+#define NM_SETTING_PROXY_BROWSER_ONLY    "browser-only"
+#define NM_SETTING_PROXY_METHOD          "method"
+#define NM_SETTING_PROXY_PAC_SCRIPT      "pac-script"
+#define NM_SETTING_PROXY_PAC_URL         "pac-url"
+#endif
+
+
 NetworkManager::ProxySettingPrivate::ProxySettingPrivate()
     : name(NM_SETTING_PROXY_SETTING_NAME)
     , browserOnly(true)
-    , method(0)
+    , method(ProxySetting::None)
 { }
 
 NetworkManager::ProxySetting::ProxySetting()
@@ -70,14 +79,14 @@
     return d->browserOnly;
 }
 
-void NetworkManager::ProxySetting::setMethod(quint32 method)
+void NetworkManager::ProxySetting::setMethod(NetworkManager::ProxySetting::Mode method)
 {
     Q_D(ProxySetting);
 
     d->method = method;
 }
 
-quint32 NetworkManager::ProxySetting::method() const
+NetworkManager::ProxySetting::Mode NetworkManager::ProxySetting::method() const
 {
     Q_D(const ProxySetting);
 
@@ -119,7 +128,7 @@
     }
 
    if (setting.contains(QLatin1String(NM_SETTING_PROXY_METHOD))) {
-        setMethod(setting.value(QLatin1String(NM_SETTING_PROXY_METHOD)).toUInt());
+        setMethod((Mode)setting.value(QLatin1String(NM_SETTING_PROXY_METHOD)).toUInt());
     }
 
     if (setting.contains(QLatin1String(NM_SETTING_PROXY_PAC_SCRIPT))) {
@@ -138,7 +147,7 @@
     setting.insert(QLatin1String(NM_SETTING_PROXY_BROWSER_ONLY), browserOnly());
 
     if (method() > 0) {
-        setting.insert(QLatin1String(NM_SETTING_PROXY_METHOD), method());
+        setting.insert(QLatin1String(NM_SETTING_PROXY_METHOD), (int)method());
     }
 
     if (!pacScript().isEmpty()) {
Index: src/settings/proxysetting_p.h
===================================================================
--- src/settings/proxysetting_p.h
+++ src/settings/proxysetting_p.h
@@ -34,7 +34,7 @@
     QString name;
 
     bool browserOnly;
-    quint32 method;
+    NetworkManager::ProxySetting::Mode method;
     QString pacScript;
     QString pacUrl;
 };
Index: src/settings/usersetting.h
===================================================================
--- src/settings/usersetting.h
+++ src/settings/usersetting.h
@@ -32,7 +32,7 @@
 class UserSettingPrivate;
 
 /**
- * Represents generic setting
+ * Represents user setting
  */
 class NETWORKMANAGERQT_EXPORT UserSetting : public Setting
 {
@@ -50,8 +50,6 @@
     void setData(const NMStringMap &data);
     NMStringMap data() const;
 
-
-
     void fromMap(const QVariantMap &setting) override;
 
     QVariantMap toMap() const override;
Index: src/settings/usersetting.cpp
===================================================================
--- src/settings/usersetting.cpp
+++ src/settings/usersetting.cpp
@@ -23,8 +23,13 @@
 
 #include <QDebug>
 
+#if NM_CHECK_VERSION(1, 8, 0)
+#define NM_SETTING_USER_SETTING_NAME    "user"
+#define NM_SETTING_USER_DATA            "data"
+#endif
+
 NetworkManager::UserSettingPrivate::UserSettingPrivate()
-    : name(NM_SETTING_IP_TUNNEL_SETTING_NAME)
+    : name(NM_SETTING_USER_SETTING_NAME)
 { }
 
 NetworkManager::UserSetting::UserSetting()