Added Auto Discovery