Beta 6: Primary key handling.