Added blocked users and friendship states to user_friendships