Update to new spec and nuke FriendlyId