Added custom fields for address, phone and email