Changing the way id generator works