Added support for peers