Add another get key value special case