Added "tokens map" to save state