diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7b7ff00..c6f8f71 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -155,6 +155,13 @@
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 
+# Properties
+TARGET_ODM_PROP += $(COMMON_PATH)/properties/odm.prop
+TARGET_PRODUCT_PROP += $(COMMON_PATH)/properties/product.prop
+TARGET_SYSTEM_PROP += $(COMMON_PATH)/properties/system.prop
+TARGET_SYSTEM_EXT_PROP += $(COMMON_PATH)/properties/system_ext.prop
+TARGET_VENDOR_PROP += $(COMMON_PATH)/properties/vendor.prop
+
 # RIL
 ENABLE_VENDOR_RIL_SERVICE := true
 
diff --git a/properties/odm.prop b/properties/odm.prop
new file mode 100644
index 0000000..833b764
--- /dev/null
+++ b/properties/odm.prop
@@ -0,0 +1,5 @@
+# Audio
+ro.vendor.audio.policy.engine.odm=true
+
+# Fwk detect
+ro.vendor.qti.va_odm.support=1
diff --git a/properties/product.prop b/properties/product.prop
new file mode 100644
index 0000000..5e7f84f
--- /dev/null
+++ b/properties/product.prop
@@ -0,0 +1,3 @@
+# Audio
+audio.offload.min.duration.secs=30
+media.stagefright.audio.deep=false
diff --git a/properties/system.prop b/properties/system.prop
new file mode 100644
index 0000000..71b7554
--- /dev/null
+++ b/properties/system.prop
@@ -0,0 +1,10 @@
+# Radio
+ril.subscription.types=NV,RUIM
+rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
+telephony.lteOnCdmaDevice=1
+
+# WLAN
+ro.hardware.wlan.chip=wcn3988
+ro.hardware.wlan.dbs=0
+ro.hardware.wlan.mimo=0
+ro.hardware.wlan.vendor=qcom
diff --git a/properties/system_ext.prop b/properties/system_ext.prop
new file mode 100644
index 0000000..586da65
--- /dev/null
+++ b/properties/system_ext.prop
@@ -0,0 +1,2 @@
+# DPM
+persist.vendor.dpm.feature=11
diff --git a/properties/vendor.prop b/properties/vendor.prop
new file mode 100644
index 0000000..d4a4bb6
--- /dev/null
+++ b/properties/vendor.prop
@@ -0,0 +1,370 @@
+# Audio
+aaudio.hw_burst_min_usec=2000
+aaudio.mmap_exclusive_policy=2
+aaudio.mmap_policy=2
+debug.c2.use_dmabufheaps=1
+persist.vendor.audio.ambisonic.auto.profile=false
+persist.vendor.audio.ambisonic.capture=false
+persist.vendor.audio.apptype.multirec.enabled=false
+persist.vendor.audio.auto.scenario=false
+persist.vendor.audio.avs.afe_api_version=2
+persist.vendor.audio.fluence.speaker=true
+persist.vendor.audio.fluence.tmic.enabled=false
+persist.vendor.audio.fluence.voicecall=true
+persist.vendor.audio.fluence.voicecomm=true
+persist.vendor.audio.fluence.voicerec=false
+persist.vendor.audio.ras.enabled=false
+persist.vendor.audio.spv3.enable=true
+persist.vendor.audio.voicecall.speaker.stereo=true
+ro.qc.sdk.audio.fluencetype=none
+ro.qc.sdk.audio.ssr=false
+ro.vendor.audio.camera.loopback.support=false
+ro.vendor.audio.game.mode=true
+ro.vendor.audio.identify_low_end_device=true
+ro.vendor.audio.karaoke.enable=true
+ro.vendor.audio.playbackcapture.screen=true
+ro.vendor.audio.ring.filter=false
+ro.vendor.audio.scenario.support=true
+ro.vendor.audio.screenrecorder.bothrecord=0
+ro.vendor.audio.sdk.fluencetype=none
+ro.vendor.audio.sdk.ssr=false
+ro.vendor.audio.sfx.earadj=true
+ro.vendor.audio.sfx.scenario=true
+ro.vendor.audio.sos=true
+ro.vendor.audio.spk.stereo=true
+ro.vendor.audio.surround.support=true
+ro.vendor.audio.swap_update=true
+ro.vendor.audio.vocal.support=true
+ro.vendor.audio.voice.change.support=true
+ro.vendor.audio.voice.change.version=2
+vendor.audio.AT.blocking=true
+vendor.audio.adm.buffering.ms=2
+vendor.audio.c2.preferred=true
+vendor.audio.compress_capture.aac=true
+vendor.audio.compress_capture.enabled=true
+vendor.audio.cpu.sched=31
+vendor.audio.cpu.sched.cpus=8
+vendor.audio.cpu.sched.cpuset.af=248
+vendor.audio.cpu.sched.cpuset.at=248
+vendor.audio.cpu.sched.cpuset.hb=248
+vendor.audio.cpu.sched.cpuset.he=248
+vendor.audio.cpu.sched.cpuset.hso=248
+vendor.audio.cpu.sched.onlyfast=false
+vendor.audio.enable.mirrorlink=false
+vendor.audio.feature.a2dp_offload.enable=true
+vendor.audio.feature.afe_proxy.enable=true
+vendor.audio.feature.anc_headset.enable=true
+vendor.audio.feature.audiozoom.enable=false
+vendor.audio.feature.battery_listener.enable=true
+vendor.audio.feature.compr_cap.enable=false
+vendor.audio.feature.compr_voip.enable=false
+vendor.audio.feature.compress_in.enable=true
+vendor.audio.feature.compress_meta_data.enable=true
+vendor.audio.feature.concurrent_capture.enable=true
+vendor.audio.feature.custom_stereo.enable=true
+vendor.audio.feature.deepbuffer_as_primary.enable=false
+vendor.audio.feature.display_port.enable=true
+vendor.audio.feature.dsm_feedback.enable=false
+vendor.audio.feature.dynamic_ecns.enable=true
+vendor.audio.feature.earout.hphl.conflict=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.fm.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.keep_alive.enable=true
+vendor.audio.feature.kpi_optimize.enable=true
+vendor.audio.feature.maxx_audio.enable=false
+vendor.audio.feature.multi_voice_session.enable=true
+vendor.audio.feature.ras.enable=true
+vendor.audio.feature.record_play_concurency.enable=false
+vendor.audio.feature.snd_mon.enable=true
+vendor.audio.feature.spkr_prot.enable=false
+vendor.audio.feature.src_trkn.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.vbat.enable=true
+vendor.audio.feature.wsa.enable=false
+vendor.audio.flac.sw.decoder.24bit=true
+vendor.audio.gsl.shmem.dmaheap.uncached=true
+vendor.audio.hal.boot.timeout.ms=20000
+vendor.audio.hal.output.suspend.supported=true
+vendor.audio.hw.aac.encoder=false
+vendor.audio.offload.buffer.size.kb=32
+vendor.audio.offload.gapless.enabled=true
+vendor.audio.offload.multiaac.enable=true
+vendor.audio.offload.multiple.enabled=false
+vendor.audio.offload.passthrough=false
+vendor.audio.offload.track.enable=true
+vendor.audio.parser.ip.buffer.size=262144
+vendor.audio.rt.mode=23
+vendor.audio.rt.mode.onlyfast=false
+vendor.audio.safx.pbe.enabled=false
+vendor.audio.tunnel.encode=false
+vendor.audio.use.sw.alac.decoder=true
+vendor.audio.use.sw.ape.decoder=true
+vendor.audio.use.sw.mpegh.decoder=true
+vendor.audio.volume.headset.gain.depcal=true
+vendor.audio_hal.in_period_size=144
+vendor.audio_hal.period_multiplier=3
+vendor.audio_hal.period_size=192
+
+# Bluetooth
+bluetooth.device_id.vendor_id=0x001D
+bluetooth.hfp.codec_aptx_voice.enabled=false
+bluetooth.hfp.swb.aptx.power_management.enabled=false
+bluetooth.profile.pbap.sim.enabled=true
+bluetooth.profile.sap.server.enabled=false
+bluetooth.profile.asha.central.enabled=false
+bluetooth.profile.a2dp.source.enabled=true
+bluetooth.profile.avrcp.controller.enabled=false
+bluetooth.profile.avrcp.target.enabled=true
+bluetooth.profile.bap.broadcast.assist.enabled=false
+bluetooth.profile.bap.broadcast.source.enabled=false
+bluetooth.profile.bap.unicast.client.enabled=false
+bluetooth.profile.bas.client.enabled=true
+bluetooth.profile.ccp.server.enabled=false
+bluetooth.profile.csip.set_coordinator.enabled=false
+bluetooth.profile.gatt.enabled=true
+bluetooth.profile.hap.client.enabled=false
+bluetooth.profile.hfp.ag.enabled=true
+bluetooth.profile.hid.device.enabled=true
+bluetooth.profile.hid.host.enabled=true
+bluetooth.profile.map.server.enabled=true
+bluetooth.profile.mcp.server.enabled=false
+bluetooth.profile.opp.enabled=true
+bluetooth.profile.pan.nap.enabled=true
+bluetooth.profile.pan.panu.enabled=true
+bluetooth.profile.pbap.server.enabled=true
+bluetooth.profile.vcp.controller.enabled=false
+persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+persist.bluetooth.a2dp_offload.disabled=false
+persist.bluetooth.disableabsvol=true
+persist.bluetooth.leaudio.allow.multiple.context=false
+persist.bluetooth.leaudio.bypass_allow_list=true
+persist.bluetooth.leaudio.notify.idle.during.call=true
+persist.bluetooth.leaudio_offload.disabled=false
+persist.vendor.btstack.aac_frm_ctl.enabled=true
+persist.vendor.bt.a2dp.samplerate=true
+persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
+persist.vendor.bt.aac_frm_ctl.enabled=true
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptive
+persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=false
+persist.vendor.qcom.bluetooth.enable.splita2dp=true
+persist.vendor.qcom.bluetooth.scram.enabled=false
+persist.vendor.qcom.bluetooth.soc=cherokee
+persist.vendor.qcom.bluetooth.twsp_state.enabled=false
+ro.bluetooth.leaudio_offload.supported=true
+ro.bluetooth.emb_wp_mode=false
+ro.bluetooth.library_name=libbluetooth.so
+ro.bluetooth.wipower=false
+ro.bluetooth.a2dp_offload.supported=true
+ro.vendor.bluetooth.wipower=false
+
+# Camera
+camera.disable_zsl_mode=1
+
+# Dalvik
+dalvik.vm.dex2oat64.enabled=true
+dalvik.vm.heaptargetutilization=0.75
+dalvik.vm.heapgrowthlimit=256m
+dalvik.vm.heapsize=512m
+dalvik.vm.heapmaxfree=8m
+dalvik.vm.heapminfree=512k
+dalvik.vm.heapstartsize=8m
+dev.pm.dyn_samplingrate=1
+persist.sys.dalvik.vm.lib.2=libart.so
+
+# DPM
+persist.vendor.dpm.vndr.feature=1
+persist.vendor.dpm.vndr.halservice.enable=1
+persist.vendor.dpm.vndr.idletimer.mode=default
+
+# DRM
+drm.service.enabled=true
+
+# FRP
+ro.frp.pst=/dev/block/bootdevice/by-name/frp
+
+# FM
+vendor.hw.fm.init=0
+
+# FUSE
+persist.fuse_sdcard=true
+persist.sys.fuse.passthrough.enable=true
+
+# GNSS
+persist.backup.ntpServer=0.pool.ntp.org
+
+# Graphics
+debug.egl.hw=0
+debug.mdpcomp.logs=0
+debug.sf.auto_latch_unsignaled=0
+debug.sf.disable_backpressure=1
+debug.sf.enable_advanced_sf_phase_offset=1
+debug.sf.enable_hwc_vds=0
+debug.sf.high_fps_early_gl_phase_offset_ns=-5000000
+debug.sf.high_fps_early_phase_offset_ns=-5000000
+debug.sf.high_fps_late_app_phase_offset_ns=1000000
+debug.sf.high_fps_late_sf_phase_offset_ns=-5000000
+debug.sf.hw=0
+debug.sf.latch_unsignaled=1
+debug.sf.predict_hwc_composition_strategy=0
+debug.sf.treat_170m_as_sRGB=1
+graphics.gpu.profiler.support=true
+persist.sys.sf.color_mode=0
+persist.sys.sf.color_saturation=1.0
+persist.sys.sf.native_mode=258
+persist.sys.sf_charge_anim_supported=true
+ro.hardware.egl=adreno
+ro.hardware.vulkan=adreno
+ro.opengles.version=196610
+ro.surface_flinger.enable_frame_rate_override=false
+ro.surface_flinger.force_hwc_copy_for_virtual_displays=true
+ro.surface_flinger.game_default_frame_rate_override=60
+ro.surface_flinger.has_HDR_display=true
+ro.surface_flinger.has_wide_color_display=false
+ro.surface_flinger.max_frame_buffer_acquired_buffers=3
+ro.surface_flinger.max_virtual_display_dimension=4096
+ro.surface_flinger.protected_contents=true
+ro.surface_flinger.set_touch_timer_ms=200
+ro.surface_flinger.supports_background_blur=1
+ro.surface_flinger.use_color_management=true
+ro.surface_flinger.wcg_composition_dataspace=143261696
+vendor.display.camera_noc_efficiency_factor=0.70
+vendor.display.comp_mask=8192
+vendor.display.disable_excl_rect=0
+vendor.display.disable_excl_rect_partial_fb=1
+vendor.display.disable_hw_recovery_dump=1
+vendor.display.disable_idle_time_hdr=1
+vendor.display.disable_idle_time_video=1
+vendor.display.disable_layer_stitch=0
+vendor.display.disable_rotator_ubwc=1
+vendor.display.disable_scaler=0
+vendor.display.enable_allow_idle_fallback=1
+vendor.display.enable_async_powermode=1
+vendor.display.enable_camera_smooth=1
+vendor.display.enable_null_display=0
+vendor.display.enable_optimize_refresh=1
+vendor.display.enable_posted_start_dyn=1
+vendor.display.idle_time=0
+vendor.display.normal_noc_efficiency_factor=0.85
+vendor.display.secure_preview_buffer_format=420_sp
+vendor.display.use_smooth_motion=1
+vendor.display.vds_allow_hwc=1
+ro.vendor.display.sensortype=2
+ro.vendor.display.svi=1
+ro.vendor.display.type=oled
+vendor.gralloc.disable_ubwc=0
+vendor.gralloc.secure_preview_buffer_format=420_sp
+
+# HWUI
+debug.hwui.skia_atrace_enabled=false
+config.disable_rtt=true
+ro.hwui.drop_shadow_cache_size=6
+ro.hwui.gradient_cache_size=1
+ro.hwui.layer_cache_size=48
+ro.hwui.max_texture_allocation_size=209715200
+ro.hwui.path_cache_size=32
+ro.hwui.r_buffer_cache_size=8
+ro.hwui.text_large_cache_height=1024
+ro.hwui.text_large_cache_width=2048
+ro.hwui.text_small_cache_height=1024
+ro.hwui.text_small_cache_width=1024
+ro.hwui.texture_cache_flushrate=0.4
+ro.hwui.texture_cache_size=72
+
+# Incremental
+ro.incremental.enable=1
+
+# IMS
+persist.dbg.volte_avail_ovr=1
+persist.dbg.vt_avail_ovr=1
+persist.dbg.wfc_avail_ovr=1
+
+# Media
+debug.stagefright.c2inputsurface=-1
+debug.stagefright.ccodec=4
+debug.stagefright.omx_default_rank=0
+media.aac_51_output_enabled=true
+media.settings.xml=/vendor/etc/media_profiles_vendor.xml
+media.stagefright.enable-aac=true
+media.stagefright.enable-fma2dp=true
+media.stagefright.enable-http=true
+media.stagefright.enable-player=true
+media.stagefright.enable-qcp=true
+media.stagefright.enable-scan=true
+media.stagefright.thumbnail.prefer_hw_codecs=true
+
+# Power
+ro.vendor.extension_library=libqti-perfd-client.so
+ro.vendor.perf-hal.ver=2.3
+ro.vendor.perf.scroll_opt=1
+vendor.pasr.activemode.enabled=true
+vendor.perf.framepacing.enable=1
+vendor.power.pasr.enabled=true
+
+# QCOM
+ro.soc.manufacturer=QTI
+ro.soc.model=SM6225
+
+# QCOMsysD
+persist.vendor.qcomsysd.enabled=1
+
+# QSMP
+ro.vendor.qspm.enable=true
+
+# Radio
+persist.radio.multisim.config=dsds
+persist.vendor.data.iwlan.enable=true
+persist.vendor.data.mode=concurrent
+persist.vendor.radio.atfwd.start=true
+persist.vendor.radio.apm_sim_not_pwdn=1
+persist.vendor.radio.custom_ecc=1
+persist.vendor.radio.data_con_rprt=1
+persist.vendor.radio.enableadvancedscan=true
+persist.vendor.radio.manual_nw_rej_ct=1
+persist.vendor.radio.procedure_bytes=SKIP
+persist.vendor.radio.rat_on=combine
+persist.vendor.radio.sib16_support=1
+persist.vendor.radio.snapshot_enabled=1
+persist.vendor.radio.snapshot_timer=5
+persist.vendor.radio.enable_temp_dds=true
+ro.telephony.sim_slots.count=2
+ro.telephony.default_network=33,33
+telephony.active_modems.max_count=2
+
+# Storage
+external_storage.casefold.enabled=1
+external_storage.projid.enabled=1
+external_storage.sdcardfs.enabled=0
+
+# USB
+ro.boot.usb.dwc3_msm=4e00000.ssusb
+sys.usb.mtp.batchcancel=1
+vendor.usb.controller=4e00000.dwc3
+vendor.usb.diag.func.name=ffs
+vendor.usb.dpl.inst.name=dpl
+vendor.usb.qdss.inst.name=qdss_sw
+vendor.usb.rmnet.func.name=gsi
+vendor.usb.rmnet.inst.name=rmnet
+vendor.usb.rndis.func.name=gsi
+vendor.usb.use_ffs_mtp=1
+vendor.usb.use_gadget_hal=1
+
+# Volume
+ro.config.media_vol_default=10
+ro.config.media_vol_steps=15
+ro.config.vc_call_vol_steps=11
+
+# WLAN
+wifi.aware.interface=wifi-aware0