Corrected model issues