Proper bootstrap integration