Added Billing and shipping fields for orders