Replace address with multiple address fields in Client