Changing auto-generated-key retrieval