Updated to new discovery API