Added support for indexing multiple accounts