adding discovery settings, refactoring