I have reported the issue about not storing 2 sets of tokens and went through it over a screen share the other day with @Albert Margarit (NS Eng Lead)