Support primary key change