Update to changes in FriendsCore