Added option to Generate ID