Adding capability to specify primary key