Update generator with better logging