Updated OrderFactory witht the recent FactoryInterface changes