diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 22251d0..364d424 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -25,14 +25,8 @@
 TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_USE_QCOM_BIONIC_OPTIMIZATION := true
 
-# Open Source Charging Mode
-BOARD_POWER_SUPPLY_PATH := /sys/class/power_supply
-BOARD_BATTERY_SYSFS_PATH := $(BOARD_POWER_SUPPLY_PATH)/battery
-BOARD_AC_SYSFS_PATH := $(BOARD_POWER_SUPPLY_PATH)/ac
-BOARD_USB_SYSFS_PATH := $(BOARD_POWER_SUPPLY_PATH)/usb
-BOARD_CHARGER_ENABLE_SUSPEND := true
-BOARD_CHARGER_DIM_SCREEN_BRIGHTNESS := true
-BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/charging_mode_booting
+# CMHW
+BOARD_HARDWARE_CLASS += hardware/samsung/cmhw
 
 # Graphics
 USE_OPENGL_RENDERER := true