Better announcement support