Updated context definitions.