Update for new FriendlyId