LPS-46612 make discovery simpler and add interface information to type data