Added Context to calls.