Replaced the incremental ID with a unique ID