Added Support for FriendlyId 5