Auto Discovery feature complete