Change discover API slightly
Start to implement http clone