Adding CM HW stuffs