diff --git a/lib/active_merchant_ccavenue/helper.rb b/lib/active_merchant_ccavenue/helper.rb
index 468e4d5..5e561e3 100644
--- a/lib/active_merchant_ccavenue/helper.rb
+++ b/lib/active_merchant_ccavenue/helper.rb
@@ -5,9 +5,19 @@ module Ccavenue
                 class Helper < ActiveMerchant::Billing::Integrations::Helper
                     mapping :amount, 'Amount'
                     mapping :order, 'Order_Id'
-                    mapping :customer, :name  => 'billing_cust_name',
+                    mapping :customer, 
+                      :name       => 'billing_cust_name',
                       :email      => 'billing_cust_email',
-                      :phone      => 'billing_cust_tel'
+                      :phone      => 'billing_cust_tel',
+                      :address    => 'billing_cust_address',
+                      :country    => 'billing_cust_country'
+                    mapping :delivery, 
+                      :name       => 'delivery_cust_name',
+                      :email      => 'delivery_cust_email',
+                      :phone      => 'delivery_cust_tel',
+                      :address    => 'delivery_cust_address',
+                      :country    => 'delivery_cust_country'
+                      
 
                     def redirect(mapping = {})
                         add_field 'Redirect_Url', mapping[:return_url]