Add custom Id generation