Refactored the Bootstrapper