Improve backend for social