Updated Context Definition