Add context support