Improved bootstrap script