[Issue #1] Replaced the id_generator.generate...id calls