Conversion of discovery to use SDK