Adapted to the latest annotation changes.