Modified primary key table structure