Updated the bootstrapper with script support