Adding integer PK support