FriendlyId + Puma addition