Further automate bootstrap script