Alter Auth flow + add storageKey