Update to use Athena, not Nautilus