Announcement refactored