Reworked bootstrapping mechanism (not yet in use)