Adjusted postprocessing scripts - more generic