Primary key improvements