Postprocessing now uses dictionary instead of list