Add friendships
Refactoring