More bootstrap integration