Updates to use new Discover module.