Refactored Announcement class