Updated all the models in line with the new DB