Non unique key support appears to be working