CAP-1608: Xenon's Links