Upgraded Clairvoyance in order to use its annotations