Add multiple user handling and improve token data save method