Allow the state key mapping to be maintained separately