Adaption to recreate key format change.