Added generation of NOT NULL back. I put it in before, but it disappeared...