Add default values for address and city