Id generation changes