Adding support for bigint pk