Fixing discovery to include endpoint and port.