Better bootstrap integration