Add better support for TabFriends