Improve context.csv