Added all the model classes, al