Made some changes to the models