Updated associations for Friend model and User model