diff --git a/common.mk b/common.mk
index 1e0cd3f..42d6a3d 100644
--- a/common.mk
+++ b/common.mk
@@ -78,7 +78,8 @@ PRODUCT_PACKAGES += \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libqcompostprocbundle \
-    libvolumelistener
+    libvolumelistener \
+    SamsungDAP
 
 PRODUCT_PACKAGES += \
     SamsungDAP
diff --git a/configs/audio/audio_effects.conf b/configs/audio/audio_effects.conf
index 8b9189a..6cfb41c 100644
--- a/configs/audio/audio_effects.conf
+++ b/configs/audio/audio_effects.conf
@@ -54,6 +54,9 @@ libraries {
   shoebox {
     path /vendor/lib/soundfx/libshoebox.so
   }
+  dap {
+    path /vendor/lib/soundfx/libswdap.so
+  }
 }
 
 # Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -270,6 +273,10 @@ effects {
     library shoebox
     uuid 1eab784c-1a36-4b2a-b7fc-e34c44cab89e
   }
+  dap {
+    library dap
+    uuid 6ab06da4-c516-4611-8166-452799218539
+  }
 }
 
 # additional effect from vendor
diff --git a/configs/audio/audio_effects.xml b/configs/audio/audio_effects.xml
index add0925..ea32917 100644
--- a/configs/audio/audio_effects.xml
+++ b/configs/audio/audio_effects.xml
@@ -41,6 +41,7 @@
         <library name="volume_listener" path="libvolumelistener.so"/>
         <library name="audiosphere" path="libasphere.so"/>
         <library name="shoebox" path="libshoebox.so"/>
+        <library name="dap" path="libswdap.so"/>
     </libraries>
     <effects>
         <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
@@ -89,24 +90,8 @@
         <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
         <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
         <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
+        <effect name="dap" library="dap" uuid="6ab06da4-c516-4611-8166-452799218539"/>
     </effects>
-    <postprocess>
-        <stream type="music">
-            <apply effect="music_helper"/>
-        </stream>
-        <stream type="ring">
-            <apply effect="ring_helper"/>
-        </stream>
-        <stream type="alarm">
-            <apply effect="alarm_helper"/>
-        </stream>
-        <stream type="voice_call">
-            <apply effect="voice_helper"/>
-        </stream>
-        <stream type="notification">
-            <apply effect="notification_helper"/>
-        </stream>
-    </postprocess>
     <preprocess>
         <stream type="voice_communication">
             <apply effect="aec"/>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3bda745..28b9906 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -83,6 +83,7 @@ vendor/lib/libcirrusspkrprot.so
 vendor/lib/libsurround_3mic_proc.so
 vendor/lib/libdrc.so
 vendor/lib/libspkrprot.so
+vendor/lib/libprofileparamstorage.so
 
 # Soundtrigger
 vendor/lib/hw/sound_trigger.primary.atoll.so
@@ -105,11 +106,13 @@ vendor/lib/soundfx/libasphere.so
 vendor/lib/soundfx/libqcreverb.so
 vendor/lib/soundfx/libshoebox.so
 vendor/lib/soundfx/libqcbassboost.so
+vendor/lib/soundfx/libswdap.so
 vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libasphere.so
 vendor/lib64/soundfx/libqcreverb.so
 vendor/lib64/soundfx/libshoebox.so
 vendor/lib64/soundfx/libqcbassboost.so
+vendor/etc/dolby/dax-default.xml
 
 # Audio Firmware
 vendor/firmware/dax_param.bin