Fixed primary key issues
Fixed primary key issues