Updated data model PK to point at the correct keys