Add Haptic feedback feature and keep-alive