Added service and characteristic discovery