better primary key support