Add AnnouncementManager, migrate some methods, update references