Adding configurable Discovery class