Updated FulfillmentOrder classes