Add peer- and self- only information

@stephensanchez @mhoeber @lamagnifica Please review.