More idiomatic
Merging with criteria in lay
More rules around keyed criteria
Small doc updates