Collect script improvement, configuration changes