Use new account API and support multiple names