Added changes to the model again in order to bring it closer to production.