Enhanced bootstrap