Table Definition primary key fix