Extract PeerList Storage to separate file/class