Use discovery-module