Revised the model calsses