Added id_generator