Updated bootstrap script