Changes on the bootstrap script