Added hooks for post-processing