Switch to using new plugin uniqueId function