Allow for more duplicates in 2hop test
Create extensible service discovery protocol, with initial basic implementation