Added peer tracking