Add context verification