With growing number of devices connected to the network, there is a greater need for use of Peer-to-Peer (P2P) networks and distributed P2P protocols.Devices participating in the P2P network do not usually need to use any central server that links up connections. It has many advantages but it needs to use so-called overlay network that consists of protocols used for traffic routing and decision making. Protocols used in today’s P2P networks are mostly not considerate of particular participating nodes and all the nodes in the network are usually equal. This can have negative impacts on network performance. In order to avoid or reduce some unwanted negative impacts, it would be advantageous if the overlay network could route traffic and make decisions according to context information like battery levels or connection speeds. This work reviews a few popular P2P overlay networks and based on that it introduces an improvement of one of them – Chord. The structure of the improved version of the Chord protocol called Context-Aware Chord is described. Then results of the evaluation are presented. With a use of the improved protocol, nodes can participate longer in the network and throughput of lookup messages is improved.