Overhaul of bootstrap system