Added primary key behavior