Improve boostrapping script