Refactored bootstrapper