Replaced composite primary key by id + composite unique index