Model Generator corrected