Altered server to handle the new primary key data.

See commit 879bd95e25337830a8f6758da969b80d0bc18b24 for details.