add account and auth support