Made a few changes to the models due to database changes