More work on keys