Add support for non-standard primary keys
Add spec for non-standard primary key for #169