Add context support Aug 16