Added friends handling