Added basic support for peer discovery