Added different handling in bootstrap.sh