Enhanced the utility scripts.