Added support for post-processing