Updating scripts for more configuration