Support non-collapsing keys