WIP Discovery refactoring