More changes for script improvements