Removed the composite primary key and added a UUID