Updated GuardContext