Improvement AlarmModule