Changed the way the model stores its information