Using own models for order and cart
Fixes backwards compatibility issues where state was missing