Add some Id generation