This resolves issues caused by the multiple primary keys, but also requires re-creation of the model.