Refactoring of discovery and bootstrap in progress