Minor fix
Enhance IdGenerator