Got auto discovery working