Added Mail and Alarm classes.