Implement New Discovery Schema

Change-Id: Ibd34c44211920197cf19df535ef038279fff2714