Update so it works with latest snapshots