Refactor bootstrap builder