Fixed primary key problems in data model.