Updated the auto discovery system