Implemented automatic discovery