Refactored bootstrapping