Refactoring: Normalize Identity model

[hpopov]

I do the mapping in IdentityIndex, therefore, the model should be persisted in the form of the regular array (it is more readable and no repetitions -- more compact)