Removed Message class and added it as a field to the Alarm class instead