Updated context plugin