Added individual billing and shipping fields to order data table