Improvement of post process handling