Update changes
Add composite primary key support