Add option to set key