Finish 'key' option implementation