Improve context plugin to cover more log.