Use new peer API