Improve context friends data