Reworked how the unique id is set, setting with a counter