Discovery updates with new annotation structure (for 1.2rc1).