Update fields.py

Improve model primary key marshaling