Bootstrapper changes