Service server discovery initial add
final commit