Update to refactored bootstrap