Improvement of Post Process handling