Changes to bootstrap process