Use new multi-column key support