Good point, I'll add gen-id func