Updates client discovery to new style