Primary key support