Optimized collector and added startscript