Use new friend entity