Updated Class "Alarm" and "Mail"