diff --git a/wfadatad/Config.in b/wfadatad/Config.in
new file mode 100644
index 000000000..492c4e0e2
--- /dev/null
+++ b/wfadatad/Config.in
@@ -0,0 +1,16 @@
+if (PACKAGE_wfadatad)
+menu "configurations"
+
+config WFA_DELM_STANDALONE
+	bool "Build as standalone daemon instead of a plugin"
+	default y
+
+config WFA_DELM_MULTIAP_MODE
+	bool "Enable Multi-AP mode"
+	default y
+
+config WIFI_DELM_DEBUG
+	bool "Enable debug logs"
+	default n
+endmenu
+endif
diff --git a/wfadatad/Makefile b/wfadatad/Makefile
index a38a9237e..94fe97853 100644
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -1,19 +1,19 @@
 #
-# Copyright (C) 2019 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=1.0.1
+PKG_VERSION:=2.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d93bf451391af7b862ea053aece3fbfb85e90fbc
+PKG_SOURCE_VERSION:=578cad4e52235fa3eb979859fcabddd785ea3fc5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,15 +21,30 @@ include $(INCLUDE_DIR)/package.mk
 define Package/wfadatad
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Wifi data element agent
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl
+  TITLE:=WiFi Data Elements-1.0 Agent
+  DEPENDS:=+libwifi +mapagent +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/wfadatad/description
- Wifi data element agent collects all WiFi related data
- and stores it which can be used by high level data collectors.
+ This package implements WiFi Alliance's Data Elements Agent.
+ It collects WiFi network's diagnostic data and reports them
+ to the Data Elements Collector.
+ By default, the package is built as a dynamically loadable
+ plugin module to the MultiAP Agent.
+ Alternatively, for debugging purpose, the package can be built
+ as a standalone daemon.
 endef
 
+
+define Package/wfadatad/config
+	source "$(SOURCE)/Config.in"
+endef
+
+
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
+MAKE_FLAGS += CONFIG_WFA_DELM_STANDALONE=y
+endif
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
@@ -42,10 +57,16 @@ MAKE_PATH:=src
 #endef
 
 define Package/wfadatad/install
+
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/wfadatad.init $(1)/etc/init.d/wfadatad
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wfadatad $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/wfa_delm.init $(1)/etc/init.d/wfa_delm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wfa_delm $(1)/usr/sbin/
+else
+	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
+	$(CP) $(PKG_BUILD_DIR)/src/wfa_delm.so $(1)/usr/lib/map-plugins
+endif
 endef
 
 $(eval $(call BuildPackage,wfadatad))
diff --git a/wfadatad/files/wfadatad.init b/wfadatad/files/wfa_delm.init
similarity index 88%
rename from wfadatad/files/wfadatad.init
rename to wfadatad/files/wfa_delm.init
index b5d569646..8f9625dd0 100644
--- a/wfadatad/files/wfadatad.init
+++ b/wfadatad/files/wfa_delm.init
@@ -1,10 +1,10 @@
 #!/bin/sh /etc/rc.common
 
-START=95
+START=98
 STOP=11
 
 USE_PROCD=1
-PROG=/usr/sbin/wfadatad
+PROG=/usr/sbin/wfa_delm
 
 start_service() {
 	procd_open_instance