diff --git a/universal7885-common/configs/props/vendor.prop b/universal7885-common/configs/props/vendor.prop
index d277a11..54c6ec7 100644
--- a/universal7885-common/configs/props/vendor.prop
+++ b/universal7885-common/configs/props/vendor.prop
@@ -55,77 +55,12 @@ ro.soc.model=exynos7884B
 
 # Wifi direct
 wifi.direct.interface=p2p0
-# Audio (APTX)
 
-# A2DP offload supported
-ro.bluetooth.a2dp_offload.supported=false
+# Camera
+vendor.camera.aux.packagelist=com.google.android.apps.cameralite,com.eurekateam.cameralightsensor,com.android.camera
 
-# A2DP offload disabled (UI toggle property)
-persist.bluetooth.a2dp_offload.disabled=true
+# Samsung
+ro.product_ship=true
+ro.debug_level=0x494d
+ro.hardware.chipname=exynos7884B
 
-# A2DP offload DSP supported encoder list
-persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
-persist.vendor.btstack.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
-vendor.audio.feature.a2dp_offload.enable=false
-persist.vendor.btstack.enable.splita2dp=false
-vendor.audio.feature.a2dp_offload.enable=false
-audio.offload.min.duration.secs=30                              
-vendor.audio.flac.sw.decoder.24bit=true                         
-vendor.audio.hal.boot.timeout.ms=20000                          
-vendor.audio.use.sw.alac.decoder=true                           
-vendor.audio.use.sw.ape.decoder=true                            
-vendor.audio.use.sw.mpegh.decoder=true
-vendor.audio.hw.aac.encoder=true
-vendor.audio_hal.in_period_size=144
-vendor.audio_hal.period_multiplier=3
-vendor.audio.adm.buffering.ms=2
-vendor.audio.volume.headset.gain.depcal=true
-persist.vendor.audio.fluence.voicecomm=true
-vendor.audio.hal.output.suspend.supported=true                  
-aaudio.mmap_policy=2
-aaudio.mmap_exclusive_policy=2
-aaudio.hw_burst_min_usec=2000
-vendor.audio.enable.mirrorlink=false
-persist.vendor.bt.aac_frm_ctl.enabled=true
-vendor.audio.feature.a2dp_offload.enable=false
-vendor.audio.feature.afe_proxy.enable=true
-vendor.audio.feature.anc_headset.enable=true
-vendor.audio.feature.battery_listener.enable=true               
-vendor.audio.feature.compr_cap.enable=false
-vendor.audio.feature.compress_in.enable=true
-vendor.audio.feature.compress_meta_data.enable=true
-vendor.audio.feature.compr_voip.enable=false
-vendor.audio.feature.concurrent_capture.enable=true
-vendor.audio.feature.custom_stereo.enable=true
-vendor.audio.feature.display_port.enable=true
-vendor.audio.feature.dsm_feedback.enable=false                  
-vendor.audio.feature.dynamic_ecns.enable=true
-vendor.audio.feature.ext_hw_plugin.enable=false
-vendor.audio.feature.external_dsp.enable=false
-vendor.audio.feature.external_speaker.enable=false
-vendor.audio.feature.external_speaker_tfa.enable=false
-vendor.audio.feature.fluence.enable=true
-vendor.audio.feature.hdmi_edid.enable=true
-vendor.audio.feature.hdmi_passthrough.enable=true
-vendor.audio.feature.hfp.enable=true
-vendor.audio.feature.hifi_audio.enable=false
-vendor.audio.feature.hwdep_cal.enable=false                     
-vendor.audio.feature.incall_music.enable=true
-vendor.audio.feature.multi_voice_session.enable=true
-vendor.audio.feature.keep_alive.enable=true
-vendor.audio.feature.kpi_optimize.enable=true                   
-vendor.audio.feature.maxx_audio.enable=false                    
-vendor.audio.feature.ras.enable=true
-vendor.audio.feature.record_play_concurency.enable=false
-vendor.audio.feature.src_trkn.enable=true
-vendor.audio.feature.spkr_prot.enable=true
-vendor.audio.feature.ssrec.enable=true
-vendor.audio.feature.usb_offload.enable=true
-vendor.audio.feature.usb_offload_burst_mode.enable=true
-vendor.audio.feature.usb_offload_sidetone_volume.enable=false
-vendor.audio.feature.deepbuffer_as_primary.enable=false
-vendor.audio.feature.vbat.enable=true
-vendor.audio.feature.wsa.enable=false
-vendor.audio.feature.audiozoom.enable=false
-vendor.audio.feature.snd_mon.enable=true
diff --git a/universal7885-common/sepolicy/vendor/fastbootd.te b/universal7885-common/sepolicy/vendor/fastbootd.te
new file mode 100644
index 0000000..30beba0
--- /dev/null
+++ b/universal7885-common/sepolicy/vendor/fastbootd.te
@@ -0,0 +1,4 @@
+allow fastbootd {
+    dtb_block_device
+    system_block_device
+}:blk_file rw_file_perms;
diff --git a/universal7885-common/sepolicy/vendor/hal_camera_default.te b/universal7885-common/sepolicy/vendor/hal_camera_default.te
index c9dfc13..2f08c85 100644
--- a/universal7885-common/sepolicy/vendor/hal_camera_default.te
+++ b/universal7885-common/sepolicy/vendor/hal_camera_default.te
@@ -12,6 +12,8 @@ allow hal_camera_default sysfs_battery_writable:dir search;
 allow hal_camera_default sysfs_battery_writable:file r_file_perms;
 
 get_prop(hal_camera_default, exported_camera_prop)
+set_prop(hal_camera_default, vendor_camera_prop)
+get_prop(hal_camera_default, exported_default_prop)
 
 binder_call(hal_camera_default, system_server)
 binder_call(system_server, hal_camera_default)
diff --git a/universal7885-common/sepolicy/vendor/property_contexts b/universal7885-common/sepolicy/vendor/property_contexts
index 323d56b..e6de4e7 100644
--- a/universal7885-common/sepolicy/vendor/property_contexts
+++ b/universal7885-common/sepolicy/vendor/property_contexts
@@ -11,6 +11,9 @@ ro.vendor.radio.               u:object_r:vendor_radio_prop:s0
 vendor.wifi.                   u:object_r:vendor_wifi_prop:s0
 ro.vendor.wifi.                u:object_r:vendor_wifi_prop:s0
 
+# fastbootd
+ro.fastbootd.available         u:object_r:exported_default_prop:s0
+
 # bluetooth
 persist.bluetooth_fw_ver    u:object_r:bluetooth_prop:s0
 ro.bluetooth.tty            u:object_r:bluetooth_prop:s0
@@ -29,6 +32,15 @@ persist.data.wda.           u:object_r:persist_data_wda_prop:s0
 # CAMERA
 persist.sys.camera.         u:object_r:camera_prop:s0
 persist.vendor.sys.camera.  u:object_r:vendor_camera_prop:s0
+vendor.camera.aux.          u:object_r:exported_camera_prop:s0
+
+# Charger
+ro.charger.enable_suspend      u:object_r:exported_default_prop:s0
+
+# Samsung
+ro.product_ship                u:object_r:exported_default_prop:s0
+ro.debug_level                 u:object_r:exported_default_prop:s0
+ro.hardware.chipname           u:object_r:exported_default_prop:s0
 
 # GPS
 ro.spid.gps.                u:object_r:vendor_gps_prop:s0
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 64799b2..bb5e54f 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -72,6 +72,10 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.2.vendor \
     android.hardware.drm@1.3.vendor
 
+# fastbootd
+PRODUCT_PACKAGES += \
+    fastbootd
+
 # Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \