Major changes to the models