Add optional friendId to tokenSchema