Revised the model classes