Better peer identification