Made order_id more consistant and made models store their original data