Improve PK interfaces
Enables abiltiy to run queries against primary keys