Adds support for reply context