Yeah, that works as well. Is there any value in calling out the difference between if we're using an email vs. canonical id? If not, I say rip it out and avoid this all together.