Added M6, M8 hardware