Added  option for keys