Add more post-processing tools