Updated ChakeDetector class and ShakeDetectService