Added conversion of Map in PersonState.