Changed chaining method in Athena contexts.