Added Service Discovery tools