Updated discovery_bootstrap in preparation to tackle abstract page manager