Add specific option for auto-key-retrieve