Upgrade to Achilles 1.8.0