Changes to the Bootstrapper