Updated from generator